fix locale environment variable logic for empty strings

per POSIX (XBD 8.2) LC_*/LANG environment variables set to to the
empty string are supposed to be treated as if they were not set at
all.

diff --git a/src/locale/__setlocalecat.c b/src/locale/__setlocalecat.c
index f1e4bf07939d315bef1a9320ecce8c0dc6ad6d1f..a947dbfff8a3388f73cd993e42ec92fa5f538f04 100644 (file)
--- a/src/locale/__setlocalecat.c
+++ b/src/locale/__setlocalecat.c
@@ -16,9 +16,9 @@ static const char envvars[][12] = {
 int __setlocalecat(locale_t loc, int cat, const char *val)
 {
        if (!*val) {
-               (val = getenv("LC_ALL")) ||
-               (val = getenv(envvars[cat])) ||
-               (val = getenv("LANG")) ||
+               (val = getenv("LC_ALL")) && *val ||
+               (val = getenv(envvars[cat])) && *val ||
+               (val = getenv("LANG")) && *val ||
                (val = "C.UTF-8");
        }