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

diff --git a/notmuch-search.c b/notmuch-search.c
index 530cecc3..faccaf7d 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -116,6 +116,9 @@ 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++) {
@@ -272,6 +275,7 @@ 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);
@@ -286,19 +290,33 @@ do_search_messages (const search_format_t *format,
     {
 	message = notmuch_messages_get (messages);
 
-	if (! first_message)
-	    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);
     }