diff options
| author |   Hristo Venev <hristo@venev.name> | 2016-02-22 08:02:48 -0500 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2016-03-05 11:10:05 -0500 |
| commit | 86d970a07c7214a794ca6a99bcbab24acefd610b (patch) | |
| tree | 2b29c462db09fadfba33d92c41b3b337c7f90cfc | |
| parent | time-util: check for overflow in conversion from ts to nsec_t (diff) | |
| download | systemd-gentoo-229.tar.gz systemd-gentoo-229.tar.bz2 systemd-gentoo-229.zip | |
calendarspec: fix find_next skipping timesgentoo-229
reset usec when bumping hours/minutes
| -rw-r--r-- | src/basic/calendarspec.c | 4 | ||||
| -rw-r--r-- | src/test/test-calendarspec.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c index 775879076..ac7b7c4c8 100644 --- a/src/basic/calendarspec.c +++ b/src/basic/calendarspec.c @@ -1027,7 +1027,7 @@ static int find_next(const CalendarSpec *spec, struct tm *tm, usec_t *usec) { r = find_matching_component(spec->hour, &c.tm_hour); if (r > 0) - c.tm_min = c.tm_sec = 0; + c.tm_min = c.tm_sec = tm_usec = 0; if (r < 0 || tm_out_of_bounds(&c, spec->utc)) { c.tm_mday ++; c.tm_hour = c.tm_min = c.tm_sec = tm_usec = 0; @@ -1036,7 +1036,7 @@ static int find_next(const CalendarSpec *spec, struct tm *tm, usec_t *usec) { r = find_matching_component(spec->minute, &c.tm_min); if (r > 0) - c.tm_sec = 0; + c.tm_sec = tm_usec = 0; if (r < 0 || tm_out_of_bounds(&c, spec->utc)) { c.tm_hour ++; c.tm_min = c.tm_sec = tm_usec = 0; diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index 8754cb338..5a8c6cbfb 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -137,6 +137,7 @@ int main(int argc, char* argv[]) { test_next("2015-11-13 09:11:23.42", "EET", 12345, 1447398683420000); test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683420000, 1447398685190000); test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683419999, 1447398683420000); + test_next("Sun 16:00:00", "CET", 1456041600123456, 1456066800000000); assert_se(calendar_spec_from_string("test", &c) < 0); assert_se(calendar_spec_from_string("", &c) < 0); |