Bugfix.

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

diff --git a/gedcom/encoding.c b/gedcom/encoding.c
index 07a95891e6bfa29c9a52c6fbc619479e29975031..d484d1c7847054a7cd3fdf0c8d5c4eccf832f5f9 100644 (file)
--- a/gedcom/encoding.c
+++ b/gedcom/encoding.c
@@ -41,12 +41,12 @@ static hash_t *encodings = NULL;
 
 const char* charwidth_string[] = { "1", "2_HILO", "2_LOHI" };
 
-hnode_t *node_alloc(void *c __attribute__((unused)))
+hnode_t *node_alloc(void *c UNUSED)
 {
   return (hnode_t *)malloc(sizeof *node_alloc(NULL));
 }
 
-void node_free(hnode_t *n, void *c __attribute__((unused)))
+void node_free(hnode_t *n, void *c UNUSED)
 {
   free((void*)hnode_getkey(n));
   free(hnode_get(n));
@@ -112,9 +112,23 @@ void cleanup_encodings()
   hash_free(encodings);
 }
 
+#ifdef USE_GLIBC_ICONV
+
+static char *new_gconv_path;
+
+void cleanup_gconv_path()
+{
+  /* Clean up environment */
+  putenv(GCONV_SEARCH_PATH);
+  if (new_gconv_path)
+    free(new_gconv_path);  
+}
+
 /* Let function be called before main() */
 void update_gconv_search_path() __attribute__ ((constructor));
 
+#endif /* USE_GLIBC_ICONV */
+
 /* Note:
 
    The environment variable GCONV_PATH has to be adjusted before the very
@@ -136,11 +150,11 @@ void update_gconv_search_path() __attribute__ ((constructor));
 
 void update_gconv_search_path()
 {
+#ifdef USE_GLIBC_ICONV
   char *gconv_path;
   /* Add gedcom data directory to gconv search path */
   gconv_path = getenv(GCONV_SEARCH_PATH);
   if (gconv_path == NULL || strstr(gconv_path, PKGDATADIR) == NULL) {
-    char *new_gconv_path;
     if (gconv_path == NULL) {
       new_gconv_path = (char *)malloc(strlen(GCONV_SEARCH_PATH)
                                      + strlen(PKGDATADIR)
@@ -166,6 +180,10 @@ void update_gconv_search_path()
       abort();
     }
   }
+  if (init_called && atexit(cleanup_gconv_path) != 0) {
+    gedcom_warning(_("Could not register path cleanup function"));
+  }    
+#endif /* USE_GLIBC_ICONV */
 }
 
 void init_encodings()
@@ -232,30 +250,37 @@ static size_t conv_buf_size;
 
 int open_conv_to_internal(const char* fromcode)
 {
+  iconv_t new_cd_to_internal;
   const char *encoding = get_encoding(fromcode, the_enc);
-  if (cd_to_internal != (iconv_t) -1)
-    iconv_close(cd_to_internal);
   if (encoding == NULL) {
-    cd_to_internal = (iconv_t) -1;
+    new_cd_to_internal = (iconv_t) -1;
   }
   else {
     memset(conv_buf, 0, sizeof(conv_buf));
     conv_buf_size = 0;
-    cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
-    if (cd_to_internal == (iconv_t) -1) {
+    new_cd_to_internal = iconv_open(INTERNAL_ENCODING, encoding);
+    if (new_cd_to_internal == (iconv_t) -1) {
       gedcom_error(_("Error opening conversion context for encoding %s: %s"),
                   encoding, strerror(errno));
     }
   }
-  return (cd_to_internal != (iconv_t) -1);  
+  if (new_cd_to_internal != (iconv_t) -1) {
+    if (cd_to_internal != (iconv_t) -1)
+      iconv_close(cd_to_internal);
+    cd_to_internal = new_cd_to_internal;
+  }
+  return (new_cd_to_internal != (iconv_t) -1);  
 }
 
 void close_conv_to_internal()
 {
-  if (iconv_close(cd_to_internal) != 0) {
-    gedcom_warning(_("Error closing conversion context: %s"), strerror(errno));
+  if (cd_to_internal != (iconv_t) -1) {
+    if (iconv_close(cd_to_internal) != 0) {
+      gedcom_warning(_("Error closing conversion context: %s"),
+                    strerror(errno));
+    }
+    cd_to_internal = (iconv_t) -1;
   }
-  cd_to_internal = (iconv_t) -1;
 }
 
 char* to_internal(const char* str, size_t len,
@@ -264,7 +289,7 @@ char* to_internal(const char* str, size_t len,
   size_t res;
   size_t outsize = out_len;
   char *wrptr = output_buffer;
-  char *rdptr = conv_buf;
+  ICONV_CONST char *rdptr = (ICONV_CONST char*) conv_buf;
   char *retval = output_buffer;
   /* set up input buffer (concatenate to what was left previous time) */
   /* can't use strcpy, because possible null bytes from unicode */