jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nl_langinfo to actually use the existing, correct internal version

Browse source
This commit is contained in:
Rich Felker 2011-04-03 19:51:14 -04:00
commit 5600088d38
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/locale/langinfo.c
View file

@ -1,5 +1,6 @@
#include <locale.h> #include <locale.h>
#include <langinfo.h> #include <langinfo.h>
#include "libc.h"
static const char c_time[] = static const char c_time[] =
"Sun\0" "Mon\0" "Tue\0" "Wed\0" "Thu\0" "Fri\0" "Sat\0" "Sun\0" "Mon\0" "Tue\0" "Wed\0" "Thu\0" "Fri\0" "Sat\0"
@ -24,7 +25,7 @@ static const char c_time[] =
static const char c_messages[] = "^[yY]\0" "^[nN]"; static const char c_messages[] = "^[yY]\0" "^[nN]";
static const char c_numeric[] = ".\0" ""; static const char c_numeric[] = ".\0" "";
const char *__langinfo(nl_item item) char *__langinfo(nl_item item)
{ {
int cat = item >> 16; int cat = item >> 16;
int idx = item & 65535; int idx = item & 65535;
@ -54,5 +55,7 @@ const char *__langinfo(nl_item item)
} }
for (; idx; idx--, str++) for (; *str; str++); for (; idx; idx--, str++) for (; *str; str++);
return str; return (char *)str;
} }
weak_alias(__langinfo, nl_langinfo);

13
src/locale/nl_langinfo.c
View file

@ -1,13 +0,0 @@
#include <langinfo.h>
// FIXME: other items
char *nl_langinfo(nl_item item)
{
switch (item) {
case CODESET:
return "UTF-8";
default:
return "";
}
}