1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From 6399fa9d29ea83de4735680b77d457bd59606532 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 7 Jul 2016 16:51:37 -0400
Subject: fix asctime day/month names not to vary by locale
the FIXME comment here was overlooked at the time locale support was
added.
---
src/time/__asctime.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/time/__asctime.c b/src/time/__asctime.c
index e7e7f07..f114dfe 100644
--- a/src/time/__asctime.c
+++ b/src/time/__asctime.c
@@ -1,17 +1,16 @@
#include <time.h>
#include <stdio.h>
#include <langinfo.h>
+#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)
--
cgit v0.11.2
|
