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

[musl] / src / time / strftime.c

diff --git a/src/time/strftime.c b/src/time/strftime.c
index d16e813..592b214 100644 (file)
--- a/src/time/strftime.c
+++ b/src/time/strftime.c
@@ -1,12 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <langinfo.h>
+#include <locale.h>
 #include <time.h>
 #include <limits.h>
+#include "libc.h"
 
 // FIXME: integer overflows
 
-const char *__langinfo(nl_item);
+const char *__nl_langinfo_l(nl_item, locale_t);
 
 static int is_leap(int y)
 {
@@ -42,7 +44,7 @@ static int week_num(const struct tm *tm)
        return val;
 }
 
-size_t strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm)
+size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t loc)
 {
        nl_item item;
        int val;
@@ -198,14 +200,21 @@ 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;
        return l;
 }
+
+size_t strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm)
+{
+       return __strftime_l(s, n, f, tm, LC_GLOBAL_LOCALE);
+}
+
+weak_alias(__strftime_l, strftime_l);