re-enable notmuch.sym generation using POSIX sed

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 69af6171b3461f9528460676c308749dad0e1ca3..faccaf7deec10961f5f2c2c7bdc5fa9bef4521f7 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -111,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,
@@ -120,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
@@ -254,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);
@@ -268,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);
     }