properly pass current locale to *_l functions when used internally

[musl] / src / time / strftime.c

diff --git a/src/time/strftime.c b/src/time/strftime.c
index 24000f3..794fbe1 100644 (file)
--- a/src/time/strftime.c
+++ b/src/time/strftime.c
@@ -5,7 +5,9 @@
 #include <locale.h>
 #include <time.h>
 #include <limits.h>
+#include "locale_impl.h"
 #include "libc.h"
+#include "time_impl.h"
 
 const char *__nl_langinfo_l(nl_item, locale_t);
 
@@ -43,6 +45,7 @@ static int week_num(const struct tm *tm)
        return val;
 }
 
+const char *__tm_to_tzname(const struct tm *);
 size_t __strftime_l(char *restrict, size_t, const char *restrict, const struct tm *restrict, locale_t);
 
 const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc)
@@ -79,8 +82,8 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
                fmt = "%m/%d/%y";
                goto recu_strftime;
        case 'e':
-               val = tm->tm_mday;
-               goto number;
+               *l = snprintf(*s, sizeof *s, "%2d", tm->tm_mday);
+               return *s;
        case 'F':
                fmt = "%Y-%m-%d";
                goto recu_strftime;
@@ -122,6 +125,10 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
        case 'R':
                fmt = "%H:%M";
                goto recu_strftime;
+       case 's':
+               val = __tm_to_secs(tm) + tm->__tm_gmtoff;
+               width = 1;
+               goto number;
        case 'S':
                val = tm->tm_sec;
                goto number;
@@ -166,11 +173,20 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
                width = 4;
                goto number;
        case 'z':
-               val = -tm->__tm_gmtoff;
-               *l = snprintf(*s, sizeof *s, "%+.2d%.2d", val/3600, abs(val%3600)/60);
+               if (tm->tm_isdst < 0) {
+                       *l = 0;
+                       return "";
+               }
+               *l = snprintf(*s, sizeof *s, "%+.2d%.2d",
+                       (-tm->__tm_gmtoff)/3600,
+                       abs(tm->__tm_gmtoff%3600)/60);
                return *s;
        case 'Z':
-               fmt = tm->__tm_zone;
+               if (tm->tm_isdst < 0) {
+                       *l = 0;
+                       return "";
+               }
+               fmt = __tm_to_tzname(tm);
                goto string;
        case '%':
                *l = 1;
@@ -202,7 +218,7 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
        const char *t;
        int plus;
        unsigned long width;
-       for (l=0; l+1<n; f++) {
+       for (l=0; l<n; f++) {
                if (!*f) {
                        s[l] = 0;
                        return l;
@@ -216,14 +232,13 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
                width = strtoul(f, &p, 10);
                if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') {
                        if (!width && p!=f) width = 1;
-                       if (width >= n-l) return 0;
                } else {
                        width = 0;
                }
                f = p;
                if (*f == 'E' || *f == 'O') f++;
                t = __strftime_fmt_1(&buf, &k, *f, tm, loc);
-               if (!t) return 0;
+               if (!t) break;
                if (width) {
                        for (; *t=='+' || *t=='-' || (*t=='0'&&t[1]); t++, k--);
                        width--;
@@ -233,20 +248,23 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
                                s[l++] = '-';
                        else
                                width++;
-                       if (width >= n-l) return 0;
-                       for (; width > k; width--)
+                       for (; width > k && l < n; width--)
                                s[l++] = '0';
                }
-               if (k >= n-l) return 0;
+               if (k > n-l) k = n-l;
                memcpy(s+l, t, k);
                l += k;
        }
+       if (n) {
+               if (l==n) l=n-1;
+               s[l] = 0;
+       }
        return 0;
 }
 
 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, 0);
+       return __strftime_l(s, n, f, tm, CURRENT_LOCALE);
 }
 
 weak_alias(__strftime_l, strftime_l);