X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=4c9df4f1483465d1b320a8da7c652f4adc95f076;hb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;hp=fe37f71469d861e444d1e3de3595af0daa99957e;hpb=4d2aca39cdd96958b3f0bbc6973f15aac5133cdc;p=pkg%2Fabook.git diff --git a/abook.c b/abook.c index fe37f71..4c9df4f 100644 --- a/abook.c +++ b/abook.c @@ -6,20 +6,21 @@ * Copyright (C) Jaakko Heinonen */ +#include +#include +#include #include -#include #include #include +#include #include -#include -#include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) # include #endif +#include #include "abook.h" #include "ui.h" #include "database.h" @@ -30,7 +31,7 @@ #include "options.h" #include "getname.h" #include "getopt.h" -#include +#include "xmalloc.h" static void init_abook(); static void quit_abook_sig(int i); @@ -82,23 +83,37 @@ 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); } +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()) + close_ui(); + + fprintf(stderr, "Memory allocation failure: %s\n", strerror(err)); + exit(EXIT_FAILURE); +} + static void init_abook() { @@ -113,8 +128,8 @@ init_abook() signal(SIGKILL, quit_abook_sig); signal(SIGTERM, quit_abook_sig); - if( init_ui() ) - exit(1); + if(init_ui()) + exit(EXIT_FAILURE); umask(DEFAULT_UMASK); @@ -129,7 +144,7 @@ init_abook() free_opts(); /*close_database();*/ close_ui(); - exit(1); + exit(EXIT_FAILURE); } } else load_database(datafile); @@ -153,7 +168,7 @@ quit_abook(int save_db) close_ui(); - exit(0); + exit(EXIT_SUCCESS); } static void @@ -168,12 +183,13 @@ main(int argc, char **argv) #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H) setlocale(LC_ALL, ""); #endif + xmalloc_set_error_handler(xmalloc_error_handler); parse_command_line(argc, argv); init_abook(); - get_commands(); + get_commands(); quit_abook(QUIT_SAVE); @@ -183,8 +199,8 @@ main(int argc, char **argv) static void free_filenames() { - my_free(rcfile); - my_free(datafile); + xfree(rcfile); + xfree(datafile); } @@ -195,7 +211,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) @@ -228,7 +244,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; @@ -258,7 +274,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) @@ -312,7 +328,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; @@ -348,16 +364,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) { @@ -378,7 +394,7 @@ show_usage() { puts (PACKAGE " v " VERSION "\n"); puts (" -h --help show usage"); - puts (" -C --config use an alternative configuration file"); + puts (" -C --config use an alternative configuration file"); puts (" --datafile use an alternative addressbook file"); puts (" --mutt-query make a query for mutt"); puts (" --add-email " @@ -450,7 +466,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) { @@ -459,7 +475,7 @@ mutt_query(char *str) } } - quit_mutt_query(0); + quit_mutt_query(EXIT_SUCCESS); } static void @@ -471,8 +487,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); } } @@ -539,7 +555,7 @@ launch_mutt(int item) #ifdef DEBUG fprintf(stderr, "cmd: %s\n", cmd); #endif - system(cmd); + system(cmd); free(cmd); /* @@ -574,47 +590,14 @@ launch_wwwbrowser(int item) ui_init_curses(); } -void * -abook_malloc(size_t size) -{ - void *ptr; - - if ( (ptr = malloc(size)) == NULL ) { - if( is_ui_initialized() ) - quit_abook(QUIT_SAVE); - perror("malloc() failed"); - exit(1); - } - - return ptr; -} - -void * -abook_realloc(void *ptr, size_t size) -{ - ptr = realloc(ptr, size); - - if(size == 0) - return NULL; - - if(ptr == NULL) { - if(is_ui_initialized()) - quit_abook(QUIT_SAVE); - perror("realloc() failed"); - exit(1); - } - - return ptr; -} - 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; @@ -637,7 +620,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 @@ -689,14 +672,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 @@ -739,22 +722,22 @@ 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); } - printf("Add ``%s <%s>'' to %s ? (y/n)\n", - name, - email, - datafile - ); + do { - c = fgetc(in); + printf("Add ``%s <%s>'' to %s ? (y/n)\n", + name, + email, + datafile); + c = getc(in); if(c == 'n' || c == 'N') { fclose(in); return 0; @@ -780,7 +763,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(); @@ -791,10 +774,10 @@ add_email(int quiet) getname(line, &name, &email); add_email_count += add_email_add_item(quiet, name, email); - my_free(name); - my_free(email); + xfree(name); + xfree(email); } - my_free(line); + xfree(line); } while( !feof(stdin) ); quit_add_email();