[PATCH 2/2] search --output=files: Output all filenames for each matching message
Mark Anderson
ma.skies at gmail.com
Fri Jun 24 16:26:55 PDT 2011
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 at 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
More information about the notmuch
mailing list