diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-07-24 18:52:02 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-07-24 18:52:02 -0400 |
| commit | 87be54a135db6d9ad16fcffe72b05c8d23b0f089 (patch) | |
| tree | d8ed72c76869c96515034fc0bf56792742ab0c1e /src/time | |
| parent | ad4a536769b5d4a736e324a7416571b0c17e47b9 (diff) | |
| download | musl-87be54a135db6d9ad16fcffe72b05c8d23b0f089.tar.gz | |
rework langinfo code for ABI compat and for use by time code
Diffstat (limited to 'src/time')
| -rw-r--r-- | src/time/__asctime.c | 9 | ||||
| -rw-r--r-- | src/time/strftime.c | 8 |
2 files changed, 9 insertions, 8 deletions
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; |