fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use date_sec_change() for adding day deltas

Browse Source 
Fixes tests range-002.sh and search-001.sh.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2015-02-22 11:32:20 +01:00
parent a6c73232a8
commit 7a631b2b63
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/args.c
View File

@@ -252,7 +252,7 @@ static void next_arg(void)
const long current_time = now();
int time_left, hours_left, min_left;
next_app.time = current_time + DAYINSEC;
next_app.time = date_sec_change(current_time, 0, 1);
next_app.got_app = 0;
next_app.txt = NULL;
@@ -297,7 +297,7 @@ date_arg_from_to(long from, long to, int add_line, const char *fmt_apt,
{
long date;
for (date = from; date < to; date += DAYINSEC) {
for (date = from; date < to; date = date_sec_change(date, 0, 1)) {
day_store_items(date, 0);
if (day_item_count(0) == 0)
continue;
@@ -729,9 +729,9 @@ int parse_args(int argc, char **argv)
}
if (to == -1 && range == -1)
to = from + DAYINSEC;
to = date_sec_change(from, 0, 1);
else if (to == -1 && range >= 0)
to = from + range * DAYINSEC;
to = date_sec_change(from, 0, range);
else if (to >= 0 && range >= 0)
EXIT_IF(to >= 0, _("cannot specify a range and an end date"));