X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=faa8055cbf1b4e668f652cf7e81fe83b0f099fc2;hb=c94cf7103ac134c27a6734a8813c609ee9175a01;hp=45eb83d54bc28abf0aadb95f97b66e4ec1de168d;hpb=481433c4d30a6bd8d8f9cfb88e1d83af69a640a2;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index 45eb83d..faa8055 100644
--- a/abook.c
+++ b/abook.c
@@ -12,6 +12,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <errno.h>
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
@@ -44,8 +45,8 @@ static void		add_email(int);
 char *datafile = NULL;
 char *rcfile = NULL;
 
-int alternative_datafile = FALSE;
-int alternative_rcfile = FALSE;
+bool alternative_datafile = FALSE;
+bool alternative_rcfile = FALSE;
 
 static int
 datafile_writeable()
@@ -62,18 +63,54 @@ datafile_writeable()
 	return TRUE;
 }
 
+static void
+check_abook_directory()
+{
+	struct stat s;
+	char *dir;
+
+	assert(!is_ui_initialized());
+
+	if(alternative_datafile)
+		return;
+
+	dir = strconcat(getenv("HOME"), "/" DIR_IN_HOME, NULL);
+	assert(dir != NULL);
+
+	if(stat(dir, &s) == -1) {
+		if(errno != ENOENT) {
+			perror(dir);
+                        free(dir);
+                        exit(1);
+		}
+		if(mkdir(dir, 0700) == -1) {
+			printf("Cannot create directory %s\n", dir);
+			perror(dir);
+			free(dir);
+			exit(1);
+		}
+	} else if(!S_ISDIR(s.st_mode)) {
+		printf("%s is not a directory\n", dir);
+		free(dir);
+		exit(1);
+	}
+
+	free(dir);
+}
+
 static void
 init_abook()
 {
 	set_filenames();
+	check_abook_directory();
 	init_options();
 
 	signal(SIGKILL, quit_abook_sig);
 	signal(SIGTERM, quit_abook_sig);
-	
+
 	if( init_ui() )
 		exit(1);
-	
+
 	umask(DEFAULT_UMASK);
 
 	if(!datafile_writeable()) {
@@ -85,7 +122,7 @@ init_abook()
 					"If you continue all changes will "
 				"be lost. Do you want to continue?", FALSE)) {
 			close_config();
-			close_database();
+			/*close_database();*/
 			close_ui();
 			exit(1);
 		}
@@ -107,7 +144,7 @@ quit_abook()
 	close_database();
 
 	close_ui();
-	
+
 	exit(0);
 }
 
@@ -123,13 +160,13 @@ main(int argc, char **argv)
 #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
 	setlocale(LC_ALL, "" );
 #endif
-		
+
 	parse_command_line(argc, argv);
-	
+
 	init_abook();
 
 	get_commands();	
-	
+
 	quit_abook();
 
 	return 0;
@@ -154,10 +191,12 @@ set_filenames()
 	}
 
 	if(!datafile)
-		datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
+		datafile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
+				DATAFILE, NULL);
 
 	if(!rcfile)
-		rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
+		rcfile = strconcat(getenv("HOME"), "/" DIR_IN_HOME "/"
+				RCFILE, NULL);
 
 	atexit(free_filenames);
 }
@@ -191,11 +230,11 @@ void
 set_filename(char **var, char *path)
 {
 	char *cwd;
-	
+
 	assert(var != NULL);
 	assert(*var == NULL); /* or else we probably leak memory */
 	assert(path != NULL);
-	
+
 	if(*path == '/') {
 		*var = strdup(path);
 		return;
@@ -203,7 +242,7 @@ set_filename(char **var, char *path)
 
 	cwd = my_getcwd();
 
-	*var = strconcat(cwd, path, NULL);
+	*var = strconcat(cwd, "/", path, NULL);
 
 	free(cwd);
 }
@@ -377,7 +416,7 @@ muttq_print_item(FILE *file, int item)
 	int i;
 
 	split_emailstr(item, emails);
-	
+
 	for(i = 0; i < (options_get_int("mutt_return_all_emails") ?
 			MAX_EMAILS : 1) ; i++)
 		if( *emails[i] )
@@ -420,7 +459,7 @@ init_mutt_query()
 {
 	set_filenames();
 	init_options();
-	
+
 	if( load_database(datafile) ) {
 		printf("Cannot open database\n");
 		quit_mutt_query(1);
@@ -443,7 +482,7 @@ make_mailstr(int item)
 		strdup(name);
 
 	free(name);
-	
+
 	return ret;
 }
 
@@ -494,7 +533,7 @@ launch_mutt(int item)
 #endif
 	system(cmd);	
 	free(cmd);
-	
+
 	/*
 	 * we need to make sure that curses settings are correct
 	 */
@@ -564,18 +603,17 @@ FILE *
 abook_fopen (const char *path, const char *mode)
 {	
 	struct stat s;
-	
+
 	if( ! strchr(mode, 'r') )
 		return fopen(path, mode);
-	
+
 	if ( (stat(path, &s)) == -1 )
 		return NULL;
-	
+
 	return S_ISREG(s.st_mode) ? fopen(path, mode) : NULL;
 }
 
 
-
 static void
 convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 {
@@ -664,7 +702,7 @@ init_add_email()
 	atexit(free_filenames);
 	init_options();
 	atexit(close_config);
-	
+
 	/*
 	 * we don't actually care if loading fails or not
 	 */
@@ -716,7 +754,7 @@ add_email(int quiet)
 {
 	char *line;
 	char *name = NULL, *email = NULL;
-	
+
 	init_add_email();
 
 	do {