From 73535010d72d1a7d46e4f5c6c98f41fab90df489 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 15 May 2009 11:30:18 +0000
Subject: 	* cygpath.cc (main): Only setlocale for LC_CTYPE category. 
 Fallback 	to UTF-8 if locale is "C". 	* ldd.cc (main): Ditto. 
 * mkgroup.c (main): Ditto. 	* mkpasswd.c (main): Ditto. 	* passwd.c
 (main): Ditto.

---
 winsup/utils/ldd.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'winsup/utils/ldd.cc')

diff --git a/winsup/utils/ldd.cc b/winsup/utils/ldd.cc
index 7a7e04ab9..b2d6f7b92 100644
--- a/winsup/utils/ldd.cc
+++ b/winsup/utils/ldd.cc
@@ -327,7 +327,11 @@ main (int argc, char **argv)
 {
   int optch;
   int index;
-  setlocale (LC_ALL, "");
+
+  /* Use locale from environment.  If not set or set to "C", use UTF-8. */
+  setlocale (LC_CTYPE, "");
+  if (!strcmp (setlocale (LC_CTYPE, NULL), "C"))
+    setlocale (LC_CTYPE, "en_US.UTF-8");
   while ((optch = getopt_long (argc, argv, "dru", longopts, &index)) != -1)
     switch (optch)
       {
-- 
cgit v1.2.3