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

diff --git a/abook.c b/abook.c
index acf95ca..d796509 100644
--- a/abook.c
+++ b/abook.c
@@ -45,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()
@@ -68,7 +68,7 @@ check_abook_directory()
 {
 	struct stat s;
 	char *dir;
-	
+
 	assert(!is_ui_initialized());
 
 	if(alternative_datafile)
@@ -76,7 +76,7 @@ check_abook_directory()
 
 	dir = strconcat(getenv("HOME"), "/" DIR_IN_HOME, NULL);
 	assert(dir != NULL);
-	
+
 	if(stat(dir, &s) == -1) {
 		if(errno != ENOENT) {
 			perror(dir);
@@ -103,14 +103,18 @@ 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);
-	
+
 	if( init_ui() )
 		exit(1);
-	
+
 	umask(DEFAULT_UMASK);
 
 	if(!datafile_writeable()) {
@@ -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,16 +139,16 @@ 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();
-	
+
 	exit(0);
 }
 
@@ -160,13 +164,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;
@@ -230,11 +234,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;
@@ -242,7 +246,7 @@ set_filename(char **var, char *path)
 
 	cwd = my_getcwd();
 
-	*var = strconcat(cwd, path, NULL);
+	*var = strconcat(cwd, "/", path, NULL);
 
 	free(cwd);
 }
@@ -404,7 +408,7 @@ static void
 quit_mutt_query(int status)
 {
 	close_database();
-	close_config();
+	free_opts();
 
 	exit(status);
 }
@@ -416,8 +420,8 @@ muttq_print_item(FILE *file, int item)
 	int i;
 
 	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,8 +462,9 @@ static void
 init_mutt_query()
 {
 	set_filenames();
-	init_options();
-	
+	init_opts();
+	load_opts(rcfile);
+
 	if( load_database(datafile) ) {
 		printf("Cannot open database\n");
 		quit_mutt_query(1);
@@ -482,7 +487,7 @@ make_mailstr(int item)
 		strdup(name);
 
 	free(name);
-	
+
 	return ret;
 }
 
@@ -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;
@@ -533,7 +538,7 @@ launch_mutt(int item)
 #endif
 	system(cmd);	
 	free(cmd);
-	
+
 	/*
 	 * we need to make sure that curses settings are correct
 	 */
@@ -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,18 +608,18 @@ FILE *
 abook_fopen (const char *path, const char *mode)
 {	
 	struct stat s;
+	bool stat_ok;
+
+	stat_ok = (stat(path, &s) != -1);
 	
-	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;
+	if(strchr(mode, 'r'))
+		return (stat_ok && S_ISREG(s.st_mode)) ?
+			fopen(path, mode) : NULL;
+	else
+		return (stat_ok && S_ISDIR(s.st_mode)) ?
+			NULL : fopen(path, mode);
 }
 
-
-
 static void
 convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 {
@@ -634,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:
@@ -664,7 +670,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 		}
 
 	close_database();
-	close_config();
+	free_opts();
 	exit(ret);
 }
 
@@ -701,9 +707,11 @@ 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
 	 */
@@ -719,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;
@@ -755,7 +773,13 @@ add_email(int quiet)
 {
 	char *line;
 	char *name = NULL, *email = NULL;
-	
+	struct stat s;
+
+	if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode)) {
+		fprintf(stderr, "stdin is a directory or cannot stat stdin\n");
+		exit(1);
+	}
+
 	init_add_email();
 
 	do {