diff options
| author | Akira TAGOH <akira@tagoh.org> | 2018-03-15 12:17:52 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2018-03-15 12:36:46 +0900 |
| commit | 98eaef69af1350e459bf9c175476d3b772968874 (patch) | |
| tree | 0473b669ade25f61aece2c9daadf038c324a0d1d | |
| parent | fb7be6d60586302e89b7bbc894b91cb6cd33fbf3 (diff) | |
Leave the locale setting to applications
https://bugs.freedesktop.org/show_bug.cgi?id=105492
| -rw-r--r-- | fc-conflist/fc-conflist.c | 2 | ||||
| -rw-r--r-- | src/fccfg.c | 22 |
2 files changed, 4 insertions, 20 deletions
diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c index d02273b7..5c40a0f0 100644 --- a/fc-conflist/fc-conflist.c +++ b/fc-conflist/fc-conflist.c @@ -38,6 +38,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <locale.h> #ifdef ENABLE_NLS #include <libintl.h> @@ -102,6 +103,7 @@ main (int argc, char **argv) #if HAVE_GETOPT_LONG || HAVE_GETOPT int c; + setlocale (LC_ALL, ""); #if HAVE_GETOPT_LONG while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1) #else diff --git a/src/fccfg.c b/src/fccfg.c index e311f177..e35c451e 100644 --- a/src/fccfg.c +++ b/src/fccfg.c @@ -26,7 +26,6 @@ #include "fcint.h" #include <dirent.h> -#include <locale.h> #include <sys/types.h> #if defined (_WIN32) && !defined (R_OK) @@ -39,24 +38,7 @@ static FcConfig * FcConfigEnsure (void) { FcConfig *config; - FcBool is_locale_initialized; - static void *static_is_locale_initialized; -retry_locale: - is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized); - if (!is_locale_initialized) - { - char *loc; - - is_locale_initialized = FcTrue; - if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL, - (void *)(intptr_t) is_locale_initialized)) - goto retry_locale; - - loc = setlocale (LC_ALL, NULL); - if (!loc || strcmp (loc, "C") == 0) - setlocale (LC_ALL, ""); - } -retry_config: +retry: config = fc_atomic_ptr_get (&_fcConfig); if (!config) { @@ -64,7 +46,7 @@ retry_config: if (!fc_atomic_ptr_cmpexch (&_fcConfig, NULL, config)) { FcConfigDestroy (config); - goto retry_config; + goto retry; } } return config; |