X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=c754499260281e02a0dd4302797b2d10769b87fc;hb=1ce000762e496959ea5afa3830b171c73f0409c8;hp=06c4ea788ccd2f0d2d82569bfa481792b4794aac;hpb=7a7531e544d236d58ca077ce56b7d6d0c60faa09;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index 06c4ea7..c754499 100644
--- a/abook.c
+++ b/abook.c
@@ -45,7 +45,7 @@ static void		convert(char *srcformat, char *srcfile,
 static void		add_email(int);
 
 char *datafile = NULL;
-char *rcfile = NULL;
+static char *rcfile = NULL;
 
 bool alternative_datafile = FALSE;
 bool alternative_rcfile = FALSE;
@@ -83,18 +83,18 @@ check_abook_directory()
 		if(errno != ENOENT) {
 			perror(dir);
                         free(dir);
-                        exit(1);
+                        exit(EXIT_FAILURE);
 		}
 		if(mkdir(dir, 0700) == -1) {
 			printf("Cannot create directory %s\n", dir);
 			perror(dir);
 			free(dir);
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 	} else if(!S_ISDIR(s.st_mode)) {
 		printf("%s is not a directory\n", dir);
 		free(dir);
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	free(dir);
@@ -103,8 +103,12 @@ check_abook_directory()
 static void
 xmalloc_error_handler(int err)
 {
+	/*
+	 * We don't try to save addressbook here because we don't know
+	 * if it's fully loaded to to memory.
+	 */
 	if(is_ui_initialized())
-		quit_abook(QUIT_SAVE);
+		close_ui();
 
 	fprintf(stderr, "Memory allocation failure: %s\n", strerror(err));
 	exit(EXIT_FAILURE);
@@ -121,11 +125,10 @@ init_abook()
 		fgetc(stdin);
 	}
 
-	signal(SIGKILL, quit_abook_sig);
 	signal(SIGTERM, quit_abook_sig);
 
-	if( init_ui() )
-		exit(1);
+	if(init_ui())
+		exit(EXIT_FAILURE);
 
 	umask(DEFAULT_UMASK);
 
@@ -140,7 +143,7 @@ init_abook()
 			free_opts();
 			/*close_database();*/
 			close_ui();
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 	} else
 		load_database(datafile);
@@ -164,7 +167,7 @@ quit_abook(int save_db)
 
 	close_ui();
 
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
 
 static void
@@ -185,7 +188,7 @@ main(int argc, char **argv)
 
 	init_abook();
 
-	get_commands();	
+	get_commands();
 
 	quit_abook(QUIT_SAVE);
 
@@ -207,7 +210,7 @@ set_filenames()
 
 	if( (stat(getenv("HOME"), &s)) == -1 || ! S_ISDIR(s.st_mode) ) {
 		fprintf(stderr,"%s is not a valid HOME directory\n", getenv("HOME") );
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	if(!datafile)
@@ -240,7 +243,7 @@ change_mode(int *current, int mode)
 		fprintf(stderr, "Cannot combine options --mutt-query, "
 				"--convert, "
 				"--add-email or --add-email-quiet\n");
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	*current = mode;
@@ -270,7 +273,7 @@ set_filename(char **var, char *path)
 #define set_convert_var(X) do { if(mode != MODE_CONVERT) {\
 	fprintf(stderr, "please use option --%s after --convert option\n",\
 			long_options[option_index].name);\
-		exit(1);\
+		exit(EXIT_FAILURE);\
 	} else\
 		X = optarg;\
 	} while(0)
@@ -324,7 +327,7 @@ parse_command_line(int argc, char **argv)
 		switch(c) {
 			case 'h':
 				show_usage();
-				exit(1);
+				exit(EXIT_SUCCESS);
 			case OPT_ADD_EMAIL:
 				change_mode(&mode, MODE_ADD_EMAIL);
 				break;
@@ -360,16 +363,16 @@ parse_command_line(int argc, char **argv)
 				break;
 			case OPT_FORMATS:
 				print_filters();
-				exit(0);
+				exit(EXIT_SUCCESS);
 			default:
-				exit(1);
+				exit(EXIT_FAILURE);
 		}
 	}
 
 	if (optind < argc) {
 		fprintf(stderr, "%s: unrecognized arguments on command line\n",
 				argv[0]);
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	switch(mode) {
@@ -390,7 +393,7 @@ show_usage()
 {
 	puts	(PACKAGE " v " VERSION "\n");
 	puts	("     -h	--help				show usage");
-	puts	("     -C	--config	<file>		use an alternative configuration file");   
+	puts	("     -C	--config	<file>		use an alternative configuration file");
 	puts	("	--datafile	<file>		use an alternative addressbook file");
 	puts	("	--mutt-query	<string>	make a query for mutt");
 	puts	("	--add-email			"
@@ -462,7 +465,7 @@ mutt_query(char *str)
 		int i;
 		if( (i = find_item(str, 0, search_fields)) < 0 ) {
 			printf("Not found\n");
-			quit_mutt_query(1);
+			quit_mutt_query(EXIT_FAILURE);
 		}
 		putchar('\n');
 		while(i >= 0) {
@@ -471,7 +474,7 @@ mutt_query(char *str)
 		}
 	}
 
-	quit_mutt_query(0);
+	quit_mutt_query(EXIT_SUCCESS);
 }
 
 static void
@@ -483,8 +486,8 @@ init_mutt_query()
 
 	if( load_database(datafile) ) {
 		printf("Cannot open database\n");
-		quit_mutt_query(1);
-		exit(1);
+		quit_mutt_query(EXIT_FAILURE);
+		exit(EXIT_FAILURE);
 	}
 }
 
@@ -551,7 +554,7 @@ launch_mutt(int item)
 #ifdef DEBUG
 	fprintf(stderr, "cmd: %s\n", cmd);
 #endif
-	system(cmd);	
+	system(cmd);
 	free(cmd);
 
 	/*
@@ -588,12 +591,12 @@ launch_wwwbrowser(int item)
 
 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 (stat_ok && S_ISREG(s.st_mode)) ?
 			fopen(path, mode) : NULL;
@@ -616,7 +619,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
 	if( !strcasecmp(srcformat, dstformat) ) {
 		printf(	"input and output formats are the same\n"
 			"exiting...\n");
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 #endif
 
@@ -668,14 +671,14 @@ quit_add_email()
 	if(add_email_count > 0) {
 		if(save_database() < 0) {
 			fprintf(stderr, "cannot open %s\n", datafile);
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 		printf("%d item(s) added to %s\n", add_email_count, datafile);
 	} else {
 		puts("Valid sender address not found");
 	}
 
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
 
 static void
@@ -688,7 +691,6 @@ static void
 init_add_email()
 {
 	set_filenames();
-	atexit(free_filenames);
 	check_abook_directory();
 	init_opts();
 	load_opts(rcfile);
@@ -718,14 +720,14 @@ add_email_add_item(int quiet, char *name, char *email)
 			return 0;
 		}
 	}
-					
+
 	if(!quiet) {
 		FILE *in = fopen("/dev/tty", "r");
 		char c;
 		if(!in) {
 			fprintf(stderr, "cannot open /dev/tty\n"
 				"you may want to use --add-email-quiet\n");
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 
 		do {
@@ -759,7 +761,7 @@ add_email(int quiet)
 
 	if( (fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode) ) {
 		fprintf(stderr, "stdin is a directory or cannot stat stdin\n");
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	init_add_email();