A little more checking (for duplicate registration).

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

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 471f5ac37fed065a388799f7715662a5ac07777e..96af2952b714d022462e171c199b6b58b170d0bf 100644 (file)
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -105,41 +105,55 @@ int determine_encoding(FILE* f)
   }
 }
 
+static int init_called = 0;
+
+void gedcom_init()
+{
+  init_called = 1;
+  update_gconv_search_path();
+}
+
 int gedcom_parse_file(char* file_name)
 {
   ENCODING enc;
   int result = 1;
   FILE* file;
   
-  char *save_locale  = setlocale(LC_ALL, NULL);
+  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);
+  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();
+    line_no = 1;
+    file = fopen(file_name, "r");
+    if (!file) {
+      gedcom_error(_("Could not open file '%s'"), file_name);
+    }
+    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();
+      }
+      lexer_close();
+      fclose(file);
     }
-    lexer_close();
-    fclose(file);
   }
 
   textdomain(save_textdom);
   setlocale(LC_ALL, save_locale);
+  free(save_locale);
   return result;
 }