* nlsfuncs.cc (initial_setlocale): Move check whether charset has

	changed from here...
	(internal_setlocale): ...to here, to avoid unnecessary work when invoked
	via CW_INT_SETLOCALE.

1 files changed, 7 insertions, 3 deletions

diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index 5fa767b84..8444768b6 100644
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -1129,12 +1129,17 @@ internal_setlocale ()
   /* FIXME: It could be necessary to convert the entire environment,
 	    not just PATH. */
   tmp_pathbuf tp;
-  char *path = getenv ("PATH");
+  char *path;
   wchar_t *w_path = NULL, *w_cwd;
 
+  /* Don't do anything if the charset hasn't actually changed. */
+  if (strcmp (cygheap->locale.charset, __locale_charset ()) == 0)
+    return;
+
   debug_printf ("Cygwin charset changed from %s to %s",
 		cygheap->locale.charset, __locale_charset ());
   /* Fetch PATH and CWD and convert to wchar_t in previous charset. */
+  path = getenv ("PATH");
   if (path && *path)	/* $PATH can be potentially unset. */
     {
       w_path = tp.w_get ();
@@ -1175,8 +1180,7 @@ void
 initial_setlocale ()
 {
   char *ret = _setlocale_r (_REENT, LC_CTYPE, "");
-  if (ret && check_codepage (ret)
-      && strcmp (cygheap->locale.charset, __locale_charset ()) != 0)
+  if (ret && check_codepage (ret))
     internal_setlocale ();
 }