cli: modify mime_node_open to take new crypto struct as argument

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 7af8e64e49e83ca3d7002db83812fd0f77f7f0d7..fb5e9b6057912b615eb9ffeff245086edf0cd642 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -26,10 +26,7 @@ format_part_text (const void *ctx, mime_node_t *node,
                  int indent, const notmuch_show_params_t *params);
 
 static const notmuch_show_format_t format_text = {
-    .message_set_start = "",
     .part = format_part_text,
-    .message_set_sep = "",
-    .message_set_end = ""
 };
 
 static notmuch_status_t
@@ -48,10 +45,7 @@ format_part_mbox (const void *ctx, mime_node_t *node,
                  int indent, const notmuch_show_params_t *params);
 
 static const notmuch_show_format_t format_mbox = {
-    .message_set_start = "",
     .part = format_part_mbox,
-    .message_set_sep = "",
-    .message_set_end = ""
 };
 
 static notmuch_status_t
@@ -60,10 +54,7 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,
                 unused (const notmuch_show_params_t *params));
 
 static const notmuch_show_format_t format_raw = {
-    .message_set_start = "",
     .part = format_part_raw,
-    .message_set_sep = "",
-    .message_set_end = ""
 };
 
 static const char *
@@ -815,46 +806,19 @@ show_message (void *ctx,
              int indent,
              notmuch_show_params_t *params)
 {
-    if (format->part) {
-       void *local = talloc_new (ctx);
-       mime_node_t *root, *part;
-       notmuch_status_t status;
-
-       status = mime_node_open (local, message, params->cryptoctx,
-                                params->decrypt, &root);
-       if (status)
-           goto DONE;
-       part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
-       if (part)
-           status = format->part (local, part, indent, params);
-      DONE:
-       talloc_free (local);
-       return status;
-    }
-
-    if (params->part <= 0) {
-       fputs (format->message_start, stdout);
-       if (format->message)
-           format->message(ctx, message, indent);
-
-       fputs (format->header_start, stdout);
-       if (format->header)
-           format->header(ctx, message);
-       fputs (format->header_end, stdout);
-
-       fputs (format->body_start, stdout);
-    }
-
-    if (format->part_content)
-       show_message_body (message, format, params);
-
-    if (params->part <= 0) {
-       fputs (format->body_end, stdout);
-
-       fputs (format->message_end, stdout);
-    }
+    void *local = talloc_new (ctx);
+    mime_node_t *root, *part;
+    notmuch_status_t status;
 
-    return NOTMUCH_STATUS_SUCCESS;
+    status = mime_node_open (local, message, &(params->crypto), &root);
+    if (status)
+       goto DONE;
+    part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
+    if (part)
+       status = format->part (local, part, indent, params);
+  DONE:
+    talloc_free (local);
+    return status;
 }
 
 static notmuch_status_t
@@ -871,17 +835,19 @@ show_messages (void *ctx,
     int next_indent;
     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
 
-    fputs (format->message_set_start, stdout);
+    if (format->message_set_start)
+       fputs (format->message_set_start, stdout);
 
     for (;
         notmuch_messages_valid (messages);
         notmuch_messages_move_to_next (messages))
     {
-       if (!first_set)
+       if (!first_set && format->message_set_sep)
            fputs (format->message_set_sep, stdout);
        first_set = 0;
 
-       fputs (format->message_set_start, stdout);
+       if (format->message_set_start)
+           fputs (format->message_set_start, stdout);
 
        message = notmuch_messages_get (messages);
 
@@ -896,7 +862,7 @@ show_messages (void *ctx,
                res = status;
            next_indent = indent + 1;
 
-           if (!status)
+           if (!status && format->message_set_sep)
                fputs (format->message_set_sep, stdout);
        }
 
@@ -910,10 +876,12 @@ show_messages (void *ctx,
 
        notmuch_message_destroy (message);
 
-       fputs (format->message_set_end, stdout);
+       if (format->message_set_end)
+           fputs (format->message_set_end, stdout);
     }
 
-    fputs (format->message_set_end, stdout);
+    if (format->message_set_end)
+       fputs (format->message_set_end, stdout);
 
     return res;
 }
@@ -959,7 +927,8 @@ do_show (void *ctx,
     int first_toplevel = 1;
     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;
 
-    fputs (format->message_set_start, stdout);
+    if (format->message_set_start)
+       fputs (format->message_set_start, stdout);
 
     for (threads = notmuch_query_search_threads (query);
         notmuch_threads_valid (threads);
@@ -973,7 +942,7 @@ do_show (void *ctx,
            INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
                            notmuch_thread_get_thread_id (thread));
 
-       if (!first_toplevel)
+       if (!first_toplevel && format->message_set_sep)
            fputs (format->message_set_sep, stdout);
        first_toplevel = 0;
 
@@ -985,7 +954,8 @@ do_show (void *ctx,
 
     }
 
-    fputs (format->message_set_end, stdout);
+    if (format->message_set_end)
+       fputs (format->message_set_end, stdout);
 
     return res != NOTMUCH_STATUS_SUCCESS;
 }
@@ -1013,7 +983,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     char *query_string;
     int opt_index, ret;
     const notmuch_show_format_t *format = &format_text;
-    notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };
+    notmuch_show_params_t params = {
+       .part = -1,
+       .omit_excluded = TRUE,
+       .crypto = {
+           .decrypt = FALSE
+       }
+    };
     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
     notmuch_bool_t verify = FALSE;
     int exclude = EXCLUDE_TRUE;
@@ -1031,7 +1007,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
                                   { 0, 0 } } },
        { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },
        { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },
-       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },
+       { NOTMUCH_OPT_BOOLEAN, &params.crypto.decrypt, "decrypt", 'd', 0 },
        { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },
        { 0, 0, 0, 0, 0 }
     };
@@ -1076,18 +1052,18 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
        break;
     }
 
-    if (params.decrypt || verify) {
+    if (params.crypto.decrypt || verify) {
 #ifdef GMIME_ATLEAST_26
        /* TODO: GMimePasswordRequestFunc */
-       params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg");
+       params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg");
 #else
        GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
-       params.cryptoctx = g_mime_gpg_context_new (session, "gpg");
+       params.crypto.gpgctx = g_mime_gpg_context_new (session, "gpg");
 #endif
-       if (params.cryptoctx) {
-           g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE);
+       if (params.crypto.gpgctx) {
+           g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE);
        } else {
-           params.decrypt = FALSE;
+           params.crypto.decrypt = FALSE;
            fprintf (stderr, "Failed to construct gpg context.\n");
        }
 #ifndef GMIME_ATLEAST_26
@@ -1110,9 +1086,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
        return 1;
     }
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
-                                    NOTMUCH_DATABASE_MODE_READ_ONLY);
-    if (notmuch == NULL)
+    if (notmuch_database_open (notmuch_config_get_database_path (config),
+                              NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
        return 1;
 
     query = notmuch_query_create (notmuch, query_string);
@@ -1145,11 +1120,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
        ret = do_show (ctx, query, format, &params);
     }
 
+    notmuch_crypto_cleanup (&params.crypto);
     notmuch_query_destroy (query);
-    notmuch_database_close (notmuch);
-
-    if (params.cryptoctx)
-       g_object_unref(params.cryptoctx);
+    notmuch_database_destroy (notmuch);
 
     return ret;
 }