X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fencoding.c;h=94d58d9603cad92fc99c034050a0130e607d7fa2;hb=4740927403892701279eff7a2b69de67f96bb2f0;hp=5fdaba57f1588fa88f8498d1c57f06e2cd285c0d;hpb=8831b70a872f0999a1de7082064559956d45171a;p=gedcom-parse.git

diff --git a/gedcom/encoding.c b/gedcom/encoding.c
index 5fdaba5..94d58d9 100644
--- a/gedcom/encoding.c
+++ b/gedcom/encoding.c
@@ -15,11 +15,13 @@
 #include <search.h>
 #include <stdio.h>
 #include <limits.h>
+#include <stdlib.h>
 #include "gedcom_internal.h"
 #include "encoding.h"
 
 #define INTERNAL_ENCODING "UTF8"
 #define ENCODING_CONF_FILE "gedcom.enc"
+#define GCONV_SEARCH_PATH "GCONV_PATH"
 #define MAXBUF 255
 
 static iconv_t cd_to_internal = (iconv_t) -1;
@@ -84,6 +86,33 @@ void init_encodings()
     char gedcom_n[MAXBUF + 1];
     char charwidth[MAXBUF + 1];
     char iconv_n[MAXBUF + 1];
+    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)
+					+ 2);
+	sprintf(new_gconv_path, "%s=%s", GCONV_SEARCH_PATH, PKGDATADIR);
+      }
+      else {
+	new_gconv_path = (char *)malloc(strlen(GCONV_SEARCH_PATH)
+					+ strlen(gconv_path)
+					+ strlen(PKGDATADIR)
+					+ 3);
+	sprintf(new_gconv_path, "%s=%s:%s",
+		GCONV_SEARCH_PATH, gconv_path, PKGDATADIR);
+      }
+      if (putenv(new_gconv_path) != 0) {
+	gedcom_warning("Failed updating environment variable %s",
+		       GCONV_SEARCH_PATH);
+      }
+    }
+    
+    /* Open gedcom configuration file and read */
     in = fopen(ENCODING_CONF_FILE, "r");
     if (in == NULL) {
       char path[PATH_MAX];