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
A bit of refactoring...
[gedcom-parse.git]
/
gedcom
/
encoding.c
diff --git
a/gedcom/encoding.c
b/gedcom/encoding.c
index 07a95891e6bfa29c9a52c6fbc619479e29975031..f70dc4eb7ae47aeaba7e7555fade8b0825ea6c9d 100644
(file)
--- a/
gedcom/encoding.c
+++ b/
gedcom/encoding.c
@@
-107,11
+107,21
@@
char* get_encoding(const char* gedcom_n, ENCODING enc)
}
}
}
}
+static char *new_gconv_path;
+
void cleanup_encodings()
{
hash_free(encodings);
}
void cleanup_encodings()
{
hash_free(encodings);
}
+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));
@@
-140,7
+150,6
@@
void update_gconv_search_path()
/* Add gedcom data directory to gconv search path */
gconv_path = getenv(GCONV_SEARCH_PATH);
if (gconv_path == NULL || strstr(gconv_path, PKGDATADIR) == NULL) {
/* 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)
@@
-166,6
+175,9
@@
void update_gconv_search_path()
abort();
}
}
abort();
}
}
+ if (init_called && atexit(cleanup_gconv_path) != 0) {
+ gedcom_warning(_("Could not register path cleanup function"));
+ }
}
void init_encodings()
}
void init_encodings()
@@
-232,22
+244,26
@@
static size_t conv_buf_size;
int open_conv_to_internal(const char* fromcode)
{
int open_conv_to_internal(const char* fromcode)
{
+ iconv_t new_cd_to_internal;
const char *encoding = get_encoding(fromcode, the_enc);
const char *encoding = get_encoding(fromcode, the_enc);
- if (cd_to_internal != (iconv_t) -1)
- iconv_close(cd_to_internal);
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()