X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=standalone.c;h=cedfca21a154245e26c92ddb16c175477f79bfca;hb=4b4a604a9dd1f072d7ede2bdda7eb563c66010f8;hp=06ac82a63f8f409a157e115f9cde5468ea75d891;hpb=c6ebeddd138985207106a557f85f99e94c311f8e;p=gedcom-parse.git

diff --git a/standalone.c b/standalone.c
index 06ac82a..cedfca2 100644
--- a/standalone.c
+++ b/standalone.c
@@ -2,10 +2,12 @@
 /* $Name$ */
 
 #include "gedcom.h"
+#include "multilex.h"
 
 void show_help ()
 {
-  printf("gedcom-parse test program for libgedcom\n");
+  printf("gedcom-parse test program for libgedcom\n\n");
+  printf("Usage:  gedcom-parse [options] file\n");
   printf("Options:\n");
   printf("  -h    Show this help text\n");
   printf("  -nc   Disable compatibility mode\n");
@@ -21,6 +23,8 @@ int main(int argc, char* argv[])
   MECHANISM mech = IMMED_FAIL;
   int compat_enabled = 1;
   int debug_level = 0;
+  char* file_name = NULL;
+
   if (argc > 1) {
     int i;
     for (i=1; i<argc; i++) {
@@ -40,6 +44,10 @@ int main(int argc, char* argv[])
 	show_help();
 	exit(1);
       }
+      else if (strncmp(argv[i], "-", 1)) {
+	file_name = argv[i];
+	break;
+      }
       else {
 	printf ("Unrecognized option: %s\n", argv[i]);
 	show_help();
@@ -47,43 +55,23 @@ int main(int argc, char* argv[])
       }
     }
   }
+  
+  if (!file_name) {
+    printf("No file name given\n");
+    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) {
+  
+  if (gedcom_parse_file(file_name) == 0) {
     printf("Parse succeeded\n");
     return 0;
   }
   else {
     printf("Parse failed\n");
     return 1;
-  }
-}
-
-int gedcom_warning(char* s, ...)
-{
-  int res;
-  va_list ap;
-
-  va_start(ap, s);
-  fprintf(stderr, "Warning on line %d: ", line_no);
-  res = vfprintf(stderr, s, ap);
-  fprintf(stderr, "\n");
-  va_end(ap);
-  
-  return res;
-}
-
-int gedcom_error(char* s, ...)
-{
-  int res;
-  va_list ap;
-
-  va_start(ap, s);
-  fprintf(stderr, "Error on line %d: ", line_no);
-  res = vfprintf(stderr, s, ap);
-  fprintf(stderr, "\n");
-  va_end(ap);
-  
-  return res;
+  }  
 }