d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix printout case when LANG is overwritten by LC_ALL

Browse Source
This commit is contained in:
ache 2004-02-01 10:32:22 +00:00
parent 291c8ffa96
commit 5ee9967942
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/locale/locale.c
View File

@ -421,16 +421,19 @@ void
showlocale(void)
{
size_t i;
const char *lang, *vval, *eval;
const char *lang, *vval, *eval, *lcall;
setlocale(LC_ALL, "");
(void)setlocale(LC_ALL, "");
lang = getenv("LANG");
if (lang == NULL) {
if ((lang = getenv("LANG")) == NULL)
lang = "";
}
printf("LANG=%s\n", lang);
/* XXX: if LANG is null, then set it to "C" to get implied values? */
if ((lcall = getenv("LC_ALL")) == NULL)
lcall = "";
if (!*lcall || !strcmp(lang, lcall))
printf("LANG=%s\n", lang);
else
printf("LANG=\"%s\"\n", lcall);
for (i = 0; i < NLCINFO; i++) {
vval = setlocale(lcinfo[i].id, NULL);
@ -451,11 +454,7 @@ showlocale(void)
}
}
vval = getenv("LC_ALL");
if (vval == NULL) {
vval = "";
}
printf("LC_ALL=%s\n", vval);
printf("LC_ALL=%s\n", lcall);
}
/*