fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-05-30 16:11:40 +00:00
Code Issues Projects Releases Wiki Activity

rework langinfo code for ABI compat and for use by time code

Browse Source
This commit is contained in:
Rich Felker 2013-07-24 18:52:02 -04:00
parent ad4a536769
commit 87be54a135
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/locale/langinfo.c
View File

@ -25,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" "";
char *__langinfo(nl_item item) char *__nl_langinfo_l(nl_item item, locale_t loc)
{ {
int cat = item >> 16; int cat = item >> 16;
int idx = item & 65535; int idx = item & 65535;
@ -58,4 +58,10 @@ char *__langinfo(nl_item item)
return (char *)str; return (char *)str;
} }
weak_alias(__langinfo, nl_langinfo); char *__nl_langinfo(nl_item item)
{
return __nl_langinfo_l(item, LC_GLOBAL_LOCALE);
}
weak_alias(__nl_langinfo, nl_langinfo);
weak_alias(__nl_langinfo_l, nl_langinfo_l);

7
src/locale/nl_langinfo_l.c
View File

@ -1,7 +0,0 @@
#include <locale.h>
#include <langinfo.h>
char *nl_langinfo_l(nl_item item, locale_t l)
{
return nl_langinfo(item);
}

9
src/time/__asctime.c
View File

@ -3,14 +3,15 @@
#include <langinfo.h> #include <langinfo.h>
#include "atomic.h" #include "atomic.h"
const char *__langinfo(nl_item); const char *__nl_langinfo(nl_item);
char *__asctime(const struct tm *restrict tm, char *restrict buf) char *__asctime(const struct tm *restrict tm, char *restrict buf)
{ {
/* FIXME: change __langinfo to __C_langinfo once we have locales */ /* FIXME: change __nl_langinfo to __nl_langinfo_l with explicit C
* locale once we have locales */
if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
__langinfo(ABDAY_1+tm->tm_wday), __nl_langinfo(ABDAY_1+tm->tm_wday),
__langinfo(ABMON_1+tm->tm_mon), __nl_langinfo(ABMON_1+tm->tm_mon),
tm->tm_mday, tm->tm_hour, tm->tm_mday, tm->tm_hour,
tm->tm_min, tm->tm_sec, tm->tm_min, tm->tm_sec,
1900 + tm->tm_year) >= 26) 1900 + tm->tm_year) >= 26)

8
src/time/strftime.c
View File

@ -8,7 +8,7 @@
// FIXME: integer overflows // FIXME: integer overflows
const char *__langinfo(nl_item); const char *__nl_langinfo_l(nl_item, locale_t);
static int is_leap(int y) static int is_leap(int y)
{ {
@ -200,12 +200,12 @@ number:
l += snprintf(s+l, n-l, fmt, val); l += snprintf(s+l, n-l, fmt, val);
continue; continue;
nl_strcat: nl_strcat:
l += snprintf(s+l, n-l, "%s", __langinfo(item)); l += snprintf(s+l, n-l, "%s", __nl_langinfo_l(item, loc));
continue; continue;
nl_strftime: nl_strftime:
fmt = __langinfo(item); fmt = __nl_langinfo_l(item, loc);
recu_strftime: recu_strftime:
l += strftime(s+l, n-l, fmt, tm); l += __strftime_l(s+l, n-l, fmt, tm, loc);
} }
if (l >= n) return 0; if (l >= n) return 0;
s[l] = 0; s[l] = 0;