[RFC Patch v2 2/3] notmuch-dump: convert to notmuch-opts argument handling.

[David Bremner]

From: David Bremner 

The output file is handled via positional arguments. There are
currently no "normal" options.
---
 notmuch-dump.c |   27 +++
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 0475eb9..9e0c91d 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,29 @@ 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[] = {
+   { "out-file", 'o', NOTMUCH_OPT_POSITION, 0, _file_name },
+   { 0, 0, 0, 0, 0 }
+};
+
+opt_index = notmuch_parse_args (argc, argv, options, 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;
-- 
1.7.5.4

[RFC Patch v2 2/3] notmuch-dump: convert to notmuch-opts argument handling.

[David Bremner]

From: David Bremner brem...@debian.org

The output file is handled via positional arguments. There are
currently no normal options.
---
 notmuch-dump.c |   27 +++
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 0475eb9..9e0c91d 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,29 @@ 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[] = {
+   { out-file, 'o', NOTMUCH_OPT_POSITION, 0, output_file_name },
+   { 0, 0, 0, 0, 0 }
+};
+
+opt_index = notmuch_parse_args (argc, argv, options, 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;
-- 
1.7.5.4

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch