projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add reverse iconv mappings for JIS-based encodings
[oweals/musl.git]
/
src
/
locale
/
langinfo.c
diff --git
a/src/locale/langinfo.c
b/src/locale/langinfo.c
index b4d53744ae13e887384c770325d48abb8f1bdc38..b16caf44e6bf298b9f145fac9456d2b69f180ab7 100644
(file)
--- a/
src/locale/langinfo.c
+++ b/
src/locale/langinfo.c
@@
-1,5
+1,6
@@
#include <locale.h>
#include <langinfo.h>
#include <locale.h>
#include <langinfo.h>
+#include "locale_impl.h"
#include "libc.h"
static const char c_time[] =
#include "libc.h"
static const char c_time[] =
@@
-17,12
+18,13
@@
static const char c_time[] =
"%H:%M:%S\0"
"%I:%M:%S %p\0"
"\0"
"%H:%M:%S\0"
"%I:%M:%S %p\0"
"\0"
+ "\0"
"%m/%d/%y\0"
"%m/%d/%y\0"
- "0123456789"
+ "0123456789
\0
"
"%a %b %e %T %Y\0"
"%H:%M:%S";
"%a %b %e %T %Y\0"
"%H:%M:%S";
-static const char c_messages[] = "^[yY]\0" "^[nN]";
+static const char c_messages[] = "^[yY]\0" "^[nN]
\0" "yes\0" "no
";
static const char c_numeric[] = ".\0" "";
char *__nl_langinfo_l(nl_item item, locale_t loc)
static const char c_numeric[] = ".\0" "";
char *__nl_langinfo_l(nl_item item, locale_t loc)
@@
-31,36
+33,41
@@
char *__nl_langinfo_l(nl_item item, locale_t loc)
int idx = item & 65535;
const char *str;
int idx = item & 65535;
const char *str;
- if (item == CODESET) return "UTF-8";
+ if (item == CODESET) return MB_CUR_MAX==1 ? "ASCII" : "UTF-8";
+
+ /* _NL_LOCALE_NAME extension */
+ if (idx == 65535 && cat < LC_ALL)
+ return loc->cat[cat] ? (char *)loc->cat[cat]->name : "C";
switch (cat) {
case LC_NUMERIC:
switch (cat) {
case LC_NUMERIC:
- if (idx > 1) return
NULL
;
+ if (idx > 1) return
""
;
str = c_numeric;
break;
case LC_TIME:
str = c_numeric;
break;
case LC_TIME:
- if (idx > 0x31) return
NULL
;
+ if (idx > 0x31) return
""
;
str = c_time;
break;
case LC_MONETARY:
str = c_time;
break;
case LC_MONETARY:
- if (idx > 0) return
NULL
;
+ if (idx > 0) return
""
;
str = "";
break;
case LC_MESSAGES:
str = "";
break;
case LC_MESSAGES:
- if (idx >
1) return NULL
;
+ if (idx >
3) return ""
;
str = c_messages;
break;
default:
str = c_messages;
break;
default:
- return
NULL
;
+ return
""
;
}
for (; idx; idx--, str++) for (; *str; str++);
}
for (; idx; idx--, str++) for (; *str; str++);
+ if (cat != LC_NUMERIC && *str) str = LCTRANS(str, cat, loc);
return (char *)str;
}
char *__nl_langinfo(nl_item item)
{
return (char *)str;
}
char *__nl_langinfo(nl_item item)
{
- return __nl_langinfo_l(item,
LC_GLOBAL
_LOCALE);
+ return __nl_langinfo_l(item,
CURRENT
_LOCALE);
}
weak_alias(__nl_langinfo, nl_langinfo);
}
weak_alias(__nl_langinfo, nl_langinfo);