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 4E104431FB6 for ; Mon, 3 Dec 2012 12:56:21 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[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 OCb8haBKSgoX for ; Mon, 3 Dec 2012 12:56:20 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 90B1B431FAE for ; Mon, 3 Dec 2012 12:56:20 -0800 (PST) Received: by mail-la0-f53.google.com with SMTP id w12so2748670lag.26 for ; Mon, 03 Dec 2012 12:56:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=AUVNq3LQXxCZtRRiYVvJmqpuaEbMUi4ekIb/3MZc9wQ=; b=QZVPXrB7owufqbJlf+TzBJJYmj13tFfPNPfxsK2QhIgyIhbDs7iqPWF+RlPktHOZhH v3UE0l5j/4NXuiuGvF68Qu8l9GM4dk1PW7sH0UFXw4cqL1dmK1XgJvBvcicvKKBtA9/F pVJ8CCvrHWIPsq3ZbSE8sSVZxUuIOVLUunTZdoZfnVmVeFT/EAO0iqt74/VlDKjj1NSE XDQWp+Z0OiUt2RfriEUvRh8jvnz7W8SlKtpdhH2TsFiRqNDDIsaw8++45CXDTLHhrv/E EjbBjksvcUuxzWN43iGbrJN+XkGxoUh2f75jfaYSopwzDWyTWSNuzR8yrAWRvR12G4x2 6/bg== Received: by 10.112.26.41 with SMTP id i9mr4851464lbg.77.1354568177631; Mon, 03 Dec 2012 12:56:17 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id so7sm5830067lab.0.2012.12.03.12.56.15 (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 12:56:16 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 1/2] cli: fix notmuch top level argument parsing Date: Mon, 3 Dec 2012 22:56:12 +0200 Message-Id: X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlfsS2BXKNUtlbAwKxHf5pklKelPCn3csemU0fJbTMe4jcFrzdPw6bja30aE9IebWUUw1m6 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: Mon, 03 Dec 2012 20:56:21 -0000 Use strcmp instead of STRNCMP_LITERAL, which matches the prefix instead of the whole argument. --- notmuch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notmuch.c b/notmuch.c index 477a09c..4ff66e3 100644 --- a/notmuch.c +++ b/notmuch.c @@ -245,10 +245,10 @@ main (int argc, char *argv[]) if (argc == 1) return notmuch (local); - if (STRNCMP_LITERAL (argv[1], "--help") == 0) + if (strcmp (argv[1], "--help") == 0) return notmuch_help_command (NULL, argc - 1, &argv[1]); - if (STRNCMP_LITERAL (argv[1], "--version") == 0) { + if (strcmp (argv[1], "--version") == 0) { printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); return 0; } -- 1.7.10.4