From: Rich Felker Date: Thu, 7 Jul 2016 20:51:37 +0000 (-0400) Subject: fix asctime day/month names not to vary by locale X-Git-Tag: v1.1.16~85 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6399fa9d29ea83de4735680b77d457bd59606532;p=oweals%2Fmusl.git fix asctime day/month names not to vary by locale the FIXME comment here was overlooked at the time locale support was added. --- diff --git a/src/time/__asctime.c b/src/time/__asctime.c index e7e7f07e..f114dfe7 100644 --- a/src/time/__asctime.c +++ b/src/time/__asctime.c @@ -1,17 +1,16 @@ #include #include #include +#include "locale_impl.h" #include "atomic.h" -const char *__nl_langinfo(nl_item); +const char *__nl_langinfo_l(nl_item, locale_t); char *__asctime(const struct tm *restrict tm, char *restrict buf) { - /* 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", - __nl_langinfo(ABDAY_1+tm->tm_wday), - __nl_langinfo(ABMON_1+tm->tm_mon), + __nl_langinfo_l(ABDAY_1+tm->tm_wday, C_LOCALE), + __nl_langinfo_l(ABMON_1+tm->tm_mon, C_LOCALE), tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, 1900 + tm->tm_year) >= 26)