aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin/environ.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2009-03-25 12:29:04 +0000
committerCorinna Vinschen <corinna@vinschen.de>2009-03-25 12:29:04 +0000
commit5354e13fe6ec71bcddd355b1a71fdde7c9067a72 (patch)
tree34598ae5ec862c6a4b46458b6a224518e140c8cb /winsup/cygwin/environ.cc
parentf276aab75a74d66ab8388a8eab1cb902fea6dffc (diff)
downloadnewlib-5354e13fe6ec71bcddd355b1a71fdde7c9067a72.zip
newlib-5354e13fe6ec71bcddd355b1a71fdde7c9067a72.tar.gz
newlib-5354e13fe6ec71bcddd355b1a71fdde7c9067a72.tar.bz2
* environ.cc (environ_init): Break from locale loop after first hit.
* fhandler_console.cc (fhandler_console::write_normal): Print a SO sequence using always valid Unicode chars.
Diffstat (limited to 'winsup/cygwin/environ.cc')
-rw-r--r--winsup/cygwin/environ.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 41b122b..75e1ffb 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -791,7 +791,10 @@ environ_init (char **envp, int envc)
char *buf = (char *) alloca (i);
GetEnvironmentVariableA (lc_arr[lc], buf, i);
if (_setlocale_r (_GLOBAL_REENT, LC_CTYPE, buf))
- got_lc = true;
+ {
+ got_lc = true;
+ break;
+ }
}
}
/* No matching POSIX environment variable, use current codepage. */