Ignore empty environment strings.

7c871f0c · Alexandre Julliard · 93d23a15 · 7c871f0c
Commit 7c871f0c authored Oct 17, 2005 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

locale.c dlls/kernel/locale.c +3 -3

No files found.
--- a/dlls/kernel/locale.c
+++ b/dlls/kernel/locale.c
@@ -505,9 +505,9 @@ static LCID get_env_lcid( UINT *unix_cp, const char *env_str )
    char *buf, *lang,*country,*charset,*dialect,*next;
    LCID ret = 0;

-    if ((lang = getenv( "LC_ALL" )) ||
-        (env_str && (lang = getenv( env_str ))) ||
-        (lang = getenv( "LANG" )))
+    if (((lang = getenv( "LC_ALL" )) && *lang) ||
+        (env_str && (lang = getenv( env_str )) && *lang) ||
+        ((lang = getenv( "LANG" )) && *lang))
    {
        if (!strcmp(lang,"POSIX") || !strcmp(lang,"C")) goto done;