X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=45eb83d54bc28abf0aadb95f97b66e4ec1de168d;hb=1cea479962427f5818f7368fe2174f3131f6b356;hp=dadf41e4383bdf491ac66a7889d4e1ded50d5791;hpb=12a57d9405d7910566d5ff888d743d29b0716554;p=pkg%2Fabook.git diff --git a/abook.c b/abook.c index dadf41e..45eb83d 100644 --- a/abook.c +++ b/abook.c @@ -1,9 +1,9 @@ /* * $Id$ * - * by JH + * by JH * - * Copyright (C) 1999, 2000 Jaakko Heinonen + * Copyright (C) Jaakko Heinonen */ #include @@ -12,74 +12,54 @@ #include #include #include -#include "abook_curses.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) # include #endif -#ifdef HAVE_TERMIOS_H -# include -#else -# ifdef HAVE_LINUX_TERMIOS_H -# include -# endif -#endif -#ifdef HAVE_SYS_IOCTL_H -# include -#endif #include "abook.h" +#include "ui.h" #include "database.h" #include "list.h" #include "filter.h" #include "edit.h" #include "misc.h" -#include "help.h" #include "options.h" -#include "estr.h" +#include "getname.h" +#include "getopt.h" +#include static void init_abook(); +static void quit_abook_sig(int i); static void set_filenames(); -static void free_filenames(); -static void display_help(char **tbl); -static void get_commands(); static void parse_command_line(int argc, char **argv); static void show_usage(); static void mutt_query(char *str); static void init_mutt_query(); -static void quit_mutt_query(); -static void launch_mutt(); -static void launch_lynx(); -static void win_changed(int dummy); -static void open_datafile(); -#ifdef SIGWINCH -static void resize_abook(); -#endif static void convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile); - -int should_resize = FALSE; -int can_resize = FALSE; +static void add_email(int); char *datafile = NULL; char *rcfile = NULL; -WINDOW *top = NULL, *bottom = NULL; +int alternative_datafile = FALSE; +int alternative_rcfile = FALSE; -static void -init_windows() +static int +datafile_writeable() { - top = newwin(LIST_TOP - 1, COLS, 0, 0); - - bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0); -} + FILE *f; -static void -free_windows() -{ - delwin(top); - delwin(bottom); + assert(datafile != NULL); + + if( (f = fopen(datafile, "a")) == NULL) + return FALSE; + + fclose(f); + + return TRUE; } static void @@ -88,53 +68,29 @@ init_abook() set_filenames(); init_options(); - initscr(); cbreak(); noecho(); - nonl(); - intrflush(stdscr, FALSE); - keypad(stdscr, TRUE); -#ifdef DEBUG - fprintf(stderr, "init_abook():\n"); - fprintf(stderr, " COLS = %d, LINES = %d\n", COLS, LINES); -#endif - if( LINES < MIN_LINES || COLS < MIN_COLS ) { - clear(); refresh(); endwin(); - fprintf(stderr, "Your terminal size is %dx%d\n", COLS, LINES); - fprintf(stderr, "Terminal is too small. Minium terminal size " - "for abook is " - "%dx%d\n", MIN_COLS, MIN_LINES); + signal(SIGKILL, quit_abook_sig); + signal(SIGTERM, quit_abook_sig); + + if( init_ui() ) exit(1); - } - umask(DEFAULT_UMASK); -#ifdef SIGWINCH - signal(SIGWINCH, win_changed); -#endif - signal(SIGINT, quit_abook); - signal(SIGKILL, quit_abook); - signal(SIGTERM, quit_abook); - init_list(); - init_windows(); + umask(DEFAULT_UMASK); - /* - * this is very ugly for now - */ - /*if( options_get_int("datafile", "autosave") )*/ - - if( load_database(datafile) == 2 ) { - char *tmp = strconcat(getenv("HOME"), - "/" DATAFILE, NULL); - - if( safe_strcmp(tmp, datafile) ) { - refresh_screen(); - statusline_msg("Sorry, the specified file does " - "not appear to be a valid abook addressbook"); - statusline_msg("Will open default addressbook..."); - free(datafile); - datafile = tmp; - load_database(datafile); - } else - free(tmp); - } + if(!datafile_writeable()) { + char *s = mkstr("File %s is not writeable", datafile); + refresh_screen(); + statusline_msg(s); + free(s); + if(load_database(datafile) || !statusline_ask_boolean( + "If you continue all changes will " + "be lost. Do you want to continue?", FALSE)) { + close_config(); + close_database(); + close_ui(); + exit(1); + } + } else + load_database(datafile); refresh_screen(); } @@ -144,26 +100,23 @@ quit_abook() { if( options_get_int("autosave") ) save_database(); - else { - statusline_addstr("Save database (y/N)"); - switch( getch() ) { - case 'y': - case 'Y': - save_database(); - default: break; - } - } + else if( statusline_ask_boolean("Save database", TRUE) ) + save_database(); + close_config(); close_database(); - close_list(); - free_windows(); - clear(); - refresh(); - endwin(); + close_ui(); + exit(0); } +static void +quit_abook_sig(int i) +{ + quit_abook(); +} + int main(int argc, char **argv) { @@ -182,6 +135,14 @@ main(int argc, char **argv) return 0; } +static void +free_filenames() +{ + my_free(rcfile); + my_free(datafile); +} + + static void set_filenames() { @@ -192,384 +153,225 @@ set_filenames() exit(1); } - if (!datafile) + if(!datafile) datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL); - rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL); + if(!rcfile) + rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL); atexit(free_filenames); } +/* + * CLI + */ + +enum { + MODE_CONT, + MODE_ADD_EMAIL, + MODE_ADD_EMAIL_QUIET, + MODE_QUERY, + MODE_CONVERT +}; + static void -free_filenames() +change_mode(int *current, int mode) { - my_free(rcfile); - my_free(datafile); + if(*current != MODE_CONT) { + fprintf(stderr, "Cannot combine options --mutt-query, " + "--convert, " + "--add-email or --add-email-quiet\n"); + exit(1); + } + + *current = mode; } void -headerline(char *str) +set_filename(char **var, char *path) { - werase(top); + char *cwd; - mvwhline(top, 1, 0, ACS_HLINE, COLS); + assert(var != NULL); + assert(*var == NULL); /* or else we probably leak memory */ + assert(path != NULL); - mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str); - - refresh(); - wrefresh(top); -} - - -void -refresh_screen() -{ -#ifdef SIGWINCH - if( should_resize ) { - resize_abook(); + if(*path == '/') { + *var = strdup(path); return; } -#endif - clear(); - - refresh_statusline(); - headerline(MAIN_HELPLINE); - list_headerline(); - - refresh_list(); -} -#ifdef DEBUG -extern int curitem; -extern list_item *database; -static void -dump_item() -{ - int i; + cwd = my_getcwd(); - fprintf(stderr,"sizeof(list_item) = %d\n", sizeof(list_item)); - fprintf(stderr,"--- dumping item %d ---\n", curitem); - - for(i=0; i= 0) { - selected[curitem] = !selected[curitem]; - print_number_of_items(); - refresh_list(); - } + int option_index = 0; + enum { + OPT_ADD_EMAIL, + OPT_ADD_EMAIL_QUIET, + OPT_MUTT_QUERY, + OPT_CONVERT, + OPT_INFORMAT, + OPT_OUTFORMAT, + OPT_INFILE, + OPT_OUTFILE, + OPT_FORMATS + }; + static struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "add-email", 0, 0, OPT_ADD_EMAIL }, + { "add-email-quiet", 0, 0, OPT_ADD_EMAIL_QUIET }, + { "datafile", 1, 0, 'f' }, + { "mutt-query", 1, 0, OPT_MUTT_QUERY }, + { "config", 1, 0, 'C' }, + { "convert", 0, 0, OPT_CONVERT }, + { "informat", 1, 0, OPT_INFORMAT }, + { "outformat", 1, 0, OPT_OUTFORMAT }, + { "infile", 1, 0, OPT_INFILE }, + { "outfile", 1, 0, OPT_OUTFILE }, + { "formats", 0, 0, OPT_FORMATS }, + { 0, 0, 0, 0 } + }; + + c = getopt_long(argc, argv, "hC:", + long_options, &option_index); + + if(c == -1) + break; + + switch(c) { + case 'h': + show_usage(); + exit(1); + case OPT_ADD_EMAIL: + change_mode(&mode, MODE_ADD_EMAIL); break; - case '+': select_all(); - refresh_list(); + case OPT_ADD_EMAIL_QUIET: + change_mode(&mode, MODE_ADD_EMAIL_QUIET); break; - case '-': select_none(); - refresh_list(); + case 'f': + set_filename(&datafile, optarg); + alternative_datafile = TRUE; break; - case '*': invert_selection(); - refresh_list(); - break; - case 'A': move_curitem(MOVE_ITEM_UP); + case OPT_MUTT_QUERY: + query_string = optarg; + change_mode(&mode, MODE_QUERY); break; - case 'Z': move_curitem(MOVE_ITEM_DOWN); + case 'C': + set_filename(&rcfile, optarg); + alternative_rcfile = TRUE; break; - - case 'm': launch_mutt(); break; - - case 'p': print_database(); break; - - case 'u': launch_lynx(); break; -#ifdef DEBUG - case 'D': dump_item(); -#endif + case OPT_CONVERT: + change_mode(&mode, MODE_CONVERT); + break; + case OPT_INFORMAT: + set_convert_var(informat); + break; + case OPT_OUTFORMAT: + set_convert_var(outformat); + break; + case OPT_INFILE: + set_convert_var(infile); + break; + case OPT_OUTFILE: + set_convert_var(outfile); + break; + case OPT_FORMATS: + print_filters(); + exit(0); + default: + exit(1); } } -} - -static void -display_help(char **tbl) -{ - int i, j = 3; - - erase(); - headerline("help"); - refresh_statusline(); - - for( i = 0; tbl[i] != NULL; i++) { - mvaddstr(j++, 0, tbl[i]); - if( ( !( (i+1) % (LINES-7) ) ) || - (tbl[i+1] == NULL) ) { - refresh(); - statusline_msg("Press any key to continue..."); - erase(); - refresh_statusline(); - headerline("help"); - j = 3; - } + if (optind < argc) { + fprintf(stderr, "%s: unrecognized arguments on command line\n", + argv[0]); + exit(1); } - refresh_screen(); -} - -void -display_editor_help(WINDOW *w) -{ - int i; - - werase(w); - - headerline("editor help"); - for( i = 0; editorhelp[i] != NULL; i++) { - waddstr(w, editorhelp[i]); - if( ( !( (i+1) % (LINES-8) ) ) || - (editorhelp[i+1] == NULL) ) { - refresh(); - wrefresh(w); - statusline_msg("Press any key to continue..."); - wclear(w); - } + switch(mode) { + case MODE_ADD_EMAIL: + add_email(0); + case MODE_ADD_EMAIL_QUIET: + add_email(1); + case MODE_QUERY: + mutt_query(query_string); + case MODE_CONVERT: + convert(informat, infile, outformat, outfile); } } -void -statusline_msg(char *msg) -{ - clear_statusline(); - statusline_addstr(msg); - getch(); -#ifdef DEBUG - fprintf(stderr, "statusline_msg(\"%s\")\n", msg); -#endif - clear_statusline(); -} - -void -statusline_addstr(char *str) +static void +show_usage() { - mvwaddstr(bottom, 1, 0, str); - refresh(); - wrefresh(bottom); + puts (PACKAGE " v " VERSION "\n"); + puts (" -h --help show usage"); + 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 " + "read an e-mail message from stdin and\n" + " " + "add the sender to the addressbook"); + puts (" --add-email-quiet " + "same as --add-email but doesn't\n" + " confirm adding"); + putchar('\n'); + puts (" --convert convert address book files"); + puts (" options to use with --convert:"); + puts (" --informat format for input file"); + puts (" (default: abook)"); + puts (" --infile source file"); + puts (" (default: stdin)"); + puts (" --outformat format for output file"); + puts (" (default: text)"); + puts (" --outfile destination file"); + puts (" (default: stdout)"); + puts (" --formats list available formats"); } /* - * function statusline_getnstr - * - * parameters: - * (char *str) - * if n >= 0 str is a pointer which points a place where to store - * the string, else str is ingnored - * (int n) - * the maximum length of the string - * If n < 0 function will allocate needed space for the string. - * Value 0 is not allowed for n. - * (int use_filesel) - * if this value is nonzero the fileselector is enabled - * - * returns (char *) - * If n < 0 a pointer to a newly allocated string is returned. - * If n > 0 a nonzero value is returned if user has typed a valid - * string. If not NULL value is returned. Never really use the - * _pointer_ if n > 0. - * + * end of CLI */ -char * -statusline_getnstr(char *str, int n, int use_filesel) -{ - char *buf; - int y, x; - - getyx(bottom, y, x); - wmove(bottom, 1, x); - - buf = wenter_string(bottom, n, - (use_filesel ? ESTR_USE_FILESEL:0) | ESTR_DONT_WRAP); - - if(n < 0) - return buf; - - if(buf == NULL) - str[0] = 0; - else - strncpy(str, buf, n); - - str[n-1] = 0; - - free(buf); - - return buf; -} - -void -refresh_statusline() -{ - werase(bottom); - - mvwhline(bottom, 0, 0, ACS_HLINE, COLS); - mvwhline(bottom, 2, 0, ACS_HLINE, COLS); - - refresh(); - wrefresh(bottom); -} - - -char * -ask_filename(char *prompt, int flags) -{ - char *buf = NULL; - - clear_statusline(); - - statusline_addstr(prompt); - buf = statusline_getnstr(NULL, -1, flags); - - clear_statusline(); - - return buf; -} - -void -clear_statusline() -{ - wmove(bottom, 1, 0); - wclrtoeol(bottom); - wrefresh(bottom); - refresh(); -} +extern list_item *database; static void -parse_command_line(int argc, char **argv) +quit_mutt_query(int status) { - int i; - - for( i = 1; i < argc; i++ ) { - if( !strcmp(argv[i], "--help") ) { - show_usage(); - exit(1); - } else - if( !strcmp(argv[i], "--mutt-query") ) - mutt_query(argv[i + 1]); - else - if( !strcmp(argv[i], "--datafile") ) { - if (argv[i+1]) { - if (argv[i+1][0] != '/') { - char *cwd = my_getcwd(); - datafile = strconcat(cwd, "/", argv[i+1], NULL); - free(cwd); - } else { - datafile = strdup(argv[i+1]); - } - i++; - } else { - show_usage(); - exit(1); - } - } else - if( !strcmp(argv[i], "--convert") ) { - if( argc < 5 || argc > 6 ) { - fprintf(stderr, "incorrect number of argumets to make conversion\n"); - fprintf(stderr, "try %s --help\n", argv[0]); - exit(1); - } - if( argv[i+4] ) - convert(argv[i+1], argv[i+2], - argv[i+3], argv[i+4]); - else - convert(argv[i+1], argv[i+2], argv[i+3], "-"); - } else { - printf("option %s not recognized\n", argv[i]); - printf("try %s --help\n", argv[0]); - exit(1); - } - } -} - + close_database(); + close_config(); -static void -show_usage() -{ - puts (PACKAGE " v " VERSION "\n"); - puts (" --help show usage"); - puts (" --datafile use an alternative addressbook file"); - puts (" --mutt-query make a query for mutt"); - puts (" --convert " - " "); - putchar('\n'); - puts ("available formats for --convert option:"); - print_filters(); -#ifdef DEBUG - puts ("\nWarning: this version compiled with DEBUG flag ON"); -#endif + exit(status); } -extern list_item *database; -extern int items; - static void -muttq_print_item(int item) +muttq_print_item(FILE *file, int item) { char emails[MAX_EMAILS][MAX_EMAIL_LEN]; int i; @@ -579,80 +381,35 @@ muttq_print_item(int item) for(i = 0; i < (options_get_int("mutt_return_all_emails") ? MAX_EMAILS : 1) ; i++) if( *emails[i] ) - printf("%s\t%s\t%s\n", emails[i], + fprintf(file, "%s\t%s\t%s\n", emails[i], database[item][NAME], database[item][NOTES] == NULL ? " " : database[item][NOTES] ); } -static int -mutt_query_name(char *str) -{ - int i, j; - char *tmp; - - for(i = 0, j = 0 ; i < items; i++) { - tmp = strdup(database[i][NAME]); - if( strstr( strupper(tmp), strupper(str) ) != NULL ) { - if( !j ) - putchar('\n'); - muttq_print_item(i); - j++; - } - free(tmp); - } - - return j; -} - -static int -mutt_query_email(char *str) -{ - int i, j, k; - char *tmp, emails[MAX_EMAILS][MAX_EMAIL_LEN]; - - for(i = 0, j = 0; i < items; i++) { - split_emailstr(i, emails); - for(k = 0; k < MAX_EMAILS; k++) { - if( *emails[k] ) { - tmp = strdup( emails[k] ); - if( strstr( strupper(tmp), strupper(str) ) != NULL ) { - if( !j ) - putchar('\n'); - j++; - if( options_get_int("mutt_return_all_emails") ) { - muttq_print_item(i); - free(tmp); - break; - } else - printf("%s\t%s\n", emails[k], - database[i][NAME]); - } - free(tmp); - } - } - } - - return j; -} - static void mutt_query(char *str) { - int i; - init_mutt_query(); if( str == NULL || !strcasecmp(str, "all") ) { + struct db_enumerator e = init_db_enumerator(ENUM_ALL); printf("All items\n"); - for(i = 0; i < items; i++) - muttq_print_item(i); + db_enumerate_items(e) + muttq_print_item(stdout, e.item); } else { - if( !mutt_query_name(str) && !mutt_query_email(str) ) { + int search_fields[] = {NAME, EMAIL, NICK, -1}; + int i; + if( (i = find_item(str, 0, search_fields)) < 0 ) { printf("Not found\n"); quit_mutt_query(1); } + putchar('\n'); + while(i >= 0) { + muttq_print_item(stdout, i); + i = find_item(str, i+1, search_fields); + } } quit_mutt_query(0); @@ -671,68 +428,91 @@ init_mutt_query() } } -static void -quit_mutt_query(int status) + +static char * +make_mailstr(int item) { - close_database(); - close_config(); + char email[MAX_EMAIL_LEN]; + char *ret; + char *name = mkstr("\"%s\"", database[item][NAME]); - exit(status); + get_first_email(email, item); + + ret = *database[item][EMAIL] ? + mkstr("%s <%s>", name, email) : + strdup(name); + + free(name); + + return ret; } +void +print_stderr(int item) +{ + fprintf (stderr, "%c", '\n'); -static void -launch_mutt() + if( is_valid_item(item) ) + muttq_print_item(stderr, item); + else { + struct db_enumerator e = init_db_enumerator(ENUM_SELECTED); + db_enumerate_items(e) { + muttq_print_item(stderr, e.item); + } + } + +} + +void +launch_mutt(int item) { - int i; - char email[MAX_EMAIL_LEN]; - char *cmd; - char *tmp = options_get_str("mutt_command"); + char *cmd = NULL, *mailstr = NULL; + char *mutt_command = options_get_str("mutt_command"); - if(curitem < 0) + if(mutt_command == NULL || !*mutt_command) return; - cmd = strconcat(tmp, " '", NULL ); - - for(i=0; i < items; i++) { - if( ! selected[i] && i != curitem ) - continue; - get_first_email(email, i); - tmp = mkstr("%s \"%s\"", cmd, database[i][NAME]); - my_free(cmd); - if( *database[i][EMAIL] ) { - cmd = mkstr("%s <%s>", tmp, email); + if( is_valid_item(item) ) + mailstr = make_mailstr(item); + else { + struct db_enumerator e = init_db_enumerator(ENUM_SELECTED); + char *tmp = NULL; + db_enumerate_items(e) { + tmp = mailstr; + mailstr = tmp ? + strconcat(tmp, ",", make_mailstr(e.item), NULL): + strconcat(make_mailstr(e.item), NULL); free(tmp); - tmp = cmd; } - cmd = strconcat(tmp, " ", NULL); - free(tmp); } - tmp = mkstr("%s%c", cmd, '\''); - free(cmd); - cmd = tmp; + cmd = strconcat(mutt_command, " \'", mailstr, + "\'", NULL); + free(mailstr); #ifdef DEBUG fprintf(stderr, "cmd: %s\n", cmd); #endif system(cmd); - free(cmd); - refresh_screen(); + + /* + * we need to make sure that curses settings are correct + */ + ui_init_curses(); } -static void -launch_lynx() +void +launch_wwwbrowser(int item) { char *cmd = NULL; - if(curitem < 0) + if( !is_valid_item(item) ) return; - if( database[curitem][URL] ) + if( database[item][URL] ) cmd = mkstr("%s '%s'", options_get_str("www_command"), - safe_str(database[curitem][URL])); + safe_str(database[item][URL])); else return; @@ -740,7 +520,11 @@ launch_lynx() system(cmd); free(cmd); - refresh_screen(); + + /* + * we need to make sure that curses settings are correct + */ + ui_init_curses(); } void * @@ -749,7 +533,7 @@ abook_malloc(size_t size) void *ptr; if ( (ptr = malloc(size)) == NULL ) { - if(top) /* determinate if init_abook has been called */ + if( is_ui_initialized() ) quit_abook(); perror("malloc() failed"); exit(1); @@ -767,7 +551,7 @@ abook_realloc(void *ptr, size_t size) return NULL; if( ptr == NULL ) { - if(top) /* determinate if init_abook has been called */ + if( is_ui_initialized() ) quit_abook(); perror("realloc() failed"); exit(1); @@ -791,49 +575,6 @@ abook_fopen (const char *path, const char *mode) } -static void -win_changed(int i) -{ - if( can_resize ) - resize_abook(); - else - should_resize = TRUE; -} - -#ifdef SIGWINCH -static void -resize_abook() -{ -#ifdef TIOCGWINSZ - struct winsize winsz; - - ioctl (0, TIOCGWINSZ, &winsz); -#ifdef DEBUG - if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) { - fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row); - } -#endif - - if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) { -#ifdef HAVE_RESIZETERM - resizeterm(winsz.ws_row, winsz.ws_col); -#else - COLS = winsz.ws_col; - LINES = winsz.ws_row; -#endif - } - - should_resize = FALSE; - close_list(); /* we need to recreate windows */ - init_list(); - free_windows(); - init_windows(); - refresh_screen(); - refresh(); -#endif /* TIOCGWINSZ */ -} -#endif /* SIGWINCH */ - static void convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile) @@ -845,36 +586,40 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile) fprintf(stderr, "try --help\n"); } - strlower(srcformat); - strlower(dstformat); - - if( !strcmp(srcformat, dstformat) ) { +#ifndef DEBUG + if( !strcasecmp(srcformat, dstformat) ) { printf( "input and output formats are the same\n" "exiting...\n"); exit(1); } +#endif set_filenames(); init_options(); - switch( import(srcformat, srcfile) ) { + switch( import_file(srcformat, srcfile) ) { case -1: - printf("input format %s not supported\n", srcformat); + fprintf(stderr, + "input format %s not supported\n", srcformat); ret = 1; + break; case 1: - printf("cannot read file %s\n", srcfile); + fprintf(stderr, "cannot read file %s\n", srcfile); ret = 1; + break; } if(!ret) - switch( export(dstformat, dstfile) ) { + switch( export_file(dstformat, dstfile) ) { case -1: - printf("output format %s not supported\n", - dstformat); + fprintf(stderr, + "output format %s not supported\n", + dstformat); ret = 1; break; case 1: - printf("cannot write file %s\n", dstfile); + fprintf(stderr, + "cannot write file %s\n", dstfile); ret = 1; break; } @@ -884,43 +629,111 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile) exit(ret); } +/* + * --add-email handling + */ + +static int add_email_count = 0; static void -open_datafile() +quit_add_email() { - char *filename; + if(add_email_count > 0) { + if(save_database() < 0) { + fprintf(stderr, "cannot open %s\n", datafile); + exit(1); + } + printf("%d item(s) added to %s\n", add_email_count, datafile); + } else { + puts("Valid sender address not found"); + } - filename = ask_filename("File to open: ", 1); + exit(0); +} - if( !filename ) { - refresh_screen(); - return; - } +static void +quit_add_email_sig(int signal) +{ + quit_add_email(); +} - if( options_get_int("autosave") ) - save_database(); - else { - statusline_addstr("Save current database (y/N)"); - switch( getch() ) { - case 'y': - case 'Y': - save_database(); - default: break; +static void +init_add_email() +{ + set_filenames(); + atexit(free_filenames); + init_options(); + atexit(close_config); + + /* + * we don't actually care if loading fails or not + */ + load_database(datafile); + + atexit(close_database); + + signal(SIGINT, quit_add_email_sig); +} + +static int +add_email_add_item(int quiet, char *name, char *email) +{ + list_item item; + + 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); } + printf("Add ``%s <%s>'' to %s ? (y/n)\n", + name, + email, + datafile + ); + do { + c = fgetc(in); + if(c == 'n' || c == 'N') { + fclose(in); + return 0; + } + } while(c != 'y' && c != 'Y'); + fclose(in); } - close_database(); + memset(item, 0, sizeof(item)); + item[NAME] = strdup(name); + item[EMAIL] = strdup(email); + add_item2database(item); - load_database(filename); + return 1; +} - if( items == 0 ) { - statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook"); - load_database(datafile); - } else { - free(datafile); - datafile = strdup(filename); - } +static void +add_email(int quiet) +{ + char *line; + char *name = NULL, *email = NULL; + + init_add_email(); + + do { + line = getaline(stdin); + if(line && !strncasecmp("From:", line, 5) ) { + getname(line, &name, &email); + add_email_count += add_email_add_item(quiet, + name, email); + my_free(name); + my_free(email); + } + my_free(line); + } while( !feof(stdin) ); - refresh_screen(); - free(filename); + quit_add_email(); } + +/* + * end of --add-email handling + */