diff options
| -rw-r--r-- | src/locale/langinfo.c | 10 | ||||
| -rw-r--r-- | src/locale/nl_langinfo_l.c | 7 | ||||
| -rw-r--r-- | src/time/__asctime.c | 9 | ||||
| -rw-r--r-- | src/time/strftime.c | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c index 01593148..b4d53744 100644 --- a/src/locale/langinfo.c +++ b/src/locale/langinfo.c @@ -25,7 +25,7 @@ static const char c_time[] = static const char c_messages[] = "^[yY]\0" "^[nN]"; 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 idx = item & 65535; @@ -58,4 +58,10 @@ char *__langinfo(nl_item item) 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); diff --git a/src/locale/nl_langinfo_l.c b/src/locale/nl_langinfo_l.c deleted file mode 100644 index b54db95c..00000000 --- a/src/locale/nl_langinfo_l.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <locale.h> -#include <langinfo.h> - -char *nl_langinfo_l(nl_item item, locale_t l) -{ - return nl_langinfo(item); -} diff --git a/src/time/__asctime.c b/src/time/__asctime.c index 5362f0db..e7e7f07e 100644 --- a/src/time/__asctime.c +++ b/src/time/__asctime.c @@ -3,14 +3,15 @@ #include <langinfo.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) { - /* 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", - __langinfo(ABDAY_1+tm->tm_wday), - __langinfo(ABMON_1+tm->tm_mon), + __nl_langinfo(ABDAY_1+tm->tm_wday), + __nl_langinfo(ABMON_1+tm->tm_mon), tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, 1900 + tm->tm_year) >= 26) diff --git a/src/time/strftime.c b/src/time/strftime.c index e377fff2..592b214d 100644 --- a/src/time/strftime.c +++ b/src/time/strftime.c @@ -8,7 +8,7 @@ // FIXME: integer overflows -const char *__langinfo(nl_item); +const char *__nl_langinfo_l(nl_item, locale_t); static int is_leap(int y) { @@ -200,12 +200,12 @@ number: l += snprintf(s+l, n-l, fmt, val); continue; nl_strcat: - l += snprintf(s+l, n-l, "%s", __langinfo(item)); + l += snprintf(s+l, n-l, "%s", __nl_langinfo_l(item, loc)); continue; nl_strftime: - fmt = __langinfo(item); + fmt = __nl_langinfo_l(item, loc); 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; s[l] = 0; |