X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=faccaf7deec10961f5f2c2c7bdc5fa9bef4521f7;hp=a91b23110d240b755064bec12f0b2d28cd8affe0;hb=d752509abfd7697d2f8a1c5be6f96f0df4f0299d;hpb=b64afb1ab9924749cd6d3fbfa02e5e42bb0d728b

diff --git a/notmuch-search.c b/notmuch-search.c
index a91b2311..faccaf7d 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -48,6 +48,7 @@ typedef struct search_format {
     const char *item_sep;
     const char *item_end;
     const char *results_end;
+    const char *results_null;
 } search_format_t;
 
 static void
@@ -73,6 +74,7 @@ static const search_format_t format_text = {
 	    ")", "\n",
 	"",
     "\n",
+    "",
 };
 
 static void
@@ -98,6 +100,7 @@ static const search_format_t format_json = {
 	    "]", ",\n",
 	"}",
     "]\n",
+    "]\n",
 };
 
 static void
@@ -108,6 +111,23 @@ format_item_id_text (unused (const void *ctx),
     printf ("%s%s", item_type, item_id);
 }
 
+static char *
+sanitize_string (const void *ctx, const char *str)
+{
+    char *out, *loop;
+
+    if (NULL == str)
+	return NULL;
+
+    loop = out = talloc_strdup (ctx, str);
+
+    for (; *loop; loop++) {
+	if ((unsigned char)(*loop) < 32)
+	    *loop = '?';
+    }
+    return out;
+}
+
 static void
 format_thread_text (const void *ctx,
 		    const char *thread_id,
@@ -117,13 +137,17 @@ format_thread_text (const void *ctx,
 		    const char *authors,
 		    const char *subject)
 {
+    void *ctx_quote = talloc_new (ctx);
+
     printf ("thread:%s %12s [%d/%d] %s; %s",
 	    thread_id,
 	    notmuch_time_relative_date (ctx, date),
 	    matched,
 	    total,
-	    authors,
-	    subject);
+	    sanitize_string (ctx_quote, authors),
+	    sanitize_string (ctx_quote, subject));
+
+    talloc_free (ctx_quote);
 }
 
 static void
@@ -182,15 +206,15 @@ do_search_threads (const search_format_t *format,
     if (threads == NULL)
 	return 1;
 
+    fputs (format->results_start, stdout);
+
     for (;
 	 notmuch_threads_valid (threads);
 	 notmuch_threads_move_to_next (threads))
     {
 	int first_tag = 1;
 
-	if (first_thread)
-	    fputs (format->results_start, stdout);
-	else
+	if (! first_thread)
 	    fputs (format->item_sep, stdout);
 
 	thread = notmuch_threads_get (threads);
@@ -236,7 +260,9 @@ do_search_threads (const search_format_t *format,
 	notmuch_thread_destroy (thread);
     }
 
-    if (! first_thread)
+    if (first_thread)
+	fputs (format->results_null, stdout);
+    else
 	fputs (format->results_end, stdout);
 
     return 0;
@@ -249,39 +275,56 @@ do_search_messages (const search_format_t *format,
 {
     notmuch_message_t *message;
     notmuch_messages_t *messages;
+    notmuch_filenames_t *filenames;
     int first_message = 1;
 
     messages = notmuch_query_search_messages (query);
     if (messages == NULL)
 	return 1;
 
+    fputs (format->results_start, stdout);
+
     for (;
 	 notmuch_messages_valid (messages);
 	 notmuch_messages_move_to_next (messages))
     {
 	message = notmuch_messages_get (messages);
 
-	if (first_message)
-	    fputs (format->results_start, stdout);
-	else
-	    fputs (format->item_sep, stdout);
-
 	if (output == OUTPUT_FILES) {
-	    format->item_id (message, "",
-			     notmuch_message_get_filename (message));
+	    filenames = notmuch_message_get_filenames (message);
+
+	    for (;
+		 notmuch_filenames_valid (filenames);
+		 notmuch_filenames_move_to_next (filenames))
+	    {
+		if (! first_message)
+		    fputs (format->item_sep, stdout);
+
+		format->item_id (message, "",
+				 notmuch_filenames_get (filenames));
+
+		first_message = 0;
+	    }
+	    
+	    notmuch_filenames_destroy( filenames );
+
 	} else { /* output == OUTPUT_MESSAGES */
+	    if (! first_message)
+		fputs (format->item_sep, stdout);
+
 	    format->item_id (message, "id:",
 			     notmuch_message_get_message_id (message));
+	    first_message = 0;
 	}
 
-	first_message = 0;
-
 	notmuch_message_destroy (message);
     }
 
     notmuch_messages_destroy (messages);
 
-    if (! first_message)
+    if (first_message)
+	fputs (format->results_null, stdout);
+    else
 	fputs (format->results_end, stdout);
 
     return 0;
@@ -310,15 +353,15 @@ do_search_tags (notmuch_database_t *notmuch,
     if (tags == NULL)
 	return 1;
 
+    fputs (format->results_start, stdout);
+
     for (;
 	 notmuch_tags_valid (tags);
 	 notmuch_tags_move_to_next (tags))
     {
 	tag = notmuch_tags_get (tags);
 
-	if (first_tag)
-	    fputs (format->results_start, stdout);
-	else
+	if (! first_tag)
 	    fputs (format->item_sep, stdout);
 
 	format->item_id (tags, "", tag);
@@ -331,7 +374,9 @@ do_search_tags (notmuch_database_t *notmuch,
     if (messages)
 	notmuch_messages_destroy (messages);
 
-    if (! first_tag)
+    if (first_tag)
+	fputs (format->results_null, stdout);
+    else
 	fputs (format->results_end, stdout);
 
     return 0;