projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add pthread_setaffinity_np and pthread_getaffinity_np functions
[musl]
/
src
/
time
/
strftime.c
diff --git
a/src/time/strftime.c
b/src/time/strftime.c
index
5768705
..
3f0ec3e
100644
(file)
--- a/
src/time/strftime.c
+++ b/
src/time/strftime.c
@@
-1,13
+1,14
@@
#include <stdio.h>
#include <stdlib.h>
#include <langinfo.h>
#include <stdio.h>
#include <stdlib.h>
#include <langinfo.h>
+#include <locale.h>
#include <time.h>
#include <limits.h>
#include <time.h>
#include <limits.h>
-#include "
__time
.h"
+#include "
libc
.h"
// FIXME: integer overflows
// FIXME: integer overflows
-const char *__
langinfo(nl_item
);
+const char *__
nl_langinfo_l(nl_item, locale_t
);
static int is_leap(int y)
{
static int is_leap(int y)
{
@@
-43,14
+44,18
@@
static int week_num(const struct tm *tm)
return val;
}
return val;
}
-size_t
strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm
)
+size_t
__strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t loc
)
{
nl_item item;
int val;
const char *fmt;
size_t l;
for (l=0; *f && l<n; f++) {
{
nl_item item;
int val;
const char *fmt;
size_t l;
for (l=0; *f && l<n; f++) {
- if (*f == '%') {
+ if (*f != '%') {
+literal:
+ s[l++] = *f;
+ continue;
+ }
do_fmt:
switch (*++f) {
case '%':
do_fmt:
switch (*++f) {
case '%':
@@
-182,34
+187,34
@@
do_fmt:
fmt = "%04d";
goto number;
case 'z':
fmt = "%04d";
goto number;
case 'z':
- if (tm->tm_isdst < 0) continue;
- val = -__timezone - (tm->tm_isdst ? __dst_offset : 0);
+ val = -tm->__tm_gmtoff;
l += snprintf(s+l, n-l, "%+.2d%.2d", val/3600, abs(val%3600)/60);
continue;
case 'Z':
l += snprintf(s+l, n-l, "%+.2d%.2d", val/3600, abs(val%3600)/60);
continue;
case 'Z':
- if (tm->tm_isdst < 0 || !__tzname[0] || !__tzname[0][0])
- continue;
- l += snprintf(s+l, n-l, "%s", __tzname[!!tm->tm_isdst]);
+ l += snprintf(s+l, n-l, "%s", tm->__tm_zone);
continue;
default:
return 0;
}
continue;
default:
return 0;
}
- }
-literal:
- s[l++] = *f;
- continue;
number:
l += snprintf(s+l, n-l, fmt, val);
continue;
nl_strcat:
number:
l += snprintf(s+l, n-l, fmt, val);
continue;
nl_strcat:
- l += snprintf(s+l, n-l, "%s", __
langinfo(item
));
+ l += snprintf(s+l, n-l, "%s", __
nl_langinfo_l(item, loc
));
continue;
nl_strftime:
continue;
nl_strftime:
- fmt = __
langinfo(item
);
+ fmt = __
nl_langinfo_l(item, loc
);
recu_strftime:
recu_strftime:
- l +=
strftime(s+l, n-l, fmt, tm
);
+ l +=
__strftime_l(s+l, n-l, fmt, tm, loc
);
}
if (l >= n) return 0;
s[l] = 0;
return l;
}
}
if (l >= n) return 0;
s[l] = 0;
return l;
}
+
+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);
+}
+
+weak_alias(__strftime_l, strftime_l);