// custom formatting
char custom_format[FORMAT_STRING_LEN] = "{nick} ({name}): {mobile}";
-char *parsed_custom_format = NULL;
-enum field_types *custom_format_fields = 0;
struct abook_output_item_filter selected_item_filter;
bool alternative_datafile = FALSE;
{ 0, 0, 0, 0 }
};
- c = getopt_long(argc, argv, "hC:",
+ c = getopt_long(argc, argv, "hC:f:",
long_options, &option_index);
if(c == -1)
selected_item_filter = select_output_item_filter(outformat);
break;
case OPT_OUTFORMAT_STR:
- strncpy(custom_format, optarg, FORMAT_STRING_LEN - 1);
- custom_format[FORMAT_STRING_LEN] = 0;
+ strncpy(custom_format, optarg, FORMAT_STRING_LEN);
+ custom_format[FORMAT_STRING_LEN - 1] = 0;
break;
case OPT_INFILE:
set_convert_var(infile);
fprintf(stderr, _("Invalid custom format string\n"));
exit(EXIT_FAILURE);
}
- parsed_custom_format = (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
- custom_format_fields = (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
- parse_custom_format(custom_format, parsed_custom_format, custom_format_fields);
}
if(optind < argc) {
fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
static void
show_usage()
{
- puts (PACKAGE " v " VERSION "\n");
+ puts (PACKAGE " v" VERSION "\n");
puts (_(" -h --help show usage"));
puts (_(" -C --config <file> use an alternative configuration file"));
- puts (_(" --datafile <file> use an alternative addressbook file"));
+ puts (_(" -f --datafile <file> use an alternative addressbook file"));
puts (_(" --mutt-query <string> make a query for mutt"));
puts (_(" --add-email "
"read an e-mail message from stdin and\n"
* --add-email handling
*/
-static int add_email_count = 0;
+static int add_email_count = 0, add_email_found = 0;
static void
quit_add_email()
exit(EXIT_FAILURE);
}
printf(_("%d item(s) added to %s\n"), add_email_count, datafile);
- } else {
+ } else if (add_email_found == 0) {
puts(_("Valid sender address not found"));
}
do {
line = getaline(stdin);
if(line && !strncasecmp("From:", line, 5) ) {
+ add_email_found++;
getname(line, &name, &email);
add_email_count += add_email_add_item(quiet,
name, email);