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);
}
if(! selected_item_filter.func)
selected_item_filter = select_output_item_filter("muttq");
- else if (! strcmp(outformat, "custom") && *custom_format) {
- 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 *));
+ else if (! strcmp(outformat, "custom")) {
+ if(! *custom_format) {
+ fprintf(stderr, _("Invalid custom format string\n"));
+ exit(EXIT_FAILURE);
+ }
+ parsed_custom_format = (char *)malloc(FORMAT_STRING_LEN);
+ 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) {
puts (_(" (default: text)"));
puts (_(" --outfile <file> destination file"));
puts (_(" (default: stdout)"));
+ puts (_(" --outformatstr <str> format to use for \"custom\" --outformat"));
+ puts (_(" (default: \"{nick} ({name}): {mobile}\")"));
puts (_(" --formats list available formats"));
}
printf("Not found\n");
quit_mutt_query(EXIT_FAILURE);
}
- putchar('\n');
+ // mutt expects a leading line containing
+ // a message about the query.
+ // Others output filter supporting query (vcard, custom)
+ // don't needs this.
+ if(!strcmp(selected_item_filter.filtname, "muttq"))
+ putchar('\n');
while(i >= 0) {
e_write_item(stdout, i, selected_item_filter.func);
i = find_item(str, i + 1, search_fields);
* --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);