convert(argv[i+1], argv[i+2], argv[i+3], "-");
} else if( !strcmp(argv[i], "--add-email") ) {
add_email(0);
- } else if( !strcmp(argv[i], "--add-email-force") ) {
+ } else if( !strcmp(argv[i], "--add-email-quiet") ) {
add_email(1);
} else {
printf("option %s not recognized\n", argv[i]);
"read an e-mail message from stdin and\n"
" "
"add the sender to the addressbook");
- puts (" --add-email-force "
+ puts (" --add-email-quiet "
"same as --add-email but doesn't\n"
" confirm adding");
putchar('\n');
switch( import(srcformat, srcfile) ) {
case -1:
- printf("input format %s not supported\n", srcformat);
+ fprintf(stderr,
+ "input format %s not supported\n", srcformat);
ret = 1;
case 1:
- printf("cannot read file %s\n", srcfile);
+ fprintf(stderr, "cannot read file %s\n", srcfile);
ret = 1;
}
if(!ret)
switch( export(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;
}
exit(0);
}
+static void
+quit_add_email_sig(int signal)
+{
+ quit_add_email();
+}
+
static void
init_add_email()
{
atexit(close_database);
- signal(SIGINT, quit_add_email);
+ signal(SIGINT, quit_add_email_sig);
}
static int
char c;
if(!in) {
fprintf(stderr, "cannot open /dev/tty\n"
- "you may want to use --add-email-force\n");
+ "you may want to use --add-email-quiet\n");
exit(1);
}
printf("Add ``%s <%s>'' to %s ? (y/n)\n",
line = getaline(stdin);
if(line && !strncasecmp("From:", line, 5) ) {
getname(line, &name, &email);
- my_free(line);
add_email_count += add_email_add_item(quiet,
name, email);
my_free(name);