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

diff --git a/07/7cc159f4519cb7b374a57109bb4e7a23ce9005 b/07/7cc159f4519cb7b374a57109bb4e7a23ce9005
new file mode 100644 (file)
index 0000000..746cfe6
--- /dev/null
+++ b/07/7cc159f4519cb7b374a57109bb4e7a23ce9005
@@ -0,0 +1,88 @@
+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 4E104431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 12:56:21 -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 OCb8haBKSgoX for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Dec 2012 12:56:20 -0800 (PST)\r
+Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
+       [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 90B1B431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 12:56:20 -0800 (PST)\r
+Received: by mail-la0-f53.google.com with SMTP id w12so2748670lag.26\r
+       for <notmuch@notmuchmail.org>; Mon, 03 Dec 2012 12:56:19 -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:cc:subject:date:message-id:x-mailer:x-gm-message-state;\r
+       bh=AUVNq3LQXxCZtRRiYVvJmqpuaEbMUi4ekIb/3MZc9wQ=;\r
+       b=QZVPXrB7owufqbJlf+TzBJJYmj13tFfPNPfxsK2QhIgyIhbDs7iqPWF+RlPktHOZhH\r
+       v3UE0l5j/4NXuiuGvF68Qu8l9GM4dk1PW7sH0UFXw4cqL1dmK1XgJvBvcicvKKBtA9/F\r
+       pVJ8CCvrHWIPsq3ZbSE8sSVZxUuIOVLUunTZdoZfnVmVeFT/EAO0iqt74/VlDKjj1NSE\r
+       XDQWp+Z0OiUt2RfriEUvRh8jvnz7W8SlKtpdhH2TsFiRqNDDIsaw8++45CXDTLHhrv/E\r
+       EjbBjksvcUuxzWN43iGbrJN+XkGxoUh2f75jfaYSopwzDWyTWSNuzR8yrAWRvR12G4x2\r
+       6/bg==\r
+Received: by 10.112.26.41 with SMTP id i9mr4851464lbg.77.1354568177631;\r
+       Mon, 03 Dec 2012 12:56:17 -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 so7sm5830067lab.0.2012.12.03.12.56.15\r
+       (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 12:56:16 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] cli: fix notmuch top level argument parsing\r
+Date: Mon,  3 Dec 2012 22:56:12 +0200\r
+Message-Id:\r
+ <c4f2a1048763950dd14e13c99a4e7eb333be8c9d.1354568072.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Gm-Message-State:\r
+ ALoCoQlfsS2BXKNUtlbAwKxHf5pklKelPCn3csemU0fJbTMe4jcFrzdPw6bja30aE9IebWUUw1m6\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 20:56:21 -0000\r
+\r
+Use strcmp instead of STRNCMP_LITERAL, which matches the prefix\r
+instead of the whole argument.\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 == 1)\r
+       return notmuch (local);\r
+ \r
+-    if (STRNCMP_LITERAL (argv[1], "--help") == 0)\r
++    if (strcmp (argv[1], "--help") == 0)\r
+       return notmuch_help_command (NULL, argc - 1, &argv[1]);\r
+ \r
+-    if (STRNCMP_LITERAL (argv[1], "--version") == 0) {\r
++    if (strcmp (argv[1], "--version") == 0) {\r
+       printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");\r
+       return 0;\r
+     }\r
+-- \r
+1.7.10.4\r
+\r