From fa0c0d0e668961aa9dce884ee7b325095b44ca47 Mon Sep 17 00:00:00 2001
From: Mark Anderson <ma.skies@gmail.com>
Date: Fri, 24 Jun 2011 17:26:55 -0600
Subject: [PATCH] search --output=files: Output all filenames for each matching
message
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>
(cherry picked from commit d752509abfd7697d2f8a1c5be6f96f0df4f0299d)
---
notmuch-search.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/notmuch-search.c b/notmuch-search.c
index 616fe68a..faccaf7d 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);
}
--
2.45.2