This is actually a bit of a tricky case because of the treating of the first non-option as a filename. On the other hand, we don't do any "normal" argument parsing yet. --- notmuch-dump.c | 46 +++++++++++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index 0475eb9..8a8d6ec 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -19,6 +19,7 @@ */ #include "notmuch-client.h" +#include "notmuch-opts.h" int notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) @@ -41,27 +42,42 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) if (notmuch == NULL) return 1; - argc--; argv++; /* skip subcommand argument */ + notmuch_opt_desc_t options[] = { + { 0, 0, 0, 0 } + }; - if (argc && strcmp (argv[0], "--") != 0) { - fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); - output = fopen (argv[0], "w"); - if (output == NULL) { - fprintf (stderr, "Error opening %s for writing: %s\n", - argv[0], strerror (errno)); + notmuch_opt_t result; + int opt_index; + notmuch_bool_t more_args=TRUE; + + for (opt_index = 1; more_args && opt_index < argc; opt_index++) { + + more_args=parse_argument (argv[0], argv[opt_index], options, &result); + + switch (result.arg_id) { + case '?': return 1; + break; + case '*': + fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); + output = fopen (result.string, "w"); + if (output == NULL) { + fprintf (stderr, "Error opening %s for writing: %s\n", + result.string, strerror (errno)); + return 1; + } + case '-': + /* fall through */ + more_args=FALSE; + break; } - argc--; - argv++; } - if (argc && strcmp (argv[0], "--") == 0){ - argc--; - argv++; - } + if (opt_index < argc && strcmp(argv[opt_index],"--") == 0) + opt_index++; - 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; -- 1.7.5.4