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

diff --git a/abook.c b/abook.c
index b5a941e..502aae2 100644
--- a/abook.c
+++ b/abook.c
@@ -52,8 +52,6 @@ static char *rcfile = NULL;
 
 // 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;
@@ -342,7 +340,7 @@ parse_command_line(int argc, char **argv)
 			{ 0, 0, 0, 0 }
 		};
 
-		c = getopt_long(argc, argv, "hC:",
+		c = getopt_long(argc, argv, "hC:f:",
 				long_options, &option_index);
 
 		if(c == -1)
@@ -377,12 +375,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,12 +405,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) {
-		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);
+	else if (! strcmp(outformat, "custom")) {
+		if(! *custom_format) {
+			fprintf(stderr, _("Invalid custom format string\n"));
+			exit(EXIT_FAILURE);
+		}
 	}
 	if(optind < argc) {
 		fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
@@ -427,10 +441,10 @@ parse_command_line(int argc, char **argv)
 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"
@@ -450,6 +464,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 +497,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);
@@ -678,7 +699,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
  * --add-email handling
  */
 
-static int add_email_count = 0;
+static int add_email_count = 0, add_email_found = 0;
 
 static void
 quit_add_email()
@@ -689,7 +710,7 @@ 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"));
 	}
 
@@ -788,6 +809,7 @@ add_email(int quiet)
 	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);