summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-05-14 10:53:56 +0300
committerRich Felker <dalias@aerifal.cx>2014-06-06 17:41:12 -0400
commit348fc5561c816d56ae1c3d744e4c22b70e861d4e (patch)
treede09da58c77865959b7877b7f8b60daf3a576f59
parent9c2d437cb343a9a9e1c2d5dea4e0ae6a7d4fa0be (diff)
downloadmusl-348fc5561c816d56ae1c3d744e4c22b70e861d4e.tar.gz
implement %y and %C specifiers in strptime
-rw-r--r--src/time/strptime.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/time/strptime.c b/src/time/strptime.c
index 4d9eea41..f41f55f2 100644
--- a/src/time/strptime.c
+++ b/src/time/strptime.c
@@ -11,6 +11,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
int i, w, neg, adj, min, range, *dest, dummy;
const char *ex;
size_t len;
+ int want_century = 0, century = 0;
while (*f) {
if (*f != '%') {
if (isspace(*f)) for (; *s && isspace(*s); s++);
@@ -40,9 +41,9 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
if (!s) return 0;
break;
case 'C':
- /* FIXME */
- dest = &dummy;
+ dest = &century;
if (w<0) w=2;
+ want_century |= 2;
goto numeric_digits;
case 'd': case 'e':
dest = &tm->tm_mday;
@@ -135,14 +136,15 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
if (!s) return 0;
break;
case 'y':
- /* FIXME */
- dest = &dummy;
+ dest = &tm->tm_year;
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;
@@ -187,5 +189,9 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
;
}
}
+ if (want_century) {
+ if (want_century & 2) tm->tm_year += century * 100 - 1900;
+ else if (tm->tm_year <= 68) tm->tm_year += 100;
+ }
return (char *)s;
}