Sanitize "Subject:" and "Author:" fields to not contain control characters in notmuch...

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 8b901210ddaab31a4cacd4c4f1a883b80ecb4c8a..530cecc343b9f928517176a830d1662874609574 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -48,6 +48,7 @@ typedef struct search_format {
     const char *item_sep;
     const char *item_end;
     const char *results_end;
+    const char *results_null;
 } search_format_t;
 
 static void
@@ -72,6 +73,7 @@ static const search_format_t format_text = {
                "%s", " ",
            ")", "\n",
        "",
+    "\n",
     "",
 };
 
@@ -98,6 +100,7 @@ static const search_format_t format_json = {
            "]", ",\n",
        "}",
     "]\n",
+    "]\n",
 };
 
 static void
@@ -108,6 +111,20 @@ 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;
+
+    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,
@@ -117,13 +134,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
@@ -236,7 +257,10 @@ do_search_threads (const search_format_t *format,
        notmuch_thread_destroy (thread);
     }
 
-    fputs (format->results_end, stdout);
+    if (first_thread)
+       fputs (format->results_null, stdout);
+    else
+       fputs (format->results_end, stdout);
 
     return 0;
 }
@@ -280,7 +304,10 @@ do_search_messages (const search_format_t *format,
 
     notmuch_messages_destroy (messages);
 
-    fputs (format->results_end, stdout);
+    if (first_message)
+       fputs (format->results_null, stdout);
+    else
+       fputs (format->results_end, stdout);
 
     return 0;
 }
@@ -329,7 +356,10 @@ do_search_tags (notmuch_database_t *notmuch,
     if (messages)
        notmuch_messages_destroy (messages);
 
-    fputs (format->results_end, stdout);
+    if (first_tag)
+       fputs (format->results_null, stdout);
+    else
+       fputs (format->results_end, stdout);
 
     return 0;
 }