dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set ICONV_PATH to path of iconv binary.
[gedcom-parse.git]
/
gedcom
/
encoding.c
diff --git
a/gedcom/encoding.c
b/gedcom/encoding.c
index b2c3c416955e65d4465f4dc7eff2e71e12d57ee7..4feac587c92ff5726c3653f0d68d8c71cdb46190 100644
(file)
--- a/
gedcom/encoding.c
+++ b/
gedcom/encoding.c
@@
-39,21
+39,22
@@
static iconv_t cd_to_internal = (iconv_t) -1;
static ENCODING the_enc = ONE_BYTE;
static hash_t *encodings = NULL;
static ENCODING the_enc = ONE_BYTE;
static hash_t *encodings = NULL;
-char* charwidth_string[] = { "1", "2_HILO", "2_LOHI" };
+c
onst c
har* 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));
}
{
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));
free(n);
}
{
free((void*)hnode_getkey(n));
free(hnode_get(n));
free(n);
}
-void add_encoding(char *gedcom_n, char* charwidth, char *iconv_n)
+void add_encoding(const char *gedcom_n, const char* charwidth,
+ const char *iconv_n)
{
char *key, *val;
{
char *key, *val;
@@
-79,7
+80,7
@@
void add_encoding(char *gedcom_n, char* charwidth, char *iconv_n)
MEMORY_ERROR;
}
MEMORY_ERROR;
}
-char* get_encoding(char* gedcom_n, ENCODING enc)
+char* get_encoding(c
onst c
har* gedcom_n, ENCODING enc)
{
char *key;
hnode_t *node;
{
char *key;
hnode_t *node;
@@
-111,9
+112,23
@@
void cleanup_encodings()
hash_free(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));
/* 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
/* Note:
The environment variable GCONV_PATH has to be adjusted before the very
@@
-135,11
+150,11
@@
void update_gconv_search_path() __attribute__ ((constructor));
void update_gconv_search_path()
{
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 *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)
if (gconv_path == NULL) {
new_gconv_path = (char *)malloc(strlen(GCONV_SEARCH_PATH)
+ strlen(PKGDATADIR)
@@
-165,6
+180,10
@@
void update_gconv_search_path()
abort();
}
}
abort();
}
}
+ if (init_called && atexit(cleanup_gconv_path) != 0) {
+ gedcom_warning(_("Could not register path cleanup function"));
+ }
+#endif /* USE_GLIBC_ICONV */
}
void init_encodings()
}
void init_encodings()
@@
-229,35
+248,42
@@
void set_encoding_width(ENCODING enc)
static char conv_buf[MAXGEDCLINELEN * 2];
static size_t conv_buf_size;
static char conv_buf[MAXGEDCLINELEN * 2];
static size_t conv_buf_size;
-int open_conv_to_internal(char* fromcode)
+int open_conv_to_internal(c
onst c
har* fromcode)
{
{
- char *encoding = get_encoding(fromcode, the_enc);
- if (cd_to_internal != (iconv_t) -1)
- iconv_close(cd_to_internal);
+ iconv_t new_cd_to_internal;
+ const char *encoding = get_encoding(fromcode, the_enc);
if (encoding == NULL) {
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;
}
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));
}
}
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()
{
}
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(char* str, size_t len,
+char* to_internal(c
onst c
har* str, size_t len,
char* output_buffer, size_t out_len)
{
size_t res;
char* output_buffer, size_t out_len)
{
size_t res;