notmuch-dump: convert to command-line-arguments

The output file is handled via positional arguments. There are
currently no "normal" options.

diff --git a/notmuch-dump.c b/notmuch-dump.c
index a490917f9fa59d5a9a042d0c85030bc7aad42c8e..a73587562fb9ce929e78807ec46fc8a97e5df087 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -41,27 +41,34 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     if (notmuch == NULL)
        return 1;
 
-    argc--; argv++; /* skip subcommand argument */
+    char *output_file_name = NULL;
+    int opt_index;
 
-    if (argc && strcmp (argv[0], "--") != 0) {
+    notmuch_opt_desc_t options[] = {
+       { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0  },
+       { 0, 0, 0, 0, 0 }
+    };
+
+    opt_index = parse_arguments (argc, argv, options, 1);
+
+    if (opt_index < 0) {
+       /* diagnostics already printed */
+       return 1;
+    }
+
+    if (output_file_name) {
        fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n");
-       output = fopen (argv[0], "w");
+       output = fopen (output_file_name, "w");
        if (output == NULL) {
            fprintf (stderr, "Error opening %s for writing: %s\n",
-                    argv[0], strerror (errno));
+                    output_file_name, strerror (errno));
            return 1;
        }
-       argc--;
-       argv++;
     }
 
-    if (argc && strcmp (argv[0], "--") == 0){
-       argc--;
-       argv++;
-    }
 
-    if (argc) {
-       query_str = query_string_from_args (notmuch, argc, argv);
+    if (opt_index < argc) {
+       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;