X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=dd05b5679bfa390675c6d5f48c95a46c07d3cea6;hb=7c88cafcd333277b6bfd55370a5ec1c5b76c2b0d;hp=b5a941e259b6467afa32897804dd9b38a3bf3297;hpb=fa167822d1f3426ce75bb36b4080e64537ae6362;p=pkg%2Fabook.git diff --git a/abook.c b/abook.c index b5a941e..dd05b56 100644 --- a/abook.c +++ b/abook.c @@ -377,7 +377,16 @@ parse_command_line(int argc, char **argv) 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: @@ -398,6 +407,12 @@ parse_command_line(int argc, char **argv) } } + // 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) {