X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=standalone.c;h=cedfca21a154245e26c92ddb16c175477f79bfca;hb=f4faf7679e0ae7cc5e5cf25c1f070a790f5f4a40;hp=41c77524b3a99f9af453bd48f1c9250d401d02e9;hpb=95deed7400e87af12a987af2abf5187ab1ddf9aa;p=gedcom-parse.git

diff --git a/standalone.c b/standalone.c
index 41c7752..cedfca2 100644
--- a/standalone.c
+++ b/standalone.c
@@ -2,6 +2,7 @@
 /* $Name$ */
 
 #include "gedcom.h"
+#include "multilex.h"
 
 void show_help ()
 {
@@ -17,65 +18,6 @@ void show_help ()
   printf("  -da   Debug setting: libgedcom + yacc debug messages\n");
 }
 
-int determine_encoding(FILE* f)
-{
-  char first[2];
-
-  fread(first, 1, 2, f);
-  if ((first[0] == '0') && (first[1] == ' ')) {
-    gedcom_warning("One-byte encoding");
-    fseek(f, 0, 0);
-    return ONE_BYTE;
-  }
-  else if ((first[0] == '\0') && (first[1] == '0'))
-  {
-    gedcom_warning("Two-byte encoding, high-low");
-    fseek(f, 0, 0);
-    return TWO_BYTE_HILO;
-  }
-  else if ((first[0] == '\xFE') && (first[1] == '\xFF'))
-  {
-    gedcom_warning("Two-byte encoding, high-low, with BOM");
-    return TWO_BYTE_HILO;
-  }
-  else if ((first[0] == '0') && (first[1] == '\0'))
-  {
-    gedcom_warning("Two-byte encoding, low-high");
-    fseek(f, 0, 0);
-    return TWO_BYTE_LOHI;
-  }
-  else if ((first[0] == '\xFF') && (first[1] == '\xFE'))
-  {
-    gedcom_warning("Two-byte encoding, low-high, with BOM");
-    return TWO_BYTE_LOHI;
-  }
-  else {
-    gedcom_warning("Unknown encoding, falling back to one-byte");
-    fseek(f, 0, 0);
-    return ONE_BYTE;
-  }
-}
-
-int gedcom_xxx_parse(char* file_name)
-{
-  ENCODING enc;
-  FILE* file = fopen (file_name, "r");
-  if (!file) {
-    printf("Could not open file '%s'\n", file_name);
-    exit(1);
-  }
-  enc = determine_encoding(file);
-
-  if (enc == ONE_BYTE) {
-    gedcom_in = file;
-    return gedcom_parse();
-  }
-  else {
-    printf("No parser yet for encoding\n");
-    exit(1);
-  }
-}
-
 int main(int argc, char* argv[])
 {
   MECHANISM mech = IMMED_FAIL;
@@ -124,7 +66,7 @@ int main(int argc, char* argv[])
   gedcom_set_compat_handling(compat_enabled);
   gedcom_set_error_handling(mech);
   
-  if (gedcom_xxx_parse(file_name) == 0) {
+  if (gedcom_parse_file(file_name) == 0) {
     printf("Parse succeeded\n");
     return 0;
   }
@@ -133,31 +75,3 @@ int main(int argc, char* argv[])
     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;
-}