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 e377fff..592b214 100644 (file)
--- a/src/time/strftime.c
+++ b/src/time/strftime.c
@@ -8,7 +8,7 @@
 
 // FIXME: integer overflows
 
 
 // FIXME: integer overflows
 

-const char *__langinfo(nl_item);
+const char *__nl_langinfo_l(nl_item, locale_t);

 
 static int is_leap(int y)
 {
 
 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, 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:
                continue;
 nl_strftime:

-               fmt = __langinfo(item);
+               fmt = __nl_langinfo_l(item, loc);

 recu_strftime:
 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;
        }
        if (l >= n) return 0;
        s[l] = 0;