external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix omission: update radix point on LANG change (re: f0386a87)

Browse source 
Of course we need to check LC_LANG (for the LANG variable) as well.
This commit is contained in:
Martijn Dekker 2022-06-05 14:27:31 +01:00
parent e3aa32a129
commit a0effeb0dc
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/ksh93/sh/init.c
View file

@ -485,7 +485,7 @@ static void init_radixpoint(void)
} }
} }
nv_putv(np, val, flags, fp); nv_putv(np, val, flags, fp);
if(type==LC_ALL || type==LC_NUMERIC) if(type==LC_ALL || type==LC_NUMERIC || type==LC_LANG)
init_radixpoint(); init_radixpoint();
if(CC_NATIVE!=CC_ASCII && (type==LC_ALL || type==LC_LANG || type==LC_CTYPE)) if(CC_NATIVE!=CC_ASCII && (type==LC_ALL || type==LC_LANG || type==LC_CTYPE))
{ {

8
src/cmd/ksh93/tests/locale.sh
View file

@ -415,5 +415,13 @@ then
"(expected $(printf %q "$exp"); got $(printf %q "$got"))" "(expected $(printf %q "$exp"); got $(printf %q "$got"))"
fi fi
# ======
(LANG=C_EU && LC_NUMERIC=C && let .5) || err_exit "radix point not updated by LC_NUMERIC"
(LANG=C && LC_NUMERIC=C_EU && let ,5) || err_exit "radix point not updated by LC_NUMERIC"
(LC_NUMERIC=C_EU && LC_ALL=C && let .5) || err_exit "radix point not updated by LC_ALL"
(LC_NUMERIC=C && LC_ALL=C_EU && let ,5) || err_exit "radix point not updated by LC_ALL"
(LC_ALL=C_EU && unset LC_ALL && LANG=C && let .5) || err_exit "radix point not updated by LANG"
(LC_ALL=C && unset LC_ALL && LANG=C_EU && let ,5) || err_exit "radix point not updated by LANG"
# ====== # ======
exit $((Errors<125?Errors:125)) exit $((Errors<125?Errors:125))