Added help text; better debug options.

diff --git a/standalone.c b/standalone.c
index c54d46debb53d3a4c9e8624d6120c9a9e9c104f3..06ac82a63f8f409a157e115f9cde5468ea75d891 100644 (file)
--- a/standalone.c
+++ b/standalone.c
@@ -3,29 +3,51 @@
 
 #include "gedcom.h"
 
+void show_help ()
+{
+  printf("gedcom-parse test program for libgedcom\n");
+  printf("Options:\n");
+  printf("  -h    Show this help text\n");
+  printf("  -nc   Disable compatibility mode\n");
+  printf("  -fi   Fail immediately on errors\n");
+  printf("  -fd   Deferred fail on errors, but parse completely\n");
+  printf("  -fn   No fail on errors\n");
+  printf("  -dg   Debug setting: only libgedcom debug messages\n");
+  printf("  -da   Debug setting: libgedcom + yacc debug messages\n");
+}
+
 int main(int argc, char* argv[])
 {
   MECHANISM mech = IMMED_FAIL;
   int compat_enabled = 1;
+  int debug_level = 0;
   if (argc > 1) {
     int i;
     for (i=1; i<argc; i++) {
-      if (!strncmp(argv[i], "-d", 2))
-       gedcom_enable_debug();
-      else if (!strncmp(argv[i], "-fi", 3))
+      if (!strncmp(argv[i], "-da", 4))
+       debug_level = 2;
+      else if (!strncmp(argv[i], "-dg", 4))
+       debug_level = 1;
+      else if (!strncmp(argv[i], "-fi", 4))
        mech = IMMED_FAIL;
-      else if (!strncmp(argv[i], "-fd", 3))
+      else if (!strncmp(argv[i], "-fd", 4))
        mech = DEFER_FAIL;
-      else if (!strncmp(argv[i], "-fn", 3))
+      else if (!strncmp(argv[i], "-fn", 4))
        mech = IGNORE_ERRORS;
-      else if (!strncmp(argv[i], "-nc", 3))
+      else if (!strncmp(argv[i], "-nc", 4))
        compat_enabled = 0;
+      else if (!strncmp(argv[i], "-h", 3)) {
+       show_help();
+       exit(1);
+      }
       else {
        printf ("Unrecognized option: %s\n", argv[i]);
+       show_help();
        exit(1);
       }
     }
   }
+  gedcom_set_debug_level(debug_level);
   gedcom_set_compat_handling(compat_enabled);
   gedcom_set_error_handling(mech);
   if (gedcom_parse() == 0) {
@@ -38,20 +60,6 @@ int main(int argc, char* argv[])
   }
 }
 
-int gedcom_debug_print(char* s, ...)
-{
-  int res;
-#if YYDEBUG != 0
-  if (gedcom_debug) {
-    va_list ap;
-    va_start(ap, s);
-    res = vfprintf(stderr, s, ap);
-    va_end(ap);
-  }
-#endif
-  return(res);
-}
-
 int gedcom_warning(char* s, ...)
 {
   int res;