X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmultilex.c;h=7ff4efe0fb5eccb2651d3e78c8b84db512bfc1ec;hb=f38264a8dc9d6fbaa514e9f043adaa53c52191f4;hp=ec7c35c45a5ec34bbcce01fed3d8ba92923c3097;hpb=a049a06b8f811d38984d2b8053a6ff77d6415c29;p=gedcom-parse.git

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index ec7c35c..7ff4efe 100644
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -33,7 +33,7 @@ lex_func lf;
 
 #define NEW_MODEL_FILE "new.ged"
 
-int lexer_init(ENCODING enc, FILE* f)
+int lexer_init(Encoding enc, FILE* f)
 {
   if (enc == ONE_BYTE) {
     lf  = &gedcom_1byte_lex;
@@ -68,6 +68,12 @@ int gedcom_lex()
   return (*lf)();
 }
 
+void rewind_file(FILE* f)
+{
+  if (fseek(f, 0, 0) != 0)
+    gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
+}
+
 int determine_encoding(FILE* f)
 {
   char first[2];
@@ -76,80 +82,74 @@ int determine_encoding(FILE* f)
   read = fread(first, 1, 2, f);
   if (read != 2) {
     gedcom_warning(_("Error reading from input file: %s"), strerror(errno));
+    rewind_file(f);
     return ONE_BYTE;
   }
   else if ((first[0] == '0') && (first[1] == ' ')) {
     gedcom_debug_print(_("One-byte encoding"));
-    if (fseek(f, 0, 0) != 0)
-      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
+    rewind_file(f);
     return ONE_BYTE;
   }
-  else if ((first[0] == '\0') && (first[1] == '0'))
-  {
+  else if ((first[0] == '\0') && (first[1] == '0')) {
     gedcom_debug_print(_("Two-byte encoding, high-low"));
-    if (fseek(f, 0, 0) != 0)
-      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
+    rewind_file(f);
     return TWO_BYTE_HILO;
   }
-  else if ((first[0] == '\xFE') && (first[1] == '\xFF'))
-  {
+  else if ((first[0] == '\xFE') && (first[1] == '\xFF')) {
     gedcom_debug_print(_("Two-byte encoding, high-low, with BOM"));
     return TWO_BYTE_HILO;
   }
-  else if ((first[0] == '0') && (first[1] == '\0'))
-  {
+  else if ((first[0] == '0') && (first[1] == '\0')) {
     gedcom_debug_print(_("Two-byte encoding, low-high"));
-    if (fseek(f, 0, 0) != 0)
-      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
+    rewind_file(f);
     return TWO_BYTE_LOHI;
   }
-  else if ((first[0] == '\xFF') && (first[1] == '\xFE'))
-  {
+  else if ((first[0] == '\xFF') && (first[1] == '\xFE')) {
     gedcom_debug_print(_("Two-byte encoding, low-high, with BOM"));
     return TWO_BYTE_LOHI;
   }
+  else if ((first[0] == '\xEF') && (first[1] == '\xBB')) {
+    read = fread(first, 1, 1, f);
+    if (read != 1) {
+      gedcom_warning(_("Error reading from input file: %s"), strerror(errno));
+      rewind_file(f);
+    }
+    else if (first[0] == '\xBF') {
+      gedcom_debug_print(_("UTF-8 encoding, with BOM"));
+    }
+    else {
+      gedcom_warning(_("Unknown encoding, falling back to one-byte"));
+      rewind_file(f);
+    }
+    return ONE_BYTE;
+  }
   else {
     gedcom_warning(_("Unknown encoding, falling back to one-byte"));
-    if (fseek(f, 0, 0) != 0)
-      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
+    rewind_file(f);
     return ONE_BYTE;
   }
 }
 
 int init_called = 0;
 
-void gedcom_init()
+int gedcom_init()
 {
   init_called = 1;
   update_gconv_search_path();
-  setlocale(LC_ALL, "");
+  init_encodings();
+  if (!setlocale(LC_ALL, "")
+      || ! bindtextdomain(PACKAGE, LOCALEDIR)
+      || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING))
+    return 1;
+  else
+    return 0;
 }
 
 int gedcom_parse_file(const char* file_name)
 {
-  ENCODING enc;
+  Encoding enc;
   int result = 1;
   FILE* file;
-  char *textdom, *save_textdom;
-
-  textdom = textdomain(NULL);
-  if (!textdom) {
-    gedcom_error(_("Could not retrieve text domain: %s"), strerror(errno));
-    return result;
-  }
-  
-  save_textdom = strdup(textdom);
-  if (! save_textdom) {
-    MEMORY_ERROR;
-    return result;
-  }
-  
-  if (! bindtextdomain(PACKAGE, LOCALEDIR)
-      || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING)
-      || ! textdomain(PACKAGE)) {
-    gedcom_error(_("Could not set text domain: %s"), strerror(errno));
-    return result;
-  }
 
   if (!init_called) {
     gedcom_error(_("Internal error: GEDCOM parser not initialized"));
@@ -161,7 +161,7 @@ int gedcom_parse_file(const char* file_name)
 		   file_name, strerror(errno));
     }
     else {
-      init_encodings();
+      line_no = 1;
       enc = determine_encoding(file);
       
       if (lexer_init(enc, file)) {
@@ -177,10 +177,6 @@ int gedcom_parse_file(const char* file_name)
     }
   }
 
-  if (! textdomain(save_textdom)) {
-    gedcom_error(_("Could not restore text domain: %s"), strerror(errno));
-    return result;
-  }
   return result;
 }