SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time-util: fix parsing timestamp with NZ timezone

Browse Source 
Fixes a bug caused by ef658a63f8.
This commit is contained in:
Yu Watanabe
2024-10-08 19:15:00 +09:00
parent bf34d642bc
commit eb87d3e1e9
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+6 -2
View File
@@ -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);