Allow multiple wimlib_global_init/cleanup per app

diff --git a/include/wimlib/encoding.h b/include/wimlib/encoding.h
index 00f1a388c63665bd2dcb108418973d075552cd01..b48fe9ced389568fac1f1de3da12b479d6168323 100644 (file)
--- a/include/wimlib/encoding.h
+++ b/include/wimlib/encoding.h
@@ -7,6 +7,9 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

+extern void
+iconv_global_init(void);
+

 extern void
 iconv_global_cleanup(void);
 
 extern void
 iconv_global_cleanup(void);
 

diff --git a/src/encoding.c b/src/encoding.c
index 8edf228817cba16e659ca47caed8d492e1de95cf..ff90a23b8ca74bdda4ff2fc763eb66142ce1d818 100644 (file)
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -68,8 +68,6 @@ struct iconv_node {
 struct iconv_list_head name = {                                \
        .from_encoding = from,                          \
        .to_encoding = to,                              \
 struct iconv_list_head name = {                                \
        .from_encoding = from,                          \
        .to_encoding = to,                              \

-       .list = LIST_HEAD_INIT(name.list),              \
-       .mutex = PTHREAD_MUTEX_INITIALIZER,             \

 }
 
 static iconv_t *
 }
 
 static iconv_t *


@@ -363,6 +361,13 @@ utf8_to_tstr_simple(const char *utf8str, tchar **out)
        return utf8_to_tstr(utf8str, strlen(utf8str), out, &out_nbytes);
 }
 
        return utf8_to_tstr(utf8str, strlen(utf8str), out, &out_nbytes);
 }
 

+static void
+iconv_init(struct iconv_list_head *head)
+{
+       pthread_mutex_init(&head->mutex, NULL);
+       INIT_LIST_HEAD(&head->list);
+}
+

 static void
 iconv_cleanup(struct iconv_list_head *head)
 {
 static void
 iconv_cleanup(struct iconv_list_head *head)
 {


@@ -377,6 +382,19 @@ iconv_cleanup(struct iconv_list_head *head)
        }
 }
 
        }
 }
 

+void
+iconv_global_init(void)
+{
+       iconv_init(&iconv_utf8_to_tstr);
+       iconv_init(&iconv_tstr_to_utf8);
+#if !TCHAR_IS_UTF16LE
+       iconv_init(&iconv_utf16le_to_tstr);
+       iconv_init(&iconv_tstr_to_utf16le);
+       iconv_init(&iconv_utf16le_to_utf8);
+       iconv_init(&iconv_utf8_to_utf16le);
+#endif
+}
+

 void
 iconv_global_cleanup(void)
 {
 void
 iconv_global_cleanup(void)
 {

diff --git a/src/wim.c b/src/wim.c
index cf7965e7168ffa6c237e96d79e505da9d161ab56..a3dd135cb820b098501ab439bf8d53a1150984f7 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -1011,13 +1011,13 @@ wimlib_get_version(void)
        return WIMLIB_VERSION_CODE;
 }
 
        return WIMLIB_VERSION_CODE;
 }
 

+static bool lib_initialized = false;
+

 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_global_init(int init_flags)
 {
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_global_init(int init_flags)
 {

-       static bool already_inited = false;
-
-       if (already_inited)
+       if (lib_initialized)

                return 0;
 
        if (init_flags & ~(WIMLIB_INIT_FLAG_ASSUME_UTF8 |
                return 0;
 
        if (init_flags & ~(WIMLIB_INIT_FLAG_ASSUME_UTF8 |


@@ -1043,12 +1043,13 @@ wimlib_global_init(int init_flags)
                        return ret;
        }
 #endif
                        return ret;
        }
 #endif

+       iconv_global_init();

        init_upcase();
        if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE)
                default_ignore_case = false;
        else if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE)
                default_ignore_case = true;
        init_upcase();
        if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE)
                default_ignore_case = false;
        else if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE)
                default_ignore_case = true;

-       already_inited = true;
+       lib_initialized = true;

        return 0;
 }
 
        return 0;
 }
 


@@ -1056,6 +1057,8 @@ wimlib_global_init(int init_flags)
 WIMLIBAPI void
 wimlib_global_cleanup(void)
 {
 WIMLIBAPI void
 wimlib_global_cleanup(void)
 {

+       if (!lib_initialized)
+               return;

        libxml_global_cleanup();
        iconv_global_cleanup();
 #ifdef __WIN32__
        libxml_global_cleanup();
        iconv_global_cleanup();
 #ifdef __WIN32__


@@ -1063,4 +1066,5 @@ wimlib_global_cleanup(void)
 #endif
        cleanup_decompressor_params();
        cleanup_compressor_params();
 #endif
        cleanup_decompressor_params();
        cleanup_compressor_params();

+       lib_initialized = false;

 }
 }