]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lib/timeutils: parse_timestamp: fix second parsing
authorThomas Weißschuh <thomas@t-8ch.de>
Fri, 20 Jan 2023 02:43:34 +0000 (02:43 +0000)
committerThomas Weißschuh <thomas@t-8ch.de>
Mon, 23 Jan 2023 13:47:01 +0000 (13:47 +0000)
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
lib/timeutils.c

index 6a7d1c26c160e10ec081b56147c3ba203eb9a1b9..79b6749078b50979355d698be7511de38824ca04 100644 (file)
@@ -324,10 +324,8 @@ static int parse_timestamp_reference(time_t x, const char *t, usec_t *usec)
 
        tm = copy;
        k = strptime(t, "%Y%m%d%H%M%S", &tm);
-       if (k && *k == 0) {
-               tm.tm_sec = 0;
+       if (k && *k == 0)
                goto finish;
-       }
 
        return -EINVAL;
 
@@ -600,6 +598,7 @@ static int run_unittest_timestamp(void)
                { "tomorrow"           , 1674259200000000 },
                { "+5min"              , 1674180727000000 },
                { "-5days"             , 1673748427000000 },
+               { "20120922163422"     , 1348331662000000 },
        };
 
        if (unsetenv("TZ"))