projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix failure to check malloc result in setenv
[musl]
/
src
/
time
/
strftime.c
diff --git
a/src/time/strftime.c
b/src/time/strftime.c
index
48f6532
..
dac6403
100644
(file)
--- a/
src/time/strftime.c
+++ b/
src/time/strftime.c
@@
-6,6
+6,7
@@
#include <time.h>
#include <limits.h>
#include "libc.h"
#include <time.h>
#include <limits.h>
#include "libc.h"
+#include "time_impl.h"
const char *__nl_langinfo_l(nl_item, locale_t);
const char *__nl_langinfo_l(nl_item, locale_t);
@@
-80,8
+81,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':
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;
case 'F':
fmt = "%Y-%m-%d";
goto recu_strftime;
@@
-123,6
+124,9
@@
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 'R':
fmt = "%H:%M";
goto recu_strftime;
+ case 's':
+ val = __tm_to_secs(tm) + tm->__tm_gmtoff;
+ goto number;
case 'S':
val = tm->tm_sec;
goto number;
case 'S':
val = tm->tm_sec;
goto number;