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

diff --git a/src/time/strptime.c b/src/time/strptime.c
index d9481d1b..0f66e6c6 100644
--- a/src/time/strptime.c
+++ b/src/time/strptime.c
@@ -7,7 +7,7 @@
 #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;
 	const char *ex;
@@ -18,6 +18,7 @@ char *strptime(const char *s, const char *f, struct tm *tm)
 			else if (*s != *f) return 0;
 			else s++;
 			f++;
+			continue;
 		}
 		f++;
 		if (*f == '+') f++;
@@ -155,7 +156,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 +166,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;
 			}