diff options
| -rw-r--r-- | sfeed.c | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -559,10 +559,7 @@ parsetime(const char *s, time_t *tp) isdigit((unsigned char)s[2]) && isdigit((unsigned char)s[3])) { /* formats "%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%S" or "%Y%m%d%H%M%S" */ - va[0] = ((s[0] - '0') * 1000) + ((s[1] - '0') * 100) + - ((s[2] - '0') * 10) + (s[3] - '0'); - vi = 1; - s += 4; + vi = 0; } else { /* format: "[%a, ]%d %b %Y %H:%M:%S" */ /* parse "[%a, ]%d %b %Y " part, then use time parsing as above */ @@ -608,16 +605,17 @@ parsetime(const char *s, time_t *tp) } /* parse time parts (and possibly remaining date parts) */ - for (; *s && vi < 6; ) { - if (isdigit((unsigned char)s[0]) && isdigit((unsigned char)s[1])) { - va[vi++] = ((s[0] - '0') * 10) + (s[1] - '0'); - s += 2; - } else if (vi > 2 && (*s == '-' || *s == '+' || *s == '.' || - isspace((unsigned char)*s))) { - break; - } else { - s++; + for (; *s && vi < 6; vi++) { + for (i = 0, v = 0; i < ((vi == 0) ? 4 : 2) && + isdigit((unsigned char)*s); s++, i++) { + v = (v * 10) + (*s - '0'); } + va[vi] = v; + + if ((vi < 2 && *s == '-') || + (vi == 2 && (*s == 'T' || isspace((unsigned char)*s))) || + (vi > 2 && *s == ':')) + s++; } /* skip milliseconds in for example: "%Y-%m-%dT%H:%M:%S.000Z" */ |