Re: [PATCH 1/2] cli: fix notmuch top level argument parsing

diff --git a/92/78a485dd73192dda1fff2214f9c68e5357ab61 b/92/78a485dd73192dda1fff2214f9c68e5357ab61
new file mode 100644 (file)
index 0000000..a36c304
--- /dev/null
+++ b/92/78a485dd73192dda1fff2214f9c68e5357ab61
@@ -0,0 +1,120 @@
+Return-Path: <jani@nikula.org>\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 3D696431FBC\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 14:17:48 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 qozMOGvR7KWc for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Dec 2012 14:17:47 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7350E431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 14:17:47 -0800 (PST)\r
+Received: by mail-lb0-f181.google.com with SMTP id ge1so2944415lbb.26\r
+       for <notmuch@notmuchmail.org>; Mon, 03 Dec 2012 14:17:46 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type:content-transfer-encoding\r
+       :x-gm-message-state;\r
+       bh=fe6/V+O1xM5x0osdonjsmHPGRXlAfhSPexCFsIkSN8E=;\r
+       b=Bdhhyprf7xzv+PUffXtdB7JEektJBA2/ZBXhy44CqTJDMTHdhNOoK4lU88+XzTUyVo\r
+       gUWvPVr7pDLtNnAVoRgRX9RAQFHxqdQ5qtOz9aSsp/vbqAztUOvet6p55BGcFjTTWFBe\r
+       bm2dgXBhXNTPpeZNcfW8kd5lgnSjeN9yhAcWEz4Jfyz1bAbVhEUgQul2fWksKj8ZwO1E\r
+       AHFKA/AaLlyc/hOQZJ0UdUi2jVOvur5hfhIRI57qXOi1E5zIbIH/s1KGaAxEnTkQZT46\r
+       Kpd6ruNTWkErzINCmhJmivYLpO3nCrrNFvAIc1nx5CmiUY2breIxksTgVEMVWC+hmE9C\r
+       XpSw==\r
+Received: by 10.152.104.50 with SMTP id gb18mr11202974lab.9.1354573064706;\r
+       Mon, 03 Dec 2012 14:17:44 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id v6sm5984291lbf.11.2012.12.03.14.17.42\r
+       (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:17:43 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Michal Nazarewicz <mina86@mina86.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] cli: fix notmuch top level argument parsing\r
+In-Reply-To: <xa1tpq2qstx7.fsf@mina86.com>\r
+References:\r
+ <c4f2a1048763950dd14e13c99a4e7eb333be8c9d.1354568072.git.jani@nikula.org>\r
+       <xa1tpq2qstx7.fsf@mina86.com>\r
+User-Agent: Notmuch/0.14+137~g9203c35 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i686-pc-linux-gnu)\r
+Date: Tue, 04 Dec 2012 00:17:41 +0200\r
+Message-ID: <874nk2aigq.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+X-Gm-Message-State:\r
+ ALoCoQkfpAZHwJZ5OzviS3ukM32OujtUNQJmeFMsJI/zUT4Fd9iaWo52lSbEMQFdbCOB2dt4hbSQ\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: Mon, 03 Dec 2012 22:17:48 -0000\r
+\r
+On Mon, 03 Dec 2012, Michal Nazarewicz <mina86@mina86.com> wrote:\r
+> On Mon, Dec 03 2012, Jani Nikula wrote:\r
+>> Use strcmp instead of STRNCMP_LITERAL, which matches the prefix\r
+>> instead of the whole argument.\r
+>\r
+> Perhaps add and use this instead:\r
+>\r
+> #define STRCMP_LITERAL(var, literal) \\r
+>     strncmp ((var), (literal), sizeof (literal))\r
+\r
+That's broken the same way STRNCMP_LITERAL is broken in this use case:\r
+it matches if literal is a prefix of var.\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+>\r
+> Than again, it's argument parsing so hardly a performance critical path,\r
+> so maybe readability is more important.\r
+>\r
+>> ---\r
+>>  notmuch.c |    4 ++--\r
+>>  1 file changed, 2 insertions(+), 2 deletions(-)\r
+>>\r
+>> diff --git a/notmuch.c b/notmuch.c\r
+>> index 477a09c..4ff66e3 100644\r
+>> --- a/notmuch.c\r
+>> +++ b/notmuch.c\r
+>> @@ -245,10 +245,10 @@ main (int argc, char *argv[])\r
+>>      if (argc =3D=3D 1)\r
+>>     return notmuch (local);\r
+>>=20=20\r
+>> -    if (STRNCMP_LITERAL (argv[1], "--help") =3D=3D 0)\r
+>> +    if (strcmp (argv[1], "--help") =3D=3D 0)\r
+>>     return notmuch_help_command (NULL, argc - 1, &argv[1]);\r
+>>=20=20\r
+>> -    if (STRNCMP_LITERAL (argv[1], "--version") =3D=3D 0) {\r
+>> +    if (strcmp (argv[1], "--version") =3D=3D 0) {\r
+>>     printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");\r
+>>     return 0;\r
+>>      }\r
+>\r
+> --=20\r
+> Best regards,                                         _     _\r
+> .o. | Liege of Serenely Enlightened Majesty of      o' \,=3D./ `o\r
+> ..o | Computer Science,  Micha=C5=82 =E2=80=9Cmina86=E2=80=9D Nazarewicz =\r
+   (o o)\r
+> ooo +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--\r