JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* main.c: when doing the conversion from strcasecmp (wrongly used)

Browse Source 
to strcasestr, it was used in a wrong way (reverse logic error in
  checking its return value), turning to mis-detection of UTF-8 locale.
* sh.h, check.t: bump version
* copyright: bump year
This commit is contained in:
tg
2007-01-03 22:43:48 +00:00
parent 127760cfa5
commit 17a3fffc26
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -13,7 +13,7 @@
#include <locale.h>
#endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.62 2006/11/16 13:35:07 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.63 2007/01/03 22:43:47 tg Exp $");
extern char **environ;
@ -284,11 +284,11 @@ main(int argc, char *argv[])
if (!Flag(FUTFHACK)) {
cc = setlocale(LC_CTYPE, "");
#if HAVE_LANGINFO_CODESET
if (strcasestr(cc, "UTF-8") && strcasestr(cc, "utf8"))
if (!strcasestr(cc, "UTF-8") && !strcasestr(cc, "utf8"))
cc = nl_langinfo(CODESET);
#endif
Flag(FUTFHACK) = !(strcasestr(cc, "UTF-8") &&
strcasestr(cc, "utf8"));
Flag(FUTFHACK) = strcasestr(cc, "UTF-8") ||
strcasestr(cc, "utf8");
}
#endif
x_init();