X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Fstrftime.c;h=cc53d5369ca717900ef5816ed7bdc400d149dc6b;hb=8ef9d46f4d0ff4f0073da6bee7ed0cb5f9035ead;hp=75ebca62944987676ac712afba3e2f015e2cf8e5;hpb=ac0acd569e01735fc6052d43fdf57f3a07c93f3d;p=musl diff --git a/src/time/strftime.c b/src/time/strftime.c index 75ebca62..cc53d536 100644 --- a/src/time/strftime.c +++ b/src/time/strftime.c @@ -5,11 +5,9 @@ #include #include #include -#include "libc.h" +#include "locale_impl.h" #include "time_impl.h" -const char *__nl_langinfo_l(nl_item, locale_t); - static int is_leap(int y) { /* Avoid overflow */ @@ -20,52 +18,53 @@ static int is_leap(int y) static int week_num(const struct tm *tm) { - int val = (tm->tm_yday + 7 - (tm->tm_wday+6)%7) / 7; + int val = (tm->tm_yday + 7U - (tm->tm_wday+6U)%7) / 7; /* If 1 Jan is just 1-3 days past Monday, * the previous week is also in this year. */ - if ((tm->tm_wday - tm->tm_yday - 2 + 371) % 7 <= 2) + if ((tm->tm_wday + 371U - tm->tm_yday - 2) % 7 <= 2) val++; if (!val) { val = 52; /* If 31 December of prev year a Thursday, * or Friday of a leap year, then the * prev year has 53 weeks. */ - int dec31 = (tm->tm_wday - tm->tm_yday - 1 + 7) % 7; + int dec31 = (tm->tm_wday + 7U - tm->tm_yday - 1) % 7; if (dec31 == 4 || (dec31 == 5 && is_leap(tm->tm_year%400-1))) val++; } else if (val == 53) { /* If 1 January is not a Thursday, and not * a Wednesday of a leap year, then this * year has only 52 weeks. */ - int jan1 = (tm->tm_wday - tm->tm_yday + 371) % 7; + int jan1 = (tm->tm_wday + 371U - tm->tm_yday) % 7; if (jan1 != 4 && (jan1 != 3 || !is_leap(tm->tm_year))) val = 1; } 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); - -const char *__strftime_fmt_1(char (*s)[100], size_t *l, 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, int pad) { nl_item item; long long val; - const char *fmt; - int width = 2; + const char *fmt = "-"; + int width = 2, def_pad = '0'; switch (f) { case 'a': + if (tm->tm_wday > 6U) goto string; item = ABDAY_1 + tm->tm_wday; goto nl_strcat; case 'A': + if (tm->tm_wday > 6U) goto string; item = DAY_1 + tm->tm_wday; goto nl_strcat; case 'h': case 'b': + if (tm->tm_mon > 11U) goto string; item = ABMON_1 + tm->tm_mon; goto nl_strcat; case 'B': + if (tm->tm_mon > 11U) goto string; item = MON_1 + tm->tm_mon; goto nl_strcat; case 'c': @@ -74,15 +73,14 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * case 'C': val = (1900LL+tm->tm_year) / 100; goto number; + case 'e': + def_pad = '_'; case 'd': val = tm->tm_mday; goto number; case 'D': fmt = "%m/%d/%y"; goto recu_strftime; - case 'e': - *l = snprintf(*s, sizeof *s, "%2d", tm->tm_mday); - return *s; case 'F': fmt = "%Y-%m-%d"; goto recu_strftime; @@ -125,7 +123,7 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * fmt = "%H:%M"; goto recu_strftime; case 's': - val = __tm_to_secs(tm) + tm->__tm_gmtoff; + val = __tm_to_secs(tm) - tm->__tm_gmtoff; width = 1; goto number; case 'S': @@ -142,10 +140,10 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * width = 1; goto number; case 'U': - val = (tm->tm_yday + 7 - tm->tm_wday) / 7; + val = (tm->tm_yday + 7U - tm->tm_wday) / 7; goto number; case 'W': - val = (tm->tm_yday + 7 - (tm->tm_wday+6)%7) / 7; + val = (tm->tm_yday + 7U - (tm->tm_wday+6U)%7) / 7; goto number; case 'V': val = week_num(tm); @@ -161,10 +159,11 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * item = T_FMT; goto nl_strftime; case 'y': - val = tm->tm_year % 100; + val = (tm->tm_year + 1900LL) % 100; + if (val < 0) val = -val; goto number; case 'Y': - val = tm->tm_year + 1900; + val = tm->tm_year + 1900LL; if (val >= 10000) { *l = snprintf(*s, sizeof *s, "+%lld", val); return *s; @@ -176,9 +175,8 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * *l = 0; return ""; } - *l = snprintf(*s, sizeof *s, "%+.2d%.2d", - (-tm->__tm_gmtoff)/3600, - abs(tm->__tm_gmtoff%3600)/60); + *l = snprintf(*s, sizeof *s, "%+.4ld", + tm->__tm_gmtoff/3600*100 + tm->__tm_gmtoff%3600/60); return *s; case 'Z': if (tm->tm_isdst < 0) { @@ -194,7 +192,12 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * return 0; } number: - *l = snprintf(*s, sizeof *s, "%0*lld", width, val); + switch (pad ? pad : def_pad) { + case '-': *l = snprintf(*s, sizeof *s, "%lld", val); break; + case '_': *l = snprintf(*s, sizeof *s, "%*lld", width, val); break; + case '0': + default: *l = snprintf(*s, sizeof *s, "%0*lld", width, val); break; + } return *s; nl_strcat: fmt = __nl_langinfo_l(item, loc); @@ -215,7 +218,7 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st char buf[100]; char *p; const char *t; - int plus; + int pad, plus; unsigned long width; for (l=0; ltm_year >= 10000-1900) - s[l++] = '+'; - else if (tm->tm_year < -1900) + /* Trim off any sign and leading zeros, then + * count remaining digits to determine behavior + * for the + flag. */ + if (*t=='+' || *t=='-') t++, k--; + for (; *t=='0' && t[1]-'0'<10U; t++, k--); + if (width < k) width = k; + size_t d; + for (d=0; t[d]-'0'<10U; d++); + if (tm->tm_year < -1900) { s[l++] = '-'; - else - width++; + width--; + } else if (plus && d+(width-k) >= (*p=='C'?3:5)) { + s[l++] = '+'; + width--; + } for (; width > k && l < n; width--) s[l++] = '0'; } @@ -263,7 +275,7 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st 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);