projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
dac6403
..
794fbe1
100644
(file)
--- a/
src/time/strftime.c
+++ b/
src/time/strftime.c
@@
-5,6
+5,7
@@
#include <locale.h>
#include <time.h>
#include <limits.h>
#include <locale.h>
#include <time.h>
#include <limits.h>
+#include "locale_impl.h"
#include "libc.h"
#include "time_impl.h"
#include "libc.h"
#include "time_impl.h"
@@
-126,6
+127,7
@@
const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
goto recu_strftime;
case 's':
val = __tm_to_secs(tm) + tm->__tm_gmtoff;
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;
case 'S':
val = tm->tm_sec;
@@
-216,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;
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;
if (!*f) {
s[l] = 0;
return l;
@@
-230,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;
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);
} 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--;
if (width) {
for (; *t=='+' || *t=='-' || (*t=='0'&&t[1]); t++, k--);
width--;
@@
-247,20
+248,23
@@
size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
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
;
memcpy(s+l, t, k);
l += k;
}
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 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);
}
weak_alias(__strftime_l, strftime_l);