X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Fstrptime.c;h=c54a0d8c4c52eaa03e5fc4830004225dadb6b445;hb=41149ea8c7a6f28a1c60478fe7f6b9552aa39e3b;hp=d9481d1bceb21ddd4d1deede367d1025f4eb19e4;hpb=47a8816ded18284d924387c918186935d2495c01;p=musl

diff --git a/src/time/strptime.c b/src/time/strptime.c
index d9481d1b..c54a0d8c 100644
--- a/src/time/strptime.c
+++ b/src/time/strptime.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <stdlib.h>
 #include <langinfo.h>
 #include <time.h>
@@ -7,22 +6,29 @@
 #include <string.h>
 #include <strings.h>
 
-char *strptime(const char *s, const char *f, struct tm *tm)
+char *strptime(const char *restrict s, const char *restrict f, struct tm *restrict tm)
 {
-	int i, w, neg, adj, min, range, *dest;
+	int i, w, neg, adj, min, range, *dest, dummy;
 	const char *ex;
 	size_t len;
+	int want_century = 0, century = 0, relyear = 0;
 	while (*f) {
 		if (*f != '%') {
 			if (isspace(*f)) for (; *s && isspace(*s); s++);
 			else if (*s != *f) return 0;
 			else s++;
 			f++;
+			continue;
 		}
 		f++;
 		if (*f == '+') f++;
-		if (isdigit(*f)) w=strtoul(f, (void *)&f, 10);
-		else w=-1;
+		if (isdigit(*f)) {
+			char *new_f;
+			w=strtoul(f, &new_f, 10);
+			f = new_f;
+		} else {
+			w=-1;
+		}
 		adj=0;
 		switch (*f++) {
 		case 'a': case 'A':
@@ -40,6 +46,10 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			if (!s) return 0;
 			break;
 		case 'C':
+			dest = &century;
+			if (w<0) w=2;
+			want_century |= 2;
+			goto numeric_digits;
 		case 'd': case 'e':
 			dest = &tm->tm_mday;
 			min = 1;
@@ -63,6 +73,7 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			dest = &tm->tm_yday;
 			min = 1;
 			range = 366;
+			adj = 1;
 			goto numeric_range;
 		case 'm':
 			dest = &tm->tm_mon;
@@ -83,6 +94,7 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			len = strlen(ex);
 			if (!strncasecmp(s, ex, len)) {
 				tm->tm_hour %= 12;
+				s += len;
 				break;
 			}
 			ex = nl_langinfo(PM_STR);
@@ -90,6 +102,7 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			if (!strncasecmp(s, ex, len)) {
 				tm->tm_hour %= 12;
 				tm->tm_hour += 12;
+				s += len;
 				break;
 			}
 			return 0;
@@ -112,8 +125,11 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			break;
 		case 'U':
 		case 'W':
-			//FIXME
-			return 0;
+			/* Throw away result, for now. (FIXME?) */
+			dest = &dummy;
+			min = 0;
+			range = 54;
+			goto numeric_range;
 		case 'w':
 			dest = &tm->tm_wday;
 			min = 0;
@@ -128,16 +144,21 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			if (!s) return 0;
 			break;
 		case 'y':
-			//FIXME
-			return 0;
+			dest = &relyear;
+			w = 2;
+			want_century |= 1;
+			goto numeric_digits;
 		case 'Y':
 			dest = &tm->tm_year;
 			if (w<0) w=4;
 			adj = 1900;
+			want_century = 0;
 			goto numeric_digits;
 		case '%':
 			if (*s++ != '%') return 0;
 			break;
+		default:
+			return 0;
 		numeric_range:
 			if (!isdigit(*s)) return 0;
 			*dest = 0;
@@ -155,7 +176,7 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			if (*s == '+') s++;
 			else if (*s == '-') neg=1, s++;
 			if (!isdigit(*s)) return 0;
-			for (i=0; i<w && isdigit(*s); i++)
+			for (*dest=i=0; i<w && isdigit(*s); i++)
 				*dest = *dest * 10 + *s++ - '0';
 			if (neg) *dest = -*dest;
 			*dest -= adj;
@@ -165,6 +186,7 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 				ex = nl_langinfo(min+i);
 				len = strlen(ex);
 				if (strncasecmp(s, ex, len)) continue;
+				s += len;
 				*dest = i % range;
 				break;
 			}
@@ -175,5 +197,10 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			;
 		}
 	}
+	if (want_century) {
+		tm->tm_year = relyear;
+		if (want_century & 2) tm->tm_year += century * 100 - 1900;
+		else if (tm->tm_year <= 68) tm->tm_year += 100;
+	}
 	return (char *)s;
 }