From 13d60b9468e53128fcb293b60e1cef6166155904 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 3 Jun 2012 12:46:07 +0100 Subject: [PATCH] [Patch v7 1/6] cli: command line parsing: allow default for keyword options --- 41/aad0ddc7fe984d91a453740f5ae44a31248c58 | 126 ++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 41/aad0ddc7fe984d91a453740f5ae44a31248c58 diff --git a/41/aad0ddc7fe984d91a453740f5ae44a31248c58 b/41/aad0ddc7fe984d91a453740f5ae44a31248c58 new file mode 100644 index 000000000..eedd179c3 --- /dev/null +++ b/41/aad0ddc7fe984d91a453740f5ae44a31248c58 @@ -0,0 +1,126 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3BCC7431FC2 + for ; Sun, 3 Jun 2012 04:46:22 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] 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 0QpAaHp01uCh for ; + Sun, 3 Jun 2012 04:46:20 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E6539431FAF + for ; Sun, 3 Jun 2012 04:46:19 -0700 (PDT) +Received: by werj55 with SMTP id j55so2729830wer.26 + for ; Sun, 03 Jun 2012 04:46:18 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=ba2TXiOJxZGeViEVJJ/ucZP1tFS2i3Nle6Yh8ac+HJk=; + b=DbckokSxpdZEQmw8JppNFslhMWhMNUWhlR+i0DOFwL3TIQc7UJ/M8XzdH7XQ6V9srY + NiA/FSnvM74RKuO3EgXX5ogTVlpAmg7Epk+07G9YBsVPLr+9Bv9rnVDhK762qrJQ+LBA + P198BVpABprTEE7hKfNxkvl/pAejO4DgdnmAAcAfRy3VYStRymgkP2k9Tt/rbx2GpwC2 + hyuzEOkAljs0y7o1SJ6/BERgNE1cb8vUNnphAFgAablh2LDJG+eQ+LKYaryO/fyBQdxq + tTod0k1PJrqfmjbexePh+WEWHWH79i+BEUKKdnnD693roF6jYREHYOq5CBlOl/lx25Gm + 2nXg== +Received: by 10.216.202.160 with SMTP id d32mr4892028weo.147.1338723978561; + Sun, 03 Jun 2012 04:46:18 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + ei4sm19462981wid.5.2012.06.03.04.46.17 (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 03 Jun 2012 04:46:17 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch v7 1/6] cli: command line parsing: allow default for keyword + options +Date: Sun, 3 Jun 2012 12:46:07 +0100 +Message-Id: <1338723972-13063-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com> +References: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com> +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: Sun, 03 Jun 2012 11:46:22 -0000 + +This changes the parsing for "keyword" options so that if the option +is specified with no argument the argument is parsed as if it were +passed an empty string. This make it easier to add options to existing +boolean arguments (the existing --option can default to TRUE). +--- + command-line-arguments.c | 17 +++++++++++++---- + 1 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/command-line-arguments.c b/command-line-arguments.c +index 76b185f..b0a0dab 100644 +--- a/command-line-arguments.c ++++ b/command-line-arguments.c +@@ -11,10 +11,15 @@ + */ + + static notmuch_bool_t +-_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) { ++_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) { + + const notmuch_keyword_t *keywords = arg_desc->keywords; + ++ if (next == 0) { ++ /* No keyword given */ ++ arg_str = ""; ++ } ++ + while (keywords->name) { + if (strcmp (arg_str, keywords->name) == 0) { + if (arg_desc->output_var) { +@@ -24,7 +29,10 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) { + } + keywords++; + } +- fprintf (stderr, "unknown keyword: %s\n", arg_str); ++ if (next != 0) ++ fprintf (stderr, "unknown keyword: %s\n", arg_str); ++ else ++ fprintf (stderr, "option %s needs a keyword\n", arg_desc->name); + return FALSE; + } + +@@ -99,7 +107,8 @@ parse_option (const char *arg, + */ + if (next != '=' && next != ':' && next != 0) return FALSE; + if (next == 0) { +- if (try->opt_type != NOTMUCH_OPT_BOOLEAN) ++ if (try->opt_type != NOTMUCH_OPT_BOOLEAN && ++ try->opt_type != NOTMUCH_OPT_KEYWORD) + return FALSE; + } else { + if (value[0] == 0) return FALSE; +@@ -110,7 +119,7 @@ parse_option (const char *arg, + + switch (try->opt_type) { + case NOTMUCH_OPT_KEYWORD: +- return _process_keyword_arg (try, value); ++ return _process_keyword_arg (try, next, value); + break; + case NOTMUCH_OPT_BOOLEAN: + return _process_boolean_arg (try, next, value); +-- +1.7.9.1 + -- 2.26.2