Merge branch 'mk/grep-pcre'

diff --git a/test-date.c b/test-date.c
index a9e705f79a148790f4de55c7918dc9c669382a4f..6bcd5b03c078bc532e074ef8e8775a51d0eef219 100644 (file)
--- a/test-date.c
+++ b/test-date.c
@@ -20,13 +20,16 @@ static void parse_dates(char **argv, struct timeval *now)
 {
        for (; *argv; argv++) {
                char result[100];
-               time_t t;
+               unsigned long t;
+               int tz;
 
                result[0] = 0;
                parse_date(*argv, result, sizeof(result));
-               t = strtoul(result, NULL, 0);
-               printf("%s -> %s\n", *argv,
-                       t ? show_date(t, 0, DATE_ISO8601) : "bad");
+               if (sscanf(result, "%lu %d", &t, &tz) == 2)
+                       printf("%s -> %s\n",
+                              *argv, show_date(t, tz, DATE_ISO8601));
+               else
+                       printf("%s -> bad\n", *argv);
        }
 }