Merge tag 0.28.4

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 2ea658d325d624c4e944cf7f7882a06fe14a6814..e2dee4181b7400907723177e1cba687c8a9f21de 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -34,6 +34,7 @@ typedef enum {
     OUTPUT_SENDER      = 1 << 5,
     OUTPUT_RECIPIENTS  = 1 << 6,
     OUTPUT_COUNT       = 1 << 7,
+    OUTPUT_ADDRESS     = 1 << 8,
 } output_t;
 
 typedef enum {
@@ -163,7 +164,7 @@ do_search_threads (search_context_t *ctx)
            int files = notmuch_thread_get_total_files (thread);
            int total = notmuch_thread_get_total_messages (thread);
            const char *relative_date = NULL;
-           notmuch_bool_t first_tag = TRUE;
+           bool first_tag = true;
 
            format->begin_map (format);
 
@@ -243,7 +244,7 @@ do_search_threads (search_context_t *ctx)
                if (format->is_text_printer) {
                   /* Special case for the text formatter */
                    if (first_tag)
-                       first_tag = FALSE;
+                       first_tag = false;
                    else
                        fputc (' ', stdout);
                    fputs (tag, stdout);
@@ -295,9 +296,9 @@ static int mailbox_compare (const void *v1, const void *v2)
     return ret;
 }
 
-/* Returns TRUE iff name and addr is duplicate. If not, stores the
+/* Returns true iff name and addr is duplicate. If not, stores the
  * name/addr pair in order to detect subsequent duplicates. */
-static notmuch_bool_t
+static bool
 is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
 {
     char *key;
@@ -315,12 +316,12 @@ is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
        if (l) {
            mailbox = l->data;
            mailbox->count++;
-           return TRUE;
+           return true;
        }
 
        mailbox = new_mailbox (ctx->format, name, addr);
        if (! mailbox)
-           return FALSE;
+           return false;
 
        /*
         * XXX: It would be more efficient to prepend to the list, but
@@ -331,24 +332,24 @@ is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
        if (list != g_list_append (list, mailbox))
            INTERNAL_ERROR ("appending to list changed list head\n");
 
-       return FALSE;
+       return false;
     }
 
     key = talloc_strdup (ctx->format, addr);
     if (! key)
-       return FALSE;
+       return false;
 
     mailbox = new_mailbox (ctx->format, name, addr);
     if (! mailbox)
-       return FALSE;
+       return false;
 
     list = g_list_append (NULL, mailbox);
     if (! list)
-       return FALSE;
+       return false;
 
     g_hash_table_insert (ctx->addresses, key, list);
 
-    return FALSE;
+    return false;
 }
 
 static void
@@ -363,14 +364,17 @@ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox)
 
     /* name_addr has the name part quoted if necessary. Compare
      * 'John Doe <john@doe.com>' vs. '"Doe, John" <john@doe.com>' */
-    name_addr = internet_address_to_string (ia, FALSE);
+    name_addr = internet_address_to_string (ia, NULL, false);
 
     if (format->is_text_printer) {
        if (ctx->output & OUTPUT_COUNT) {
            format->integer (format, count);
            format->string (format, "\t");
        }
-       format->string (format, name_addr);
+       if (ctx->output & OUTPUT_ADDRESS)
+           format->string (format, addr);
+       else
+           format->string (format, name_addr);
        format->separator (format);
     } else {
        format->begin_map (format);
@@ -442,7 +446,7 @@ process_address_header (const search_context_t *ctx, const char *value)
     if (value == NULL)
        return;
 
-    list = internet_address_list_parse_string (value);
+    list = internet_address_list_parse (NULL, value);
     if (list == NULL)
        return;
 
@@ -877,6 +881,7 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[])
          (notmuch_keyword_t []){ { "sender", OUTPUT_SENDER },
                                  { "recipients", OUTPUT_RECIPIENTS },
                                  { "count", OUTPUT_COUNT },
+                                 { "address", OUTPUT_ADDRESS },
                                  { 0, 0 } } },
        { .opt_keyword = &ctx->exclude, .name = "exclude", .keywords =
          (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },