Fix for line numbering bug (bug 613480).

[gedcom-parse.git] / gedcom / multilex.c

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 727c17959cb8f7aa03a6c9040ecf415e91d0cedf..5b0aa4eec262861c492e5745115b7bbcd957ddb2 100644 (file)
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -26,28 +26,30 @@
 #include "encoding.h"
 #include "xref.h"
 
-int line_no;
+int line_no = 0;
 
 typedef int (*lex_func)(void);
 lex_func lf;
 
+#define NEW_MODEL_FILE "new.ged"
+
 int lexer_init(ENCODING enc, FILE* f)
 {
   if (enc == ONE_BYTE) {
-    gedcom_1byte_in = f;
-    lf = &gedcom_1byte_lex;
+    lf  = &gedcom_1byte_lex;
+    gedcom_1byte_myinit(f);
     set_encoding_width(enc);
     return open_conv_to_internal("ASCII");
   }
   else if (enc == TWO_BYTE_HILO) {
-    gedcom_hilo_in = f;
-    lf = &gedcom_hilo_lex;
+    lf  = &gedcom_hilo_lex;
+    gedcom_hilo_myinit(f);
     set_encoding_width(enc);
     return open_conv_to_internal("UNICODE");
   }
   else if (enc == TWO_BYTE_LOHI) {
-    gedcom_lohi_in = f;
-    lf = &gedcom_lohi_lex;
+    lf  = &gedcom_lohi_lex;
+    gedcom_lohi_myinit(f);
     set_encoding_width(enc);
     return open_conv_to_internal("UNICODE");
   }
@@ -69,17 +71,24 @@ int gedcom_lex()
 int determine_encoding(FILE* f)
 {
   char first[2];
+  int read;
 
-  fread(first, 1, 2, f);
-  if ((first[0] == '0') && (first[1] == ' ')) {
+  read = fread(first, 1, 2, f);
+  if (read != 2) {
+    gedcom_warning(_("Error reading from input file: %s"), strerror(errno));
+    return ONE_BYTE;
+  }
+  else if ((first[0] == '0') && (first[1] == ' ')) {
     gedcom_debug_print(_("One-byte encoding"));
-    fseek(f, 0, 0);
+    if (fseek(f, 0, 0) != 0)
+      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
     return ONE_BYTE;
   }
   else if ((first[0] == '\0') && (first[1] == '0'))
   {
     gedcom_debug_print(_("Two-byte encoding, high-low"));
-    fseek(f, 0, 0);
+    if (fseek(f, 0, 0) != 0)
+      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
     return TWO_BYTE_HILO;
   }
   else if ((first[0] == '\xFE') && (first[1] == '\xFF'))
@@ -90,7 +99,8 @@ int determine_encoding(FILE* f)
   else if ((first[0] == '0') && (first[1] == '\0'))
   {
     gedcom_debug_print(_("Two-byte encoding, low-high"));
-    fseek(f, 0, 0);
+    if (fseek(f, 0, 0) != 0)
+      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
     return TWO_BYTE_LOHI;
   }
   else if ((first[0] == '\xFF') && (first[1] == '\xFE'))
@@ -100,52 +110,108 @@ int determine_encoding(FILE* f)
   }
   else {
     gedcom_warning(_("Unknown encoding, falling back to one-byte"));
-    fseek(f, 0, 0);
+    if (fseek(f, 0, 0) != 0)
+      gedcom_warning(_("Error positioning input file: %s"), strerror(errno));
     return ONE_BYTE;
   }
 }
 
+int init_called = 0;
+
 void gedcom_init()
 {
+  init_called = 1;
   update_gconv_search_path();
 }
 
-int gedcom_parse_file(char* file_name)
+int gedcom_parse_file(const char* file_name)
 {
   ENCODING enc;
   int result = 1;
   FILE* file;
+  char *locale, *save_locale, *save_textdom;
+
+  locale = setlocale(LC_ALL, NULL);
+  if (! locale) {
+    gedcom_error(_("Could not retrieve locale information"));
+    return result;
+  }
   
-  char *save_locale  = strdup(setlocale(LC_ALL, NULL));
-  char *save_textdom = textdomain(NULL);
-  setlocale(LC_ALL, "");
-  bindtextdomain(PACKAGE, LOCALEDIR);
-  bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING);
-  textdomain(PACKAGE);
-
-  line_no = 1;
-  file = fopen(file_name, "r");
-  if (!file) {
-    gedcom_error(_("Could not open file '%s'"), file_name);
+  save_locale  = strdup(locale);
+  if (! save_locale) {
+    MEMORY_ERROR;
+    return result;
+  }
+  
+  save_textdom = textdomain(NULL);
+  if (!save_textdom) {
+    gedcom_error(_("Could not retrieve locale domain: %s"), strerror(errno));
+    return result;
+  }
+  
+  if (! setlocale(LC_ALL, "")
+      || ! bindtextdomain(PACKAGE, LOCALEDIR)
+      || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING)
+      || ! textdomain(PACKAGE)) {
+    gedcom_error(_("Could not set locale: %s"), strerror(errno));
+    return result;
+  }
+
+  if (!init_called) {
+    gedcom_error(_("Internal error: GEDCOM parser not initialized"));
   }
   else {
-    init_encodings();
-    enc = determine_encoding(file);
-    
-    if (lexer_init(enc, file)) {
-      line_no = 1;
-      make_xref_table();
-      result = gedcom_parse();
-      if (result == 0)
-       result = check_xref_table();
+    file = fopen(file_name, "r");
+    if (!file) {
+      gedcom_error(_("Could not open file '%s': %s"),
+                  file_name, strerror(errno));
+    }
+    else {
+      init_encodings();
+      enc = determine_encoding(file);
+      
+      if (lexer_init(enc, file)) {
+       line_no = 0;
+       make_xref_table();
+       result = gedcom_parse();
+       line_no = 0;
+       if (result == 0)
+         result = check_xref_table();
+      }
+      lexer_close();
+      fclose(file);
     }
-    lexer_close();
-    fclose(file);
   }
 
-  textdomain(save_textdom);
-  setlocale(LC_ALL, save_locale);
+  if (! textdomain(save_textdom)
+      || ! setlocale(LC_ALL, save_locale)) {
+    gedcom_error(_("Could not restore locale: %s"), strerror(errno));
+    return result;
+  }
   free(save_locale);
   return result;
 }
 
+int gedcom_new_model()
+{
+  int result = 1;
+  FILE* file;
+
+  file = fopen(NEW_MODEL_FILE, "r");
+  if (file) {
+    fclose(file);
+    result = gedcom_parse_file(NEW_MODEL_FILE);
+  }
+  else {
+    char* filename = (char*) malloc(strlen(PKGDATADIR) + strlen(NEW_MODEL_FILE)
+                                   + 2);
+    if (!filename)
+      MEMORY_ERROR;
+    else {
+      sprintf(filename, "%s/%s", PKGDATADIR, NEW_MODEL_FILE);
+      result = gedcom_parse_file(filename);
+      free(filename);
+    }
+  }
+  return result;
+}