Re: [PATCH v2 01/20] tag: factor out tag operation parsing

diff --git a/34/dc75ab90defb700e78ee34c9ea4e340a08e891 b/34/dc75ab90defb700e78ee34c9ea4e340a08e891
new file mode 100644 (file)
index 0000000..80fb503
--- /dev/null
+++ b/34/dc75ab90defb700e78ee34c9ea4e340a08e891
@@ -0,0 +1,180 @@
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E6708431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 25 Nov 2012 08:13:13 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id TN9ObLkNZQy9 for <notmuch@notmuchmail.org>;\r
+       Sun, 25 Nov 2012 08:13:13 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4021E431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 25 Nov 2012 08:13:13 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TcepT-00051s-RF; Sun, 25 Nov 2012 16:13:12 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1TcepT-0001Tm-G2; Sun, 25 Nov 2012 16:13:11 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 01/20] tag: factor out tag operation parsing\r
+In-Reply-To: <1353806206-29133-2-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+       <1353806206-29133-2-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 25 Nov 2012 16:13:14 +0000\r
+Message-ID: <878v9pk6ed.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 3fe47295da988fc873e6072d710fbab1 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 25 Nov 2012 16:13:14 -0000\r
+\r
+\r
+On Sun, 25 Nov 2012, Peter Wang <novalazy@gmail.com> wrote:\r
+> Factor out parsing of +tag, -tag operations from argv\r
+> into a separate function.\r
+> ---\r
+>  notmuch-tag.c | 66 +++++++++++++++++++++++++++++++++++++----------------------\r
+>  1 file changed, 41 insertions(+), 25 deletions(-)\r
+>\r
+> diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+> index 88d559b..35a76db 100644\r
+> --- a/notmuch-tag.c\r
+> +++ b/notmuch-tag.c\r
+> @@ -167,11 +167,48 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,\r
+>      return interrupted;\r
+>  }\r
+>  \r
+> +/* Parse +tag and -tag operations between argv[i] and argv[argc-1].\r
+> + * The array tag_ops must be at least argc - i elements long.\r
+> + * Returns the index into argv where parsing stopped, or -1 on error. */\r
+\r
+Perhaps mention tag_ops_count (as the number of tags parsed or\r
+something)?\r
+\r
+> +static int\r
+> +parse_tag_operations (int i, int argc, char *argv[],\r
+> +                  tag_operation_t *tag_ops, int *tag_ops_count)\r
+> +{\r
+> +    *tag_ops_count = 0;\r
+> +\r
+> +    for (; i < argc; i++) {\r
+> +    if (strcmp (argv[i], "--") == 0) {\r
+> +        i++;\r
+> +        break;\r
+> +    }\r
+> +    if (argv[i][0] == '+' || argv[i][0] == '-') {\r
+> +        if (argv[i][0] == '+' && argv[i][1] == '\0') {\r
+> +            fprintf (stderr, "Error: tag names cannot be empty.\n");\r
+> +            return -1;\r
+> +        }\r
+> +        if (argv[i][0] == '+' && argv[i][1] == '-') {\r
+> +            /* This disallows adding the non-removable tag "-" and\r
+> +             * enables notmuch tag to take long options in the\r
+> +             * future. */\r
+> +            fprintf (stderr, "Error: tag names must not start with '-'.\n");\r
+> +            return -1;\r
+> +        }\r
+> +        tag_ops[*tag_ops_count].tag = argv[i] + 1;\r
+> +        tag_ops[*tag_ops_count].remove = (argv[i][0] == '-');\r
+> +        (*tag_ops_count)++;\r
+> +    } else {\r
+> +        break;\r
+> +    }\r
+> +    }\r
+> +\r
+> +    return i;\r
+> +}\r
+> +\r
+>  int\r
+>  notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+>  {\r
+>      tag_operation_t *tag_ops;\r
+> -    int tag_ops_count = 0;\r
+> +    int tag_ops_count;\r
+>      char *query_string;\r
+>      notmuch_config_t *config;\r
+>      notmuch_database_t *notmuch;\r
+> @@ -197,30 +234,9 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+>      return 1;\r
+>      }\r
+>  \r
+> -    for (i = 0; i < argc; i++) {\r
+> -    if (strcmp (argv[i], "--") == 0) {\r
+> -        i++;\r
+> -        break;\r
+> -    }\r
+> -    if (argv[i][0] == '+' || argv[i][0] == '-') {\r
+> -        if (argv[i][0] == '+' && argv[i][1] == '\0') {\r
+> -            fprintf (stderr, "Error: tag names cannot be empty.\n");\r
+> -            return 1;\r
+> -        }\r
+> -        if (argv[i][0] == '+' && argv[i][1] == '-') {\r
+> -            /* This disallows adding the non-removable tag "-" and\r
+> -             * enables notmuch tag to take long options in the\r
+> -             * future. */\r
+> -            fprintf (stderr, "Error: tag names must not start with '-'.\n");\r
+> -            return 1;\r
+> -        }\r
+> -        tag_ops[tag_ops_count].tag = argv[i] + 1;\r
+> -        tag_ops[tag_ops_count].remove = (argv[i][0] == '-');\r
+> -        tag_ops_count++;\r
+> -    } else {\r
+> -        break;\r
+> -    }\r
+> -    }\r
+> +    i = parse_tag_operations (0, argc, argv, tag_ops, &tag_ops_count);\r
+> +    if (i < 0)\r
+> +    return 1;\r
+>  \r
+>      tag_ops[tag_ops_count].tag = NULL;\r
+>  \r
+> -- \r
+> 1.7.12.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r