You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
274 lines
7.0 KiB
274 lines
7.0 KiB
From 923b5be626a6e03fbaeee0b5cd6d0246c2f8f36f Mon Sep 17 00:00:00 2001 |
|
From: Akira TAGOH <akira@tagoh.org> |
|
Date: Wed, 14 Mar 2018 12:35:05 +0900 |
|
Subject: [PATCH 1/5] Do not override locale if already set by app |
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=105492 |
|
--- |
|
src/fccfg.c | 7 ++++++- |
|
1 file changed, 6 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/src/fccfg.c b/src/fccfg.c |
|
index eb0b76d..e311f17 100644 |
|
--- a/src/fccfg.c |
|
+++ b/src/fccfg.c |
|
@@ -45,11 +45,16 @@ 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; |
|
- setlocale (LC_ALL, ""); |
|
+ |
|
+ loc = setlocale (LC_ALL, NULL); |
|
+ if (!loc || strcmp (loc, "C") == 0) |
|
+ setlocale (LC_ALL, ""); |
|
} |
|
retry_config: |
|
config = fc_atomic_ptr_get (&_fcConfig); |
|
-- |
|
2.14.3 |
|
|
|
From 98eaef69af1350e459bf9c175476d3b772968874 Mon Sep 17 00:00:00 2001 |
|
From: Akira TAGOH <akira@tagoh.org> |
|
Date: Thu, 15 Mar 2018 12:17:52 +0900 |
|
Subject: [PATCH 4/5] Leave the locale setting to applications |
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=105492 |
|
--- |
|
fc-conflist/fc-conflist.c | 2 ++ |
|
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 d02273b..5c40a0f 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 e311f17..e35c451 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; |
|
-- |
|
2.14.3 |
|
|
|
From 2938e4d72da40f6bb0d22086c519a9852a820f40 Mon Sep 17 00:00:00 2001 |
|
From: Akira TAGOH <akira@tagoh.org> |
|
Date: Thu, 15 Mar 2018 12:54:02 +0900 |
|
Subject: [PATCH 5/5] call setlocale |
|
|
|
--- |
|
fc-cache/fc-cache.c | 2 ++ |
|
fc-cat/fc-cat.c | 2 ++ |
|
fc-list/fc-list.c | 2 ++ |
|
fc-match/fc-match.c | 2 ++ |
|
fc-pattern/fc-pattern.c | 2 ++ |
|
fc-query/fc-query.c | 2 ++ |
|
fc-scan/fc-scan.c | 2 ++ |
|
7 files changed, 14 insertions(+) |
|
|
|
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c |
|
index dc93c19..87e3020 100644 |
|
--- a/fc-cache/fc-cache.c |
|
+++ b/fc-cache/fc-cache.c |
|
@@ -41,6 +41,7 @@ |
|
#include <fcntl.h> |
|
#include <dirent.h> |
|
#include <string.h> |
|
+#include <locale.h> |
|
|
|
#if defined (_WIN32) |
|
#define STRICT |
|
@@ -302,6 +303,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, "Efrsy:Vvh", longopts, NULL)) != -1) |
|
#else |
|
diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c |
|
index dfe30d7..69611bc 100644 |
|
--- a/fc-cat/fc-cat.c |
|
+++ b/fc-cat/fc-cat.c |
|
@@ -40,6 +40,7 @@ |
|
#include <sys/types.h> |
|
#include <sys/stat.h> |
|
#include <errno.h> |
|
+#include <locale.h> |
|
|
|
#ifdef ENABLE_NLS |
|
#include <libintl.h> |
|
@@ -271,6 +272,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, "Vvrh", longopts, NULL)) != -1) |
|
#else |
|
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c |
|
index 5cded50..2039acd 100644 |
|
--- a/fc-list/fc-list.c |
|
+++ b/fc-list/fc-list.c |
|
@@ -27,6 +27,7 @@ |
|
#include <unistd.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
+#include <locale.h> |
|
#ifdef HAVE_CONFIG_H |
|
#include <config.h> |
|
#else |
|
@@ -117,6 +118,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, "vbf:qVh", longopts, NULL)) != -1) |
|
#else |
|
diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c |
|
index 7902707..dee6147 100644 |
|
--- a/fc-match/fc-match.c |
|
+++ b/fc-match/fc-match.c |
|
@@ -36,6 +36,7 @@ |
|
#include <unistd.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
+#include <locale.h> |
|
|
|
#ifdef ENABLE_NLS |
|
#include <libintl.h> |
|
@@ -121,6 +122,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, "asvbf:Vh", longopts, NULL)) != -1) |
|
#else |
|
diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c |
|
index f63761c..7989b81 100644 |
|
--- a/fc-pattern/fc-pattern.c |
|
+++ b/fc-pattern/fc-pattern.c |
|
@@ -36,6 +36,7 @@ |
|
#include <unistd.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
+#include <locale.h> |
|
|
|
#ifdef ENABLE_NLS |
|
#include <libintl.h> |
|
@@ -111,6 +112,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, "cdf:Vh", longopts, NULL)) != -1) |
|
#else |
|
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c |
|
index 9da090d..fbffb84 100644 |
|
--- a/fc-query/fc-query.c |
|
+++ b/fc-query/fc-query.c |
|
@@ -39,6 +39,7 @@ |
|
#include <unistd.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
+#include <locale.h> |
|
|
|
#ifdef ENABLE_NLS |
|
#include <libintl.h> |
|
@@ -115,6 +116,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, "i:bf:Vh", longopts, NULL)) != -1) |
|
#else |
|
diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c |
|
index edb967c..9302ac5 100644 |
|
--- a/fc-scan/fc-scan.c |
|
+++ b/fc-scan/fc-scan.c |
|
@@ -39,6 +39,7 @@ |
|
#include <unistd.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
+#include <locale.h> |
|
|
|
#ifdef ENABLE_NLS |
|
#include <libintl.h> |
|
@@ -110,6 +111,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, "bf:Vh", longopts, NULL)) != -1) |
|
#else |
|
-- |
|
2.14.3 |
|
|
|
|