X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=7ce99ae3366d9269b12bfb21d9ca49afd8b387ed;hb=e0e2b1ebd0bbc1728e7117ff88e5046f2870cfaa;hp=101dd69d6b41fe787c2cce462e844163a8f612d9;hpb=c38bc4bc5254bd5925d8567e7ff1554a7844b8c7;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index 101dd69..7ce99ae 100644
--- a/abook.c
+++ b/abook.c
@@ -104,7 +104,10 @@ init_abook()
 	set_filenames();
 	check_abook_directory();
 	init_opts();
-	load_opts(rcfile);
+	if(load_opts(rcfile) > 0) {
+		printf("Press enter to continue...\n");
+		fgetc(stdin);
+	}
 
 	signal(SIGKILL, quit_abook_sig);
 	signal(SIGTERM, quit_abook_sig);
@@ -136,9 +139,9 @@ init_abook()
 void
 quit_abook()
 {
-	if( opt_get_bool(BOOL_AUTOSAVE) )
+	if(opt_get_bool(BOOL_AUTOSAVE))
 		save_database();
-	else if( statusline_ask_boolean("Save database", TRUE) )
+	else if(statusline_ask_boolean("Save database", TRUE))
 		save_database();
 
 	free_opts();
@@ -159,7 +162,7 @@ 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);
@@ -448,7 +451,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);
 		}
 	}
 
@@ -527,8 +530,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);
@@ -588,11 +590,11 @@ 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() )
+	if(ptr == NULL) {
+		if(is_ui_initialized())
 			quit_abook();
 		perror("realloc() failed");
 		exit(1);
@@ -605,17 +607,18 @@ FILE *
 abook_fopen (const char *path, const char *mode)
 {	
 	struct stat s;
+	bool stat_ok;
 
-	if((stat(path, &s)) == -1)
-		return NULL;
+	stat_ok = (stat(path, &s) != -1);
 	
 	if(strchr(mode, 'r'))
-		return S_ISREG(s.st_mode) ? fopen(path, mode) : NULL;
+		return (stat_ok && S_ISREG(s.st_mode)) ?
+			fopen(path, mode) : NULL;
 	else
-		return S_ISDIR(s.st_mode) ? NULL : fopen(path, mode);
+		return (stat_ok && S_ISDIR(s.st_mode)) ?
+			NULL : fopen(path, mode);
 }
 
-
 static void
 convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 {
@@ -638,7 +641,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);
@@ -651,7 +654,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",
@@ -703,6 +706,7 @@ init_add_email()
 {
 	set_filenames();
 	atexit(free_filenames);
+	check_abook_directory();
 	init_opts();
 	load_opts(rcfile);
 	atexit(free_opts);
@@ -722,6 +726,16 @@ add_email_add_item(int quiet, char *name, char *email)
 {
 	list_item item;
 
+	if(opt_get_bool(BOOL_ADD_EMAIL_PREVENT_DUPLICATES)) {
+		int search_fields[] = { EMAIL, -1 };
+		if(find_item(email, 0, search_fields) >= 0) {
+			if(!quiet)
+				printf("Address %s already in addressbook\n",
+						email);
+			return 0;
+		}
+	}
+					
 	if(!quiet) {
 		FILE *in = fopen("/dev/tty", "r");
 		char c;
@@ -760,7 +774,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);
 	}