projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix system breakage window during make install due to permissions
[musl]
/
src
/
time
/
wcsftime.c
diff --git
a/src/time/wcsftime.c
b/src/time/wcsftime.c
index
72af913
..
8d2a2eb
100644
(file)
--- a/
src/time/wcsftime.c
+++ b/
src/time/wcsftime.c
@@
-1,6
+1,5
@@
#include <wchar.h>
#include <time.h>
#include <wchar.h>
#include <time.h>
-#include <string.h>
#include <locale.h>
#include "libc.h"
#include <locale.h>
#include "libc.h"
@@
-16,7
+15,7
@@
size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
const wchar_t *t;
int plus;
unsigned long width;
const wchar_t *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;
if (!*f) {
s[l] = 0;
return l;
@@
-30,14
+29,13
@@
size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
width = wcstoul(f, &p, 10);
if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') {
if (!width && p!=f) width = 1;
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);
} 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
;
+ if (!t_mb)
break
;
k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf);
if (k == (size_t)-1) return 0;
t = wbuf;
k = mbstowcs(wbuf, t_mb, sizeof wbuf / sizeof *wbuf);
if (k == (size_t)-1) return 0;
t = wbuf;
@@
-50,14
+48,17
@@
size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co
s[l++] = '-';
else
width++;
s[l++] = '-';
else
width++;
- if (width >= n-l) return 0;
- for (; width > k; width--)
+ for (; width > k && l < n; width--)
s[l++] = '0';
}
s[l++] = '0';
}
- if (k >= n-l)
return 0
;
+ if (k >= n-l)
k = n-l
;
wmemcpy(s+l, t, k);
l += k;
}
wmemcpy(s+l, t, k);
l += k;
}
+ if (n) {
+ if (l==n) l=n-1;
+ s[l] = 0;
+ }
return 0;
}
return 0;
}