#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <langinfo.h>
#include <locale.h>
#include <time.h>
#include <limits.h>
+#include "locale_impl.h"
#include "libc.h"
-
-// FIXME: integer overflows
+#include "time_impl.h"
const char *__nl_langinfo_l(nl_item, locale_t);
return val;
}
+const char *__tm_to_tzname(const struct tm *);
size_t __strftime_l(char *restrict, size_t, const char *restrict, const struct tm *restrict, locale_t);
-int __strftime_fmt_1(char *s, size_t n, int f, const struct tm *tm, locale_t loc)
+const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc)
{
nl_item item;
- int val;
+ long long val;
const char *fmt;
- size_t l;
-
- if (n<2) return 0;
+ int width = 2;
switch (f) {
case 'a':
item = D_T_FMT;
goto nl_strftime;
case 'C':
- val = (1900+tm->tm_year) / 100;
- fmt = "%02d";
+ val = (1900LL+tm->tm_year) / 100;
goto number;
case 'd':
val = tm->tm_mday;
- fmt = "%02d";
goto number;
case 'D':
fmt = "%m/%d/%y";
goto recu_strftime;
case 'e':
- val = tm->tm_mday;
- fmt = "%2d";
- goto number;
+ *l = snprintf(*s, sizeof *s, "%2d", tm->tm_mday);
+ return *s;
case 'F':
fmt = "%Y-%m-%d";
goto recu_strftime;
case 'g':
case 'G':
- fmt = "%04d";
- val = tm->tm_year + 1900;
+ val = tm->tm_year + 1900LL;
if (tm->tm_yday < 3 && week_num(tm) != 1) val--;
else if (tm->tm_yday > 360 && week_num(tm) == 1) val++;
- if (f=='g') {
- fmt = "%02d";
- val %= 100;
- }
+ if (f=='g') val %= 100;
+ else width = 4;
goto number;
case 'H':
val = tm->tm_hour;
- fmt = "%02d";
goto number;
case 'I':
val = tm->tm_hour;
if (!val) val = 12;
else if (val > 12) val -= 12;
- fmt = "%02d";
goto number;
case 'j':
val = tm->tm_yday+1;
- fmt = "%03d";
+ width = 3;
goto number;
case 'm':
val = tm->tm_mon+1;
- fmt = "%02d";
goto number;
case 'M':
val = tm->tm_min;
- fmt = "%02d";
goto number;
case 'n':
- s[0] = '\n';
- s[1] = 0;
- return 1;
+ *l = 1;
+ return "\n";
case 'p':
item = tm->tm_hour >= 12 ? PM_STR : AM_STR;
goto nl_strcat;
case 'R':
fmt = "%H:%M";
goto recu_strftime;
+ case 's':
+ val = __tm_to_secs(tm) + tm->__tm_gmtoff;
+ width = 1;
+ goto number;
case 'S':
val = tm->tm_sec;
- fmt = "%02d";
goto number;
case 't':
- s[0] = '\t';
- s[1] = 0;
- return 1;
+ *l = 1;
+ return "\t";
case 'T':
fmt = "%H:%M:%S";
goto recu_strftime;
case 'u':
val = tm->tm_wday ? tm->tm_wday : 7;
- fmt = "%d";
+ width = 1;
goto number;
case 'U':
val = (tm->tm_yday + 7 - tm->tm_wday) / 7;
- fmt = "%02d";
goto number;
case 'W':
val = (tm->tm_yday + 7 - (tm->tm_wday+6)%7) / 7;
- fmt = "%02d";
goto number;
case 'V':
val = week_num(tm);
- fmt = "%02d";
goto number;
case 'w':
val = tm->tm_wday;
- fmt = "%d";
+ width = 1;
goto number;
case 'x':
item = D_FMT;
goto nl_strftime;
case 'y':
val = tm->tm_year % 100;
- fmt = "%02d";
goto number;
case 'Y':
val = tm->tm_year + 1900;
- fmt = "%04d";
+ if (val >= 10000) {
+ *l = snprintf(*s, sizeof *s, "+%lld", val);
+ return *s;
+ }
+ width = 4;
goto number;
case 'z':
- val = -tm->__tm_gmtoff;
- return snprintf(s, n, "%+.2d%.2d", val/3600, abs(val%3600)/60);
+ if (tm->tm_isdst < 0) {
+ *l = 0;
+ return "";
+ }
+ *l = snprintf(*s, sizeof *s, "%+.2d%.2d",
+ (-tm->__tm_gmtoff)/3600,
+ abs(tm->__tm_gmtoff%3600)/60);
+ return *s;
case 'Z':
- return snprintf(s, n, "%s", tm->__tm_zone);
+ if (tm->tm_isdst < 0) {
+ *l = 0;
+ return "";
+ }
+ fmt = __tm_to_tzname(tm);
+ goto string;
case '%':
- s[0] = '%';
- s[1] = 0;
- return 1;
+ *l = 1;
+ return "%";
default:
return 0;
}
number:
- return snprintf(s, n, fmt, val);
+ *l = snprintf(*s, sizeof *s, "%0*lld", width, val);
+ return *s;
nl_strcat:
- return snprintf(s, n, "%s", __nl_langinfo_l(item, loc));
+ fmt = __nl_langinfo_l(item, loc);
+string:
+ *l = strlen(fmt);
+ return fmt;
nl_strftime:
fmt = __nl_langinfo_l(item, loc);
recu_strftime:
- return __strftime_l(s, n, fmt, tm, loc);
+ *l = __strftime_l(*s, sizeof *s, fmt, tm, loc);
+ if (!*l) return 0;
+ return *s;
}
size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t loc)
{
size_t l, k;
- for (l=0; *f && l<n; f++) {
+ char buf[100];
+ char *p;
+ const char *t;
+ int plus;
+ unsigned long width;
+ for (l=0; l<n; f++) {
+ if (!*f) {
+ s[l] = 0;
+ return l;
+ }
if (*f != '%') {
s[l++] = *f;
continue;
}
f++;
+ if ((plus = (*f == '+'))) f++;
+ width = strtoul(f, &p, 10);
+ if (*p == 'C' || *p == 'F' || *p == 'G' || *p == 'Y') {
+ if (!width && p!=f) width = 1;
+ } else {
+ width = 0;
+ }
+ f = p;
if (*f == 'E' || *f == 'O') f++;
- k = __strftime_fmt_1(s+l, n-l, *f, tm, loc);
- if (!k) return 0;
+ t = __strftime_fmt_1(&buf, &k, *f, tm, loc);
+ if (!t) break;
+ if (width) {
+ for (; *t=='+' || *t=='-' || (*t=='0'&&t[1]); t++, k--);
+ width--;
+ if (plus && tm->tm_year >= 10000-1900)
+ s[l++] = '+';
+ else if (tm->tm_year < -1900)
+ s[l++] = '-';
+ else
+ width++;
+ for (; width > k && l < n; width--)
+ s[l++] = '0';
+ }
+ if (k > n-l) k = n-l;
+ memcpy(s+l, t, k);
l += k;
}
- if (l >= n) return 0;
- s[l] = 0;
- return l;
+ 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 __strftime_l(s, n, f, tm, 0);
+ return __strftime_l(s, n, f, tm, CURRENT_LOCALE);
}
weak_alias(__strftime_l, strftime_l);
projects / musl / blobdiff