X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=557ddb2f5818f7a4c5f9c8d855278aa8dc418747;hb=781c0d657fffe80e45d0fda6ed5ddbf5f796fefb;hp=acf95ca871c68578f4ef76c766060525c2f090bc;hpb=ca9cda9e7096dad72f1335a810314001daca7314;p=pkg%2Fabook.git diff --git a/abook.c b/abook.c index acf95ca..557ddb2 100644 --- a/abook.c +++ b/abook.c @@ -6,19 +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" @@ -29,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); @@ -43,10 +45,10 @@ static void convert(char *srcformat, char *srcfile, static void add_email(int); char *datafile = NULL; -char *rcfile = NULL; +static 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 +70,7 @@ check_abook_directory() { struct stat s; char *dir; - + assert(!is_ui_initialized()); if(alternative_datafile) @@ -76,41 +78,58 @@ check_abook_directory() dir = strconcat(getenv("HOME"), "/" DIR_IN_HOME, NULL); assert(dir != NULL); - + if(stat(dir, &s) == -1) { 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 memory. + */ + if(is_ui_initialized()) + close_ui(); + + fprintf(stderr, "Memory allocation failure: %s\n", strerror(err)); + exit(EXIT_FAILURE); +} + static void 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); - + + if(init_ui()) + exit(EXIT_FAILURE); + umask(DEFAULT_UMASK); if(!datafile_writeable()) { @@ -121,10 +140,10 @@ 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); + exit(EXIT_FAILURE); } } else load_database(datafile); @@ -133,41 +152,45 @@ init_abook() } void -quit_abook() +quit_abook(int save_db) { - if( options_get_int("autosave") ) - save_database(); - else if( statusline_ask_boolean("Save database", TRUE) ) - save_database(); + if(save_db) { + if(opt_get_bool(BOOL_AUTOSAVE)) + save_database(); + else if(statusline_ask_boolean("Save database", TRUE)) + save_database(); + } else if(!statusline_ask_boolean("Quit without saving", FALSE)) + return; - close_config(); + free_opts(); close_database(); close_ui(); - - exit(0); + + exit(EXIT_SUCCESS); } static void quit_abook_sig(int i) { - quit_abook(); + quit_abook(QUIT_SAVE); } int main(int argc, char **argv) { #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H) - setlocale(LC_ALL, "" ); + setlocale(LC_ALL, ""); #endif - + xmalloc_set_error_handler(xmalloc_error_handler); + parse_command_line(argc, argv); - + init_abook(); - get_commands(); - - quit_abook(); + get_commands(); + + quit_abook(QUIT_SAVE); return 0; } @@ -175,8 +198,8 @@ main(int argc, char **argv) static void free_filenames() { - my_free(rcfile); - my_free(datafile); + xfree(rcfile); + xfree(datafile); } @@ -187,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) @@ -220,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; @@ -230,19 +253,19 @@ 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); + *var = xstrdup(path); return; } cwd = my_getcwd(); - *var = strconcat(cwd, path, NULL); + *var = strconcat(cwd, "/", path, NULL); free(cwd); } @@ -250,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) @@ -304,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; @@ -340,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) { @@ -370,7 +393,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 " @@ -404,7 +427,7 @@ static void quit_mutt_query(int status) { close_database(); - close_config(); + free_opts(); exit(status); } @@ -416,8 +439,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], @@ -442,28 +465,29 @@ 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) { muttq_print_item(stdout, i); - i = find_item(str, i+1, search_fields); + i = find_item(str, i + 1, search_fields); } } - quit_mutt_query(0); + quit_mutt_query(EXIT_SUCCESS); } 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); - exit(1); + quit_mutt_query(EXIT_FAILURE); + exit(EXIT_FAILURE); } } @@ -479,10 +503,10 @@ make_mailstr(int item) ret = *database[item][EMAIL] ? mkstr("%s <%s>", name, email) : - strdup(name); + xstrdup(name); free(name); - + return ret; } @@ -506,7 +530,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; @@ -525,15 +549,14 @@ 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); #endif - system(cmd); + system(cmd); free(cmd); - + /* * we need to make sure that curses settings are correct */ @@ -550,7 +573,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; @@ -566,54 +589,21 @@ 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(); - 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(); - perror("realloc() failed"); - exit(1); - } - - return ptr; -} - FILE * abook_fopen (const char *path, const char *mode) -{ +{ struct stat s; - - 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; -} + 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; + else + return (stat_ok && S_ISDIR(s.st_mode)) ? + NULL : fopen(path, mode); +} static void convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile) @@ -629,14 +619,15 @@ 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 set_filenames(); - init_options(); + 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); @@ -649,7 +640,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", @@ -664,7 +655,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile) } close_database(); - close_config(); + free_opts(); exit(ret); } @@ -680,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 @@ -700,10 +691,11 @@ static void 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,21 +711,31 @@ 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; 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; @@ -743,8 +745,8 @@ add_email_add_item(int quiet, char *name, char *email) } memset(item, 0, sizeof(item)); - item[NAME] = strdup(name); - item[EMAIL] = strdup(email); + item[NAME] = xstrdup(name); + item[EMAIL] = xstrdup(email); add_item2database(item); return 1; @@ -755,7 +757,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(EXIT_FAILURE); + } + init_add_email(); do { @@ -764,10 +772,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();