util: Fix two corner-cases in boolean term quoting function

[notmuch] / notmuch-dump.c

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 37432142761216e4a87494c3ac57bf79ad207c99..158142f55b4992c53de1396e7e557536b9074ec8 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -19,94 +19,132 @@
  */
 
 #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;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
-    const char* query_str = "";
-
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
-       return 1;
+    const char *query_str = "";
 
     if (notmuch_database_open (notmuch_config_get_database_path (config),
                               NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
-       return 1;
+       return EXIT_FAILURE;
 
     char *output_file_name = NULL;
     int opt_index;
 
+    int output_format = DUMP_FORMAT_BATCH_TAG;
+
     notmuch_opt_desc_t options[] = {
-       { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0  },
+       { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f',
+         (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP },
+                                 { "batch-tag", DUMP_FORMAT_BATCH_TAG },
+                                 { 0, 0 } } },
+       { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0  },
        { 0, 0, 0, 0, 0 }
     };
 
     opt_index = parse_arguments (argc, argv, options, 1);
-
-    if (opt_index < 0) {
-       /* diagnostics already printed */
-       return 1;
-    }
+    if (opt_index < 0)
+       return EXIT_FAILURE;
 
     if (output_file_name) {
-       fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n");
        output = fopen (output_file_name, "w");
        if (output == NULL) {
            fprintf (stderr, "Error opening %s for writing: %s\n",
                     output_file_name, strerror (errno));
-           return 1;
+           return EXIT_FAILURE;
        }
     }
 
 
     if (opt_index < argc) {
-       query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index);
+       query_str = query_string_from_args (notmuch, argc - opt_index, argv + opt_index);
        if (query_str == NULL) {
            fprintf (stderr, "Out of memory.\n");
-           return 1;
+           return EXIT_FAILURE;
        }
     }
 
     query = notmuch_query_create (notmuch, query_str);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
-       return 1;
+       return EXIT_FAILURE;
     }
     /* Don't ask xapian to sort by Message-ID. Xapian optimizes returning the
      * first results quickly at the expense of total time.
      */
     notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
 
+    char *buffer = NULL;
+    size_t buffer_size = 0;
+
     for (messages = notmuch_query_search_messages (query);
         notmuch_messages_valid (messages);
-        notmuch_messages_move_to_next (messages))
-    {
+        notmuch_messages_move_to_next (messages)) {
        int first = 1;
+       const char *message_id;
+
        message = notmuch_messages_get (messages);
+       message_id = notmuch_message_get_message_id (message);
+
+       if (output_format == DUMP_FORMAT_BATCH_TAG &&
+           strchr (message_id, '\n')) {
+           /* This will produce a line break in the output, which
+            * would be difficult to handle in tools.  However, it's
+            * also impossible to produce an email containing a line
+            * break in a message ID because of unfolding, so we can
+            * safely disallow it. */
+           fprintf (stderr, "Warning: skipping message id containing line break: \"%s\"\n", message_id);
+           notmuch_message_destroy (message);
+           continue;
+       }
 
-       fprintf (output,
-                "%s (", notmuch_message_get_message_id (message));
+       if (output_format == DUMP_FORMAT_SUP) {
+           fprintf (output, "%s (", message_id);
+       }
 
        for (tags = notmuch_message_get_tags (message);
             notmuch_tags_valid (tags);
-            notmuch_tags_move_to_next (tags))
-       {
-           if (! first)
-               fprintf (output, " ");
+            notmuch_tags_move_to_next (tags)) {
+           const char *tag_str = notmuch_tags_get (tags);
 
-           fprintf (output, "%s", notmuch_tags_get (tags));
+           if (! first)
+               fputs (" ", output);
 
            first = 0;
+
+           if (output_format == DUMP_FORMAT_SUP) {
+               fputs (tag_str, output);
+           } else {
+               if (hex_encode (notmuch, tag_str,
+                               &buffer, &buffer_size) != HEX_SUCCESS) {
+                   fprintf (stderr, "Error: failed to hex-encode tag %s\n",
+                            tag_str);
+                   return EXIT_FAILURE;
+               }
+               fprintf (output, "+%s", buffer);
+           }
        }
 
-       fprintf (output, ")\n");
+       if (output_format == DUMP_FORMAT_SUP) {
+           fputs (")\n", output);
+       } else {
+           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 EXIT_FAILURE;
+           }
+           fprintf (output, " -- %s\n", buffer);
+       }
 
        notmuch_message_destroy (message);
     }
@@ -117,5 +155,5 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     notmuch_query_destroy (query);
     notmuch_database_destroy (notmuch);
 
-    return 0;
+    return EXIT_SUCCESS;
 }