X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=d7965098aa7fa9c57a8689465d4161a76841e30c;hb=d221d25b88339fca6be0d015555aa2eb14321195;hp=fd3e336b76da349f10ac9418384113f13d5197c2;hpb=f23af6b90ad6dbe1180c0e660112739be70fd86a;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index fd3e336..d796509 100644
--- a/abook.c
+++ b/abook.c
@@ -103,7 +103,11 @@ init_abook()
 {
 	set_filenames();
 	check_abook_directory();
-	init_options();
+	init_opts();
+	if(load_opts(rcfile) > 0) {
+		printf("Press enter to continue...\n");
+		fgetc(stdin);
+	}
 
 	signal(SIGKILL, quit_abook_sig);
 	signal(SIGTERM, quit_abook_sig);
@@ -121,7 +125,7 @@ init_abook()
 		if(load_database(datafile) || !statusline_ask_boolean(
 					"If you continue all changes will "
 				"be lost. Do you want to continue?", FALSE)) {
-			close_config();
+			free_opts();
 			/*close_database();*/
 			close_ui();
 			exit(1);
@@ -135,12 +139,12 @@ init_abook()
 void
 quit_abook()
 {
-	if( options_get_int("autosave") )
+	if( opt_get_bool(BOOL_AUTOSAVE) )
 		save_database();
 	else if( statusline_ask_boolean("Save database", TRUE) )
 		save_database();
 
-	close_config();
+	free_opts();
 	close_database();
 
 	close_ui();
@@ -404,7 +408,7 @@ static void
 quit_mutt_query(int status)
 {
 	close_database();
-	close_config();
+	free_opts();
 
 	exit(status);
 }
@@ -417,7 +421,7 @@ muttq_print_item(FILE *file, int item)
 
 	split_emailstr(item, emails);
 
-	for(i = 0; i < (options_get_int("mutt_return_all_emails") ?
+	for(i = 0; i < (opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS) ?
 			MAX_EMAILS : 1) ; i++)
 		if( *emails[i] )
 			fprintf(file, "%s\t%s\t%s\n", emails[i],
@@ -458,7 +462,8 @@ static void
 init_mutt_query()
 {
 	set_filenames();
-	init_options();
+	init_opts();
+	load_opts(rcfile);
 
 	if( load_database(datafile) ) {
 		printf("Cannot open database\n");
@@ -506,7 +511,7 @@ void
 launch_mutt(int item)
 {
 	char *cmd = NULL, *mailstr = NULL;
-	char *mutt_command = options_get_str("mutt_command");
+	char *mutt_command = opt_get_str(STR_MUTT_COMMAND);
 
 	if(mutt_command == NULL || !*mutt_command)
 		return;
@@ -550,7 +555,7 @@ launch_wwwbrowser(int item)
 
 	if( database[item][URL] )
 		cmd = mkstr("%s '%s'",
-				options_get_str("www_command"),
+				opt_get_str(STR_WWW_COMMAND),
 				safe_str(database[item][URL]));
 	else
 		return;
@@ -603,17 +608,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)
 {
@@ -633,7 +639,8 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 #endif
 
 	set_filenames();
-	init_options();
+	init_opts();
+	load_opts(rcfile);
 
 	switch( import_file(srcformat, srcfile) ) {
 		case -1:
@@ -663,7 +670,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 		}
 
 	close_database();
-	close_config();
+	free_opts();
 	exit(ret);
 }
 
@@ -700,8 +707,10 @@ init_add_email()
 {
 	set_filenames();
 	atexit(free_filenames);
-	init_options();
-	atexit(close_config);
+	check_abook_directory();
+	init_opts();
+	load_opts(rcfile);
+	atexit(free_opts);
 
 	/*
 	 * we don't actually care if loading fails or not
@@ -718,6 +727,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;