elf.h: add ELFCOMPRESS_ZSTD

[musl] / src / time / wcsftime.c

diff --git a/src/time/wcsftime.c b/src/time/wcsftime.c
index 72af913..8e1437b 100644 (file)
--- a/src/time/wcsftime.c
+++ b/src/time/wcsftime.c
@@ -1,10 +1,8 @@
 #include <wchar.h>
 #include <time.h>
-#include <string.h>
 #include <locale.h>
-#include "libc.h"
-
-const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc);
+#include "locale_impl.h"
+#include "time_impl.h"
 
 size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, const struct tm *restrict tm, locale_t loc)
 {
@@ -14,9 +12,9 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
        wchar_t *p;
        const char *t_mb;
        const wchar_t *t;
-       int plus;
+       int pad, plus;
        unsigned long width;
-       for (l=0; l+1<n; f++) {
+       for (l=0; l<n; f++) {
                if (!*f) {
                        s[l] = 0;
                        return l;
@@ -26,18 +24,19 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
                        continue;
                }
                f++;
+               pad = 0;
+               if (*f == '-' || *f == '_' || *f == '0') pad = *f++;
                if ((plus = (*f == '+'))) f++;
                width = wcstoul(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_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc);
-               if (!t_mb) return 0;
+               t_mb = __strftime_fmt_1(&buf, &k, *f, tm, loc, pad);
+               if (!t_mb) break;
                k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf);
                if (k == (size_t)-1) return 0;
                t = wbuf;
@@ -50,20 +49,23 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
                                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;
                wmemcpy(s+l, t, k);
                l += k;
        }
+       if (n) {
+               if (l==n) l=n-1;
+               s[l] = 0;
+       }
        return 0;
 }
 
 size_t wcsftime(wchar_t *restrict wcs, size_t n, const wchar_t *restrict f, const struct tm *restrict tm)
 {
-       return __wcsftime_l(wcs, n, f, tm, 0);
+       return __wcsftime_l(wcs, n, f, tm, CURRENT_LOCALE);
 }
 
 weak_alias(__wcsftime_l, wcsftime_l);