make setlocale return a single name for LC_ALL if all categories match

when called for LC_ALL, setlocale has to return a string representing
the state of all locale categories. the simplest way to do this was to
always return a delimited list of values for each category, but that's
not friendly in the fairly common case where all categories have the
same setting. He X proposed a patch to check for this case and return
a single name; this patch is a simplified approach to do the same.
This commit is contained in:
Rich Felker
2017-03-21 08:54:19 -04:00
parent 0c53178ec0
commit 16319a5df9
+5 -2
View File
@@ -48,10 +48,13 @@ char *setlocale(int cat, const char *name)
}
}
char *s = buf;
const char *part;
int same = 0;
for (i=0; i<LC_ALL; i++) {
const struct __locale_map *lm =
libc.global_locale.cat[i];
const char *part = lm ? lm->name : "C";
if (lm == libc.global_locale.cat[0]) same++;
part = lm ? lm->name : "C";
size_t l = strlen(part);
memcpy(s, part, l);
s[l] = ';';
@@ -59,7 +62,7 @@ char *setlocale(int cat, const char *name)
}
*--s = 0;
UNLOCK(lock);
return buf;
return same==LC_ALL ? (char *)part : buf;
}
char *ret = setlocale_one_unlocked(cat, name);