OPT_CONVERT,
OPT_INFORMAT,
OPT_OUTFORMAT,
+ OPT_OUTFORMAT_STR,
OPT_INFILE,
OPT_OUTFILE,
OPT_FORMATS
{ "convert", 0, 0, OPT_CONVERT },
{ "informat", 1, 0, OPT_INFORMAT },
{ "outformat", 1, 0, OPT_OUTFORMAT },
+ { "outformatstr", 1, 0, OPT_OUTFORMAT_STR },
{ "infile", 1, 0, OPT_INFILE },
{ "outfile", 1, 0, OPT_OUTFILE },
{ "formats", 0, 0, OPT_FORMATS },
set_convert_var(informat);
break;
case OPT_OUTFORMAT:
+ if(mode != MODE_CONVERT && mode != MODE_QUERY) {
+ fprintf(stderr,
+ _("please use option --outformat after --convert or --mutt-query option\n"));
+ exit(EXIT_FAILURE);
+ }
+ // ascii-name is stored, it's used to traverse
+ // e_filters[] in MODE_CONVERT (see export_file())
outformat = optarg;
+ // but in case a query-compatible filter is requested
+ // try to guess right now which one it is, from u_filters[]
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;
+ break;
case OPT_INFILE:
set_convert_var(infile);
break;
}
}
+ // if the output format requested does not allow filtered querying
+ // (not in u_filter[]) and --convert has not been specified; bailout
+ if(! selected_item_filter.func && mode != MODE_CONVERT) {
+ printf("output format %s not supported or incompatible with --mutt-query\n", outformat);
+ exit(EXIT_FAILURE);
+ }
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 *));
+ parse_custom_format(custom_format, parsed_custom_format, custom_format_fields);
+ }
if(optind < argc) {
fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
argv[0]);