cli: move config open/close to main() from subcommands

[notmuch] / notmuch-dump.c

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 5bbda3609d632938a33149ddd6ce5898f3f623cd..2024e30391d541921656285c5f2c1cd02965974c 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -20,11 +20,11 @@
 
 #include "notmuch-client.h"
 #include "dump-restore-private.h"
+#include "string-util.h"
 
 int
-notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
+notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])
 {
-    notmuch_config_t *config;
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
     FILE *output = stdout;
@@ -33,10 +33,6 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     notmuch_tags_t *tags;
     const char *query_str = "";
 
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
-       return 1;
-
     if (notmuch_database_open (notmuch_config_get_database_path (config),
                               NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
        return 1;
@@ -144,13 +140,13 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
        if (output_format == DUMP_FORMAT_SUP) {
            fputs (")\n", output);
        } else {
-           if (hex_encode (notmuch, message_id,
-                           &buffer, &buffer_size) != HEX_SUCCESS) {
-                   fprintf (stderr, "Error: failed to hex-encode msg-id %s\n",
-                            message_id);
+           if (make_boolean_term (notmuch, "id", message_id,
+                                  &buffer, &buffer_size)) {
+                   fprintf (stderr, "Error quoting message id %s: %s\n",
+                            message_id, strerror (errno));
                    return 1;
            }
-           fprintf (output, " -- id:%s\n", buffer);
+           fprintf (output, " -- %s\n", buffer);
        }
 
        notmuch_message_destroy (message);