#include <time.h>
#include <limits.h>
#include "libc.h"
+#include "time_impl.h"
const char *__nl_langinfo_l(nl_item, locale_t);
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 '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;
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;
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);
- if (!t) return 0;
+ if (!t) break;
if (width) {
for (; *t=='+' || *t=='-' || (*t=='0'&&t[1]); t++, k--);
width--;
s[l++] = '-';
else
width++;
- if (width >= n-l) return 0;
- for (; width > k; width--)
+ for (; width > k && l < n; width--)
s[l++] = '0';
}
- if (k >= n-l) return 0;
+ if (k > n-l) k = n-l;
memcpy(s+l, t, k);
l += k;
}
+ if (n) {
+ if (l==n) l=n-1;
+ s[l] = 0;
+ }
return 0;
}