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

Dates are now written properly again when using the '-r' flag (thanks Chris again for your report).

Browse Source
This commit is contained in:
Frederic Culot 2009-07-15 19:16:21 +00:00
parent 3fe8550373
commit a93d88c370
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,11 @@
* src/io.c: could not import ical files anymore if notes were not * src/io.c: could not import ical files anymore if notes were not
attached to items (thanks Chris for reporting it) attached to items (thanks Chris for reporting it)
* src/args.c (app_arg): memory leak fixed
* src/args.c (parse_args): dates are now written properly again
when using the '-r' flags (thanks again Chris for your report)
2009-07-12 Frederic Culot <frederic@culot.org> 2009-07-12 Frederic Culot <frederic@culot.org>

14
src/args.c
View File

@ -1,4 +1,4 @@
/* $calcurse: args.c,v 1.55 2009/07/12 18:16:11 culot Exp $ */ /* $calcurse: args.c,v 1.56 2009/07/15 19:16:22 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -409,6 +409,8 @@ app_arg (int add_line, date_t *day, long date, int print_note, conf_t *conf,
if (recur_item_inday (ra->start, ra->exc, ra->rpt->type, ra->rpt->freq, if (recur_item_inday (ra->start, ra->exc, ra->rpt->type, ra->rpt->freq,
ra->rpt->until, today)) ra->rpt->until, today))
{ {
apoint_llist_node_t *apt;
if (regex && regexec (regex, ra->mesg, 0, 0, 0) != 0) if (regex && regexec (regex, ra->mesg, 0, 0, 0) != 0)
continue; continue;
@ -423,8 +425,11 @@ app_arg (int add_line, date_t *day, long date, int print_note, conf_t *conf,
arg_print_date (today, conf); arg_print_date (today, conf);
print_date = 0; print_date = 0;
} }
apoint_sec2str (apoint_recur_s2apoint_s (ra), RECUR_APPT, today, apt = apoint_recur_s2apoint_s (ra);
apoint_start_time, apoint_end_time); apoint_sec2str (apt, RECUR_APPT, today, apoint_start_time,
apoint_end_time);
mem_free (apt->mesg);
mem_free (apt);
fputs (" - ", stdout); fputs (" - ", stdout);
fputs (apoint_start_time, stdout); fputs (apoint_start_time, stdout);
fputs (" -> ", stdout); fputs (" -> ", stdout);
@ -867,7 +872,7 @@ parse_args (int argc, char **argv, conf_t *conf)
} }
if (tflag) if (tflag)
{ {
io_load_todo (); io_load_todo ();
todo_arg (tnum, Nflag, preg); todo_arg (tnum, Nflag, preg);
non_interactive = 1; non_interactive = 1;
} }
@ -880,6 +885,7 @@ parse_args (int argc, char **argv, conf_t *conf)
if (dflag || rflag || sflag) if (dflag || rflag || sflag)
{ {
io_load_app (); io_load_app ();
custom_load_conf (conf, 0); /* To get output date format. */
if (dflag) if (dflag)
date_arg (ddate, add_line, Nflag, conf, preg); date_arg (ddate, add_line, Nflag, conf, preg);
if (rflag || sflag) if (rflag || sflag)