From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH 3/4] notmuch-restore: convert to notmuch-opts argument handling.
Date: Sun, 4 Dec 2011 11:47:54 -0400 [thread overview]
Message-ID: <1323013675-6929-4-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1323013675-6929-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
The new argument handling is a bit more concise, and bit more
flexible. It allows the input file name to go before the --accumulate
option.
---
notmuch-restore.c | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/notmuch-restore.c b/notmuch-restore.c
index 13b4325..d0aa7a8 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -18,9 +18,8 @@
* Author: Carl Worth <cworth@cworth.org>
*/
-#include <getopt.h>
-
#include "notmuch-client.h"
+#include "notmuch-opts.h"
int
notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
@@ -29,12 +28,14 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
notmuch_database_t *notmuch;
notmuch_bool_t synchronize_flags;
notmuch_bool_t accumulate = FALSE;
+ char *input_file_name = NULL;
FILE *input = stdin;
char *line = NULL;
size_t line_size;
ssize_t line_len;
regex_t regex;
int rerr;
+ int opt_index;
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
@@ -47,37 +48,30 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
- struct option options[] = {
- { "accumulate", no_argument, 0, 'a' },
- { 0, 0, 0, 0}
+ notmuch_opt_desc_t options[] = {
+ { "in-file", 'i', NOTMUCH_OPT_POSITION, 0, &input_file_name },
+ { "accumulate", 'a', NOTMUCH_OPT_BOOLEAN, 0, &accumulate },
+ { 0, 0, 0, 0, 0 }
};
- int opt;
- do {
- opt = getopt_long (argc, argv, "", options, NULL);
+ opt_index = notmuch_parse_args (argc, argv, options, 1);
- switch (opt) {
- case 'a':
- accumulate = 1;
- break;
- case '?':
- return 1;
- break;
- }
-
- } while (opt != -1);
+ if (opt_index < 0) {
+ /* diagnostics already printed */
+ exit(1);
+ }
- if (optind < argc) {
- input = fopen (argv[optind], "r");
+ if (input_file_name) {
+ input = fopen (input_file_name, "r");
if (input == NULL) {
fprintf (stderr, "Error opening %s for reading: %s\n",
- argv[optind], strerror (errno));
+ input_file_name, strerror (errno));
return 1;
}
optind++;
}
- if (optind < argc) {
+ if (opt_index < argc) {
fprintf (stderr,
"Cannot read dump from more than one file: %s\n",
argv[optind]);
--
1.7.7.3
next prev parent reply other threads:[~2011-12-04 15:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-04 15:47 David Bremner
2011-12-04 15:47 ` [PATCH 1/4] notmuch-opts.[ch]: new argument parsing framework for notmuch David Bremner
2011-12-06 20:41 ` Jani Nikula
2011-12-07 12:27 ` David Bremner
2011-12-07 12:34 ` [PATCH 1/4] command-line-arguments.[ch]: " David Bremner
2011-12-07 12:34 ` [PATCH 2/4] notmuch-dump: convert to command-line-arguments David Bremner
2011-12-07 12:34 ` [PATCH 3/4] notmuch-restore: " David Bremner
2011-12-07 12:34 ` [PATCH 4/4] notmuch-search: " David Bremner
2011-12-07 19:26 ` David Bremner
2011-12-07 19:26 ` [PATCH v4 1/5] command-line-arguments.[ch]: new argument parsing framework for notmuch David Bremner
2011-12-09 1:40 ` David Bremner
2011-12-07 19:26 ` [PATCH v4 2/5] test: tests for command-line-arguments.c David Bremner
2011-12-07 19:26 ` [PATCH v4 3/5] notmuch-dump: convert to command-line-arguments David Bremner
2011-12-07 19:26 ` [PATCH v4 4/5] notmuch-restore: " David Bremner
2011-12-07 19:26 ` [PATCH v4 5/5] notmuch-search: " David Bremner
2011-12-06 20:55 ` [PATCH 1/4] notmuch-opts.[ch]: new argument parsing framework for notmuch Jani Nikula
2011-12-04 15:47 ` [PATCH 2/4] notmuch-dump: convert to notmuch-opts argument handling David Bremner
2011-12-06 20:43 ` Jani Nikula
2011-12-04 15:47 ` David Bremner [this message]
2011-12-06 20:48 ` [PATCH 3/4] notmuch-restore: " Jani Nikula
2011-12-04 15:47 ` [PATCH 4/4] notmuch-search: convert to notmuch-opts argument parsing David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323013675-6929-4-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).