From eb87d3e1e9210d9387536cc3ece4e32aacdc5009 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 8 Oct 2024 18:59:37 +0900 Subject: [PATCH] time-util: fix parsing timestamp with NZ timezone Fixes a bug caused by ef658a63f8163607d9e04f710cd26c0d36ff68ce. --- src/basic/time-util.c | 8 ++++++-- src/test/test-time-util.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c index ac2b078225f..06c465e0e40 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -994,8 +994,12 @@ int parse_timestamp(const char *t, usec_t *ret) { assert(t); t_len = strlen(t); - if (t_len > 2 && t[t_len - 1] == 'Z' && t[t_len - 2] != ' ') /* RFC3339-style welded UTC: "1985-04-12T23:20:50.52Z" */ - return parse_timestamp_impl(t, t_len - 1, /* utc = */ true, /* isdst = */ -1, /* gmtoff = */ 0, ret); + if (t_len > 2 && t[t_len - 1] == 'Z') { + /* Try to parse as RFC3339-style welded UTC: "1985-04-12T23:20:50.52Z" */ + r = parse_timestamp_impl(t, t_len - 1, /* utc = */ true, /* isdst = */ -1, /* gmtoff = */ 0, ret); + if (r >= 0) + return r; + } if (t_len > 7 && IN_SET(t[t_len - 6], '+', '-') && t[t_len - 7] != ' ') { /* RFC3339-style welded offset: "1990-12-31T15:59:60-08:00" */ k = strptime(&t[t_len - 6], "%z", &tm); diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c index e37a7ff6103..4fbb1c4c7a2 100644 --- a/src/test/test-time-util.c +++ b/src/test/test-time-util.c @@ -857,6 +857,29 @@ static void test_parse_timestamp_impl(const char *tz) { test_parse_timestamp_one("69-12-31 19:00:01.0010 EST", 0, USEC_PER_SEC + 1000); } + if (timezone_is_valid("NZ", LOG_DEBUG)) { + /* NZ (+1200) */ + test_parse_timestamp_one("Thu 1970-01-01 12:01 NZ", 0, USEC_PER_MINUTE); + test_parse_timestamp_one("Thu 1970-01-01 12:00:01 NZ", 0, USEC_PER_SEC); + test_parse_timestamp_one("Thu 1970-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000); + test_parse_timestamp_one("Thu 1970-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000); + + test_parse_timestamp_one("Thu 70-01-01 12:01 NZ", 0, USEC_PER_MINUTE); + test_parse_timestamp_one("Thu 70-01-01 12:00:01 NZ", 0, USEC_PER_SEC); + test_parse_timestamp_one("Thu 70-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000); + test_parse_timestamp_one("Thu 70-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000); + + test_parse_timestamp_one("1970-01-01 12:01 NZ", 0, USEC_PER_MINUTE); + test_parse_timestamp_one("1970-01-01 12:00:01 NZ", 0, USEC_PER_SEC); + test_parse_timestamp_one("1970-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000); + test_parse_timestamp_one("1970-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000); + + test_parse_timestamp_one("70-01-01 12:01 NZ", 0, USEC_PER_MINUTE); + test_parse_timestamp_one("70-01-01 12:00:01 NZ", 0, USEC_PER_SEC); + test_parse_timestamp_one("70-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000); + test_parse_timestamp_one("70-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000); + } + /* -06 */ test_parse_timestamp_one("Wed 1969-12-31 18:01 -06", 0, USEC_PER_MINUTE); test_parse_timestamp_one("Wed 1969-12-31 18:00:01 -06", 0, USEC_PER_SEC); @@ -934,6 +957,14 @@ static void test_parse_timestamp_impl(const char *tz) { test_parse_timestamp_one("yesterday", 0, today - USEC_PER_DAY); } + /* with timezone */ + if (tz) { + _cleanup_free_ char *s = NULL; + + ASSERT_NOT_NULL(s = strjoin("Fri 2012-11-23 23:02:15 ", tz)); + ASSERT_OK(parse_timestamp(s, NULL)); + } + /* relative */ assert_se(parse_timestamp("now", &now_usec) == 0); test_parse_timestamp_one("+5hours", USEC_PER_MINUTE, now_usec + 5 * USEC_PER_HOUR);