X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=51812032f7bd55af529028d24514908d05b10506;hb=5d50b3ba7f2e35013e2236219b11fcf75a058770;hp=e1a7dac67aebdf0a5788cec3dc22321ac2329a37;hpb=260365f6312bdbadc5c65ee6aec86e2bfaea1494;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index e1a7dac..5181203 100644
--- a/abook.c
+++ b/abook.c
@@ -104,7 +104,7 @@ init_abook()
 	set_filenames();
 	check_abook_directory();
 	init_opts();
-	if(load_opts(rcfile)) {
+	if(load_opts(rcfile) > 0) {
 		printf("Press enter to continue...\n");
 		fgetc(stdin);
 	}
@@ -137,12 +137,15 @@ init_abook()
 }
 
 void
-quit_abook()
+quit_abook(int save_db)
 {
-	if( opt_get_bool(BOOL_AUTOSAVE) )
-		save_database();
-	else if( statusline_ask_boolean("Save database", TRUE) )
-		save_database();
+	if(save_db)  {
+		if(opt_get_bool(BOOL_AUTOSAVE))
+			save_database();
+		else if(statusline_ask_boolean("Save database", TRUE))
+			save_database();
+	} else if(!statusline_ask_boolean("Quit without saving", FALSE))
+		return;
 
 	free_opts();
 	close_database();
@@ -155,14 +158,14 @@ quit_abook()
 static void
 quit_abook_sig(int i)
 {
-	quit_abook();
+	quit_abook(QUIT_SAVE);
 }
 
 int
 main(int argc, char **argv)
 {
 #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
-	setlocale(LC_ALL, "" );
+	setlocale(LC_ALL, "");
 #endif
 
 	parse_command_line(argc, argv);
@@ -171,7 +174,7 @@ main(int argc, char **argv)
 
 	get_commands();	
 
-	quit_abook();
+	quit_abook(QUIT_SAVE);
 
 	return 0;
 }
@@ -451,7 +454,7 @@ mutt_query(char *str)
 		putchar('\n');
 		while(i >= 0) {
 			muttq_print_item(stdout, i);
-			i = find_item(str, i+1, search_fields);
+			i = find_item(str, i + 1, search_fields);
 		}
 	}
 
@@ -530,8 +533,7 @@ launch_mutt(int item)
 		}
 	}
 
-	cmd = strconcat(mutt_command, " \'", mailstr,
-				"\'", NULL);
+	cmd = strconcat(mutt_command, " \'", mailstr, "\'", NULL);
 	free(mailstr);
 #ifdef DEBUG
 	fprintf(stderr, "cmd: %s\n", cmd);
@@ -578,7 +580,7 @@ abook_malloc(size_t size)
 
 	if ( (ptr = malloc(size)) == NULL ) {
 		if( is_ui_initialized() )
-			quit_abook();
+			quit_abook(QUIT_SAVE);
 		perror("malloc() failed");
 		exit(1);
 	}
@@ -591,12 +593,12 @@ abook_realloc(void *ptr, size_t size)
 {
 	ptr = realloc(ptr, size);
 
-	if( size == 0 )
+	if(size == 0)
 		return NULL;
 
-	if( ptr == NULL ) {
-		if( is_ui_initialized() )
-			quit_abook();
+	if(ptr == NULL) {
+		if(is_ui_initialized())
+			quit_abook(QUIT_SAVE);
 		perror("realloc() failed");
 		exit(1);
 	}
@@ -642,7 +644,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 	init_opts();
 	load_opts(rcfile);
 
-	switch( import_file(srcformat, srcfile) ) {
+	switch(import_file(srcformat, srcfile)) {
 		case -1:
 			fprintf(stderr,
 				"input format %s not supported\n", srcformat);
@@ -655,7 +657,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 	}
 
 	if(!ret)
-		switch( export_file(dstformat, dstfile) ) {
+		switch(export_file(dstformat, dstfile)) {
 			case -1:
 				fprintf(stderr,
 					"output format %s not supported\n",
@@ -707,6 +709,7 @@ init_add_email()
 {
 	set_filenames();
 	atexit(free_filenames);
+	check_abook_directory();
 	init_opts();
 	load_opts(rcfile);
 	atexit(free_opts);
@@ -774,7 +777,7 @@ add_email(int quiet)
 	char *name = NULL, *email = NULL;
 	struct stat s;
 
-	if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode)) {
+	if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode) ) {
 		fprintf(stderr, "stdin is a directory or cannot stat stdin\n");
 		exit(1);
 	}