X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Fstrftime.c;h=794fbe1d70727a057a99a4d709bd71a2a66b8a99;hb=546f6b322bcafa2452925c19f9607d9689c75f95;hp=19ffdbca3729ee0899cffebc7e2df0a0f332c9a5;hpb=33413cdd25c58f0e57061e0a3cb7a29d492ba785;p=musl

diff --git a/src/time/strftime.c b/src/time/strftime.c
index 19ffdbca..794fbe1d 100644
--- a/src/time/strftime.c
+++ b/src/time/strftime.c
@@ -1,10 +1,13 @@
 #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"
+#include "time_impl.h"
 
 const char *__nl_langinfo_l(nl_item, locale_t);
 
@@ -42,6 +45,7 @@ static int week_num(const struct tm *tm)
 	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)
@@ -78,8 +82,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':
-		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;
@@ -121,6 +125,10 @@ 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 's':
+		val = __tm_to_secs(tm) + tm->__tm_gmtoff;
+		width = 1;
+		goto number;
 	case 'S':
 		val = tm->tm_sec;
 		goto number;
@@ -157,15 +165,28 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *
 		val = tm->tm_year % 100;
 		goto number;
 	case 'Y':
-		val = tm->tm_year + 1900LL;
+		val = tm->tm_year + 1900;
+		if (val >= 10000) {
+			*l = snprintf(*s, sizeof *s, "+%lld", val);
+			return *s;
+		}
 		width = 4;
 		goto number;
 	case 'z':
-		val = -tm->__tm_gmtoff;
-		*l = snprintf(*s, sizeof *s, "%+.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':
-		fmt = tm->__tm_zone;
+		if (tm->tm_isdst < 0) {
+			*l = 0;
+			return "";
+		}
+		fmt = __tm_to_tzname(tm);
 		goto string;
 	case '%':
 		*l = 1;
@@ -193,8 +214,11 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
 {
 	size_t l, k;
 	char buf[100];
+	char *p;
 	const char *t;
-	for (l=0; l+1<n; f++) {
+	int plus;
+	unsigned long width;
+	for (l=0; l<n; f++) {
 		if (!*f) {
 			s[l] = 0;
 			return l;
@@ -204,19 +228,43 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
 			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++;
 		t = __strftime_fmt_1(&buf, &k, *f, tm, loc);
-		if (!t || k >= n-l)
-			return 0;
+		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 (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);