debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

parse-time-string: fix setting and rounding of seconds

Browse source 
If seconds are not specified in the string to be parsed, they're not
set according to the reference time (in the no rounding case) nor
rounded properly (in the rounding up cases). Fix this.

The bug caused searches such as date:10:30..10:30 to match messages
with date exactly 10:30:00 only, and not in range 10:30:00..10:30:59
(inclusive) as documented.

Note that date searches referring "noon" or "5pm" will still be
interpreted as exact to the second.
This commit is contained in:
Jani Nikula 2015-03-02 19:47:04 +02:00 committed by David Bremner
parent 952f46fedc
commit 6aeef2ee15
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
parse-time-string/parse-time-string.c
View file

@ -1081,10 +1081,10 @@ parse_time (struct state *state, char sep,
return set_user_tz (state, state->delim, v1, v2); return set_user_tz (state, state->delim, v1, v2);
} }
if (!is_valid_time (v1, v2, v3)) if (!is_valid_time (v1, v2, n3 ? v3 : 0))
return -PARSE_TIME_ERR_INVALIDTIME; return -PARSE_TIME_ERR_INVALIDTIME;
return set_abs_time (state, v1, v2, n3 ? v3 : 0); return set_abs_time (state, v1, v2, n3 ? (int) v3 : UNSET);
} }
/* strtoul helper that assigns length. */ /* strtoul helper that assigns length. */

1
test/T490-parse-time-string.sh
View file

@ -79,7 +79,6 @@ ${TEST_DIRECTORY}/parse-time --ref=${REFERENCE} < INPUT > OUTPUT
test_expect_equal_file INPUT OUTPUT test_expect_equal_file INPUT OUTPUT
test_begin_subtest "Second rounding tests" test_begin_subtest "Second rounding tests"
test_subtest_known_broken
REFERENCE=$(_date Tue Jan 11 12:13:14 +0000 2011) REFERENCE=$(_date Tue Jan 11 12:13:14 +0000 2011)
cat <<EOF > INPUT cat <<EOF > INPUT
9:15 ==> Tue Jan 11 09:15:14 +0000 2011 9:15 ==> Tue Jan 11 09:15:14 +0000 2011