From 9ac8389823ef97c57d4d74179afb9805d435f051 Mon Sep 17 00:00:00 2001
From: Frederic Culot <calcurse@culot.org>
Date: Sun, 1 Nov 2009 11:06:37 +0000
Subject: Check for data directory availability added (thanks Brandon for
reporting this bug).
---
src/args.c | 3 ++-
src/io.c | 15 +++++++++------
src/io.h | 3 ++-
3 files changed, 13 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/args.c b/src/args.c
index 818f583..e21e1e3 100755
--- a/src/args.c
+++ b/src/args.c
@@ -1,4 +1,4 @@
-/* $calcurse: args.c,v 1.59 2009/08/02 07:22:50 culot Exp $ */
+/* $calcurse: args.c,v 1.60 2009/11/01 11:06:37 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -901,6 +901,7 @@ parse_args (int argc, char **argv, conf_t *conf)
if (load_data)
{
io_init (cfile, datadir);
+ io_check_dir (path_dir, (int *)0);
}
if (iflag)
{
diff --git a/src/io.c b/src/io.c
index 059fc6d..1ef3c6f 100755
--- a/src/io.c
+++ b/src/io.c
@@ -1,4 +1,4 @@
-/* $calcurse: io.c,v 1.79 2009/10/28 15:15:44 culot Exp $ */
+/* $calcurse: io.c,v 1.80 2009/11/01 11:06:37 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -1498,8 +1498,8 @@ io_load_keys (char *pager)
#undef HSIZE
}
-static void
-check_directory (char *dir, int *missing)
+void
+io_check_dir (char *dir, int *missing)
{
errno = 0;
if (mkdir (dir, 0700) != 0)
@@ -1512,7 +1512,10 @@ check_directory (char *dir, int *missing)
}
}
else
- (*missing)++;
+ {
+ if (missing)
+ (*missing)++;
+ }
}
unsigned
@@ -1570,8 +1573,8 @@ io_check_data_files (void)
missing = missing_keys = 0;
errno = 0;
- check_directory (path_dir, &missing);
- check_directory (path_notes, &missing);
+ io_check_dir (path_dir, &missing);
+ io_check_dir (path_notes, &missing);
io_check_file (path_todo, &missing);
io_check_file (path_apts, &missing);
io_check_file (path_conf, &missing);
diff --git a/src/io.h b/src/io.h
index a22ca55..82b6f69 100755
--- a/src/io.h
+++ b/src/io.h
@@ -1,4 +1,4 @@
-/* $calcurse: io.h,v 1.26 2009/07/27 21:00:41 culot Exp $ */
+/* $calcurse: io.h,v 1.27 2009/11/01 11:06:37 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -74,6 +74,7 @@ void io_save_cal (conf_t *, io_save_display_t);
void io_load_app (void);
void io_load_todo (void);
void io_load_keys (char *);
+void io_check_dir (char *, int *);
unsigned io_file_exist (char *);
void io_check_file (char *, int *);
int io_check_data_files (void);
--
cgit v1.2.3-70-g09d2