DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:subject:user-agent:date:message-id:mime-version
	:content-type;
	b=mEfxWfYfGKvn6oeD5thspH+aySLoOQWVbvzzMKwFjZWdXb6oZ7dTfzOwL5s3EWZJJ4
	Ku0RdEMOGz/XjGh/5qhWoVzs4ShEjyf9ayJQvXfHWUxpqaCTWpwDvprhQSRTpk7eJ6aC
	kgcJ3w0ZbMBBReryLriKN4pcyIJmj2icNBgKk=
From: Mark Anderson <ma.skies@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/2] search --output=files: Output all filenames for each
	matching message
User-Agent: Notmuch/0.5-283-gb744eac (http://notmuchmail.org) Emacs/23.2.1
	(i686-pc-linux-gnu)
Date: Fri, 24 Jun 2011 17:26:55 -0600
Message-ID: <878vsqdd4w.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Precedence: list


Messages in the database can have multiple files associated with a
single message-id, but until now only one filename for each message
has been reported by "notmuch search --output=files"

Signed-off-by: Mark Anderson <ma.skies@gmail.com>
---

Perhaps someone can offer a little help making the "separator" code
tighter, but this works.

 notmuch-search.c |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/notmuch-search.c b/notmuch-search.c
index 616fe68..faccaf7 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -275,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);
@@ -289,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);
     }
 
-- 
1.7.4.1