summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xChangeLog9
-rwxr-xr-xsrc/args.c8
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d5c192..5568173 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-26 Frederic Culot <frederic@culot.org>
+
+ * src/args.c (parse_args): check for file presence added (thanks
+ again Chris for reporting it)
+
2009-07-23 Frederic Culot <frederic@culot.org>
* src/io.c (io_fprintln): new function
@@ -6,11 +11,13 @@
* src/dmon.c (dmon_start): log messages added
- * src/vars.[ch]: daemon log file path added
+ * src/vars.[ch]: daemon log and pid file path added
* src/io.c: incorrect duration format when exporting to ical
(thanks Chris for reporting it)
+ * src/io.c (io_dump_pid): new function
+
2009-07-20 Frederic Culot <frederic@culot.org>
* src/utils.c (psleep): new function
diff --git a/src/args.c b/src/args.c
index ea6cc02..d174b27 100755
--- a/src/args.c
+++ b/src/args.c
@@ -1,4 +1,4 @@
-/* $calcurse: args.c,v 1.56 2009/07/15 19:16:22 culot Exp $ */
+/* $calcurse: args.c,v 1.57 2009/07/26 12:30:23 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -872,18 +872,22 @@ parse_args (int argc, char **argv, conf_t *conf)
}
if (tflag)
{
+ io_check_file (path_todo, (int *)0);
io_load_todo ();
todo_arg (tnum, Nflag, preg);
non_interactive = 1;
}
if (nflag)
{
+ io_check_file (path_apts, (int *)0);
io_load_app ();
next_arg ();
non_interactive = 1;
}
if (dflag || rflag || sflag)
{
+ io_check_file (path_apts, (int *)0);
+ io_check_file (path_conf, (int *)0);
io_load_app ();
custom_load_conf (conf, 0); /* To get output date format. */
if (dflag)
@@ -897,6 +901,8 @@ parse_args (int argc, char **argv, conf_t *conf)
{
date_t day;
+ io_check_file (path_apts, (int *)0);
+ io_check_file (path_conf, (int *)0);
vars_init (conf);
custom_load_conf (conf, 0); /* To get output date format. */
io_load_app ();