X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=1651267a541ef44bc5352786ca121777ce298fd3;hb=a2d4ea58437d93297c7f7e2e8efd4d48297ca46a;hp=b5a941e259b6467afa32897804dd9b38a3bf3297;hpb=fa167822d1f3426ce75bb36b4080e64537ae6362;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index b5a941e..1651267 100644
--- a/abook.c
+++ b/abook.c
@@ -377,12 +377,21 @@ 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:
-				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);
@@ -398,9 +407,19 @@ 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) {
+	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 * 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);
@@ -450,6 +469,8 @@ show_usage()
 	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"));
 }
 
@@ -481,7 +502,12 @@ mutt_query(char *str)
 			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);