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

time-util: introduce parse_gmtoff() helper function

Browse Source
This commit is contained in:
Yu Watanabe
2025-09-27 11:52:24 +09:00
parent e3f561a624
commit 23407c1806
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+13
View File
@@ -624,6 +624,19 @@ char* format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
return buf;
}
int parse_gmtoff(const char *t, long *ret) {
assert(t);
struct tm tm;
const char *k = strptime(t, "%z", &tm);
if (!k || *k != '\0')
return -EINVAL;
if (ret)
*ret = tm.tm_gmtoff;
return 0;
}
static int parse_timestamp_impl(
const char *t,
size_t max_len,
src/basic/time-util.h
+1
View File
@@ -149,6 +149,7 @@ static inline char* format_timestamp(char *buf, size_t l, usec_t t) {
#define FORMAT_TIMESTAMP_STYLE(t, style) \
format_timestamp_style((char[FORMAT_TIMESTAMP_MAX]){}, FORMAT_TIMESTAMP_MAX, t, style)
int parse_gmtoff(const char *t, long *ret);
int parse_timestamp(const char *t, usec_t *ret);
int parse_sec(const char *t, usec_t *ret);
src/test/test-time-util.c
+29
View File
@@ -663,6 +663,35 @@ TEST(format_timestamp_range) {
test_format_timestamp_one(USEC_INFINITY, TIMESTAMP_UTC, NULL);
}
TEST(parse_gmtoff) {
long t;
ASSERT_OK(parse_gmtoff("+14", &t));
ASSERT_EQ(t, (long) (14 * USEC_PER_HOUR / USEC_PER_SEC));
ASSERT_OK(parse_gmtoff("-09", &t));
ASSERT_EQ(t, - (long) (9 * USEC_PER_HOUR / USEC_PER_SEC));
ASSERT_OK(parse_gmtoff("+1400", &t));
ASSERT_EQ(t, (long) (14 * USEC_PER_HOUR / USEC_PER_SEC));
ASSERT_OK(parse_gmtoff("-0900", &t));
ASSERT_EQ(t, - (long) (9 * USEC_PER_HOUR / USEC_PER_SEC));
ASSERT_OK(parse_gmtoff("+14:00", &t));
ASSERT_EQ(t, (long) (14 * USEC_PER_HOUR / USEC_PER_SEC));
ASSERT_OK(parse_gmtoff("-09:00", &t));
ASSERT_EQ(t, - (long) (9 * USEC_PER_HOUR / USEC_PER_SEC));
ASSERT_ERROR(parse_gmtoff("", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("UTC", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("09", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("0900", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("?0900", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("?0900", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("+0900abc", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("+0900 ", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("+090000", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("+0900:00", &t), EINVAL);
ASSERT_ERROR(parse_gmtoff("+0900.00", &t), EINVAL);
}
static void test_parse_timestamp_one(const char *str, usec_t max_diff, usec_t expected) {
usec_t usec = USEC_INFINITY;
int r;