From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 25EE1429E41 for ; Wed, 7 Dec 2011 11:26:54 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tIX7NnNKh+Gk for ; Wed, 7 Dec 2011 11:26:53 -0800 (PST) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id AC5FF429E32 for ; Wed, 7 Dec 2011 11:26:49 -0800 (PST) Received: from convex-new.cs.unb.ca ([131.202.13.154]) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id pB7JQhpx021340; Wed, 7 Dec 2011 15:26:46 -0400 Received: from bremner by convex-new.cs.unb.ca with local (Exim 4.72) (envelope-from ) id 1RYN8d-0004Pm-Tj; Wed, 07 Dec 2011 15:26:43 -0400 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v4 3/5] notmuch-dump: convert to command-line-arguments Date: Wed, 7 Dec 2011 15:26:37 -0400 Message-Id: <1323285999-16870-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1323285999-16870-1-git-send-email-david@tethera.net> References: <87iplso9c9.fsf@zancas.localnet> <1323285999-16870-1-git-send-email-david@tethera.net> Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2011 19:26:54 -0000 From: David Bremner The output file is handled via positional arguments. There are currently no "normal" options. --- notmuch-dump.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index a490917..a735875 100644 --- 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; -- 1.7.5.4