[PATCH] Check not only existence but also emptyness of environments
- To: fontconfig@xxxxxxxxxxxxxxxxxxxxx
- Subject: [PATCH] Check not only existence but also emptyness of environments
- From: gzjjgod@xxxxxxxxx
- Date: Mon, 4 Jun 2012 10:51:20 +0200
- Delivered-to: fontconfig@xxxxxxxxxxxxxxxxxxxxx
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=xAiqY93KjkooKKdVlNf4pA+I+Nkv/Pr4CborZlMZkns=; b=SPr8aAF33DL5LTteVYulz71xuGemXpYS/s/Clnohsec0Bg/8Z5kaKpbRbt/sV81ZFI XDS7RIukt6CbG9g3fxt25cebf6qPEYhVtiHZ8UqTWZIPX8FSoGre+GWPU8m8t7/CU+5o 0W1OkypmUaNoZfDlHxQkoEbKtGbqw3Z01DrmukeQnY5gDrjs+BK8uuAEkRp2KTyWEsx2 Fz/wpalTCWaQP0YInP3dQ+SjXQoN9ZgDEAzJPLY18zi0STk4rYrbykH4OSL71oBfDvlG kQwXb48Yz1Ic1B+k6yrCVwU1/yLkCBuuvoZUwXdMREJhGBO1GLtJyt3L4y1W0Tjh9lbg 0Tdg==
From: Jiang Jiang <gzjjgod@xxxxxxxxx>
Locale environment variables, especially LC_ALL, can be empty but
still set. If we don't check, FcGetDefaultLangs() will fallback to
"en" for LC_ALL="" case, even if LANG and LC_CTYPE are set.
---
src/fcdefault.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/fcdefault.c b/src/fcdefault.c
index 674374c..400d9f5 100644
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -46,11 +46,11 @@ FcGetDefaultLangs (void)
char *langs;
langs = getenv ("FC_LANG");
- if (!langs)
+ if (!langs || !strlen(langs))
langs = getenv ("LC_ALL");
- if (!langs)
+ if (!langs || !strlen(langs))
langs = getenv ("LC_CTYPE");
- if (!langs)
+ if (!langs || !strlen(langs))
langs = getenv ("LANG");
if (langs)
{
--
1.7.4.1
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
[Fedora Users]
[Fedora Cloud]
[Kernel]
[Fedora Legacy]
[Fedora Packaging]
[Fedora Desktop]
[PAM]
[Red Hat Development]
[Red Hat 9]
[Gimp]
[Yosemite News]