Properly print out errors thrown by djvulibre's code

trufanov-nok · Jul 28, 2021 · 8f0bf15 · 8f0bf15
1 parent ad4dd91
commit 8f0bf15
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/tools/settings-reader/GException.cpp b/tools/settings-reader/GException.cpp
@@ -157,7 +157,8 @@ void
 GException::perror(void) const
 {
   fflush(0);
-  DjVuPrintErrorUTF8("*** ");
+  if (cause)
+    DjVuPrintErrorUTF8("*** %s\n", cause);
 //  DjVuMessageLite::perror(get_cause());
   if (file && line>0)
     DjVuPrintErrorUTF8("*** (%s:%d)\n", file, line);    

diff --git a/tools/settings-reader/SettingsReaderAdapter.cpp b/tools/settings-reader/SettingsReaderAdapter.cpp
@@ -1,11 +1,17 @@
 #include "SettingsReaderAdapter.h"
 #include "SettingsReader.h"
+#include "GException.h"
 
 int read_app_options_from_file(const char* fname, struct AppOptions* opts)
 {
     if (opts) {
-        SettingsReader reader(fname, opts);
-        return reader.readAllOptions();
+        G_TRY {
+            SettingsReader reader(fname, opts);
+            return reader.readAllOptions();
+        } G_CATCH(exc) {
+            exc.perror();
+            exit(-2);
+        } G_ENDCATCH;
     }
 
     return 0;