From 8fe381d54ae4896dac1439d4a4c45f0deb530d57 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Mon, 3 Dec 2012 22:32:52 +0100 Subject: [PATCH] Re: [PATCH 1/2] cli: fix notmuch top level argument parsing --- e0/d00594fca4278a5a0688ea553f8f34f8471d5a | 160 ++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 e0/d00594fca4278a5a0688ea553f8f34f8471d5a diff --git a/e0/d00594fca4278a5a0688ea553f8f34f8471d5a b/e0/d00594fca4278a5a0688ea553f8f34f8471d5a new file mode 100644 index 000000000..428ccddce --- /dev/null +++ b/e0/d00594fca4278a5a0688ea553f8f34f8471d5a @@ -0,0 +1,160 @@ +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 E15F3431FBC + for ; Mon, 3 Dec 2012 13:33:04 -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=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, 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 VIIEj45VByO4 for ; + Mon, 3 Dec 2012 13:33:04 -0800 (PST) +Received: from mail-ea0-f181.google.com (mail-ea0-f181.google.com + [209.85.215.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D95BB431FAE + for ; Mon, 3 Dec 2012 13:33:03 -0800 (PST) +Received: by mail-ea0-f181.google.com with SMTP id k14so1656425eaa.26 + for ; Mon, 03 Dec 2012 13:33:02 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; + s=20120113; h=sender:from:to:subject:in-reply-to:organization:references + :user-agent:x-face:face:x-pgp:x-pgp-fp:date:message-id:mime-version + :content-type; bh=E/m+L38yt+5ZWOw83mJIApGRiZlIU1XA+cMYD1LSXZ0=; + b=ckFLOCYEvYRo3cXcKfkfR+z225HI7b2O9iFe/XXp1Gnhxm53V4jkiY4mBA7Q2ZfcKz + /vUuURmsBXSELW2E6YoPLDPffXKPkZMH78rVR7A1Q8oLKgnVl+xmp6j2hTMS8i1lg65/ + pxYeMISFkQgBXFd+nUtHHtdfxr+z4JXYfWDJgMqUIjFu/Dx+YbkcsaVtjKp/a0G85pL3 + 4RKp/P6oZ+8e0gIFZwoSt0rL+DHSYvPQ02J2p3TAcF1DCaz8LUHDf7T0Yf8LKoJTkVWC + GiQUo/tpDv1WhjdCPZCoeV7oh5OgEmNTLcA/4dcl8Ou4gq1PJbJd+wSDRd86AxZu3TSF U43w== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=sender:from:to:subject:in-reply-to:organization:references + :user-agent:x-face:face:x-pgp:x-pgp-fp:date:message-id:mime-version + :content-type:x-gm-message-state; + bh=E/m+L38yt+5ZWOw83mJIApGRiZlIU1XA+cMYD1LSXZ0=; + b=gWNRj2i59F0Wug7YlfR43w+jT2GSX9vrV4apinfwDFDq76gHgbqk1cuehg4tS7ml78 + s4WqSmJwiKWTwM9X+K5cwClyVZ7txDl5u6/6Wo7M7TEHtNPgi45YtMBi/MhvwdL9Jx+v + JMr6C4sDi+3KsD1/NL7Z6P1sJw2XJdomxxc7mtyGSnJo1Sm92PMyTlNnILK8IZvVcb8S + JYrZzwI1We8dUcRw5ev9B1TYA/M/DfTqUUP8ahjy14A9TY+hsifmXsKP9H/GrFlp9Q47 + Z2IeKHnW9ZR5aIDZLVxaORmG02bqqyFO4JePffUfyp2tGJP4fhO1MUDZTzRSrs0EXp4t + DEjA== +Received: by 10.14.213.134 with SMTP id a6mr40544758eep.45.1354570382594; + Mon, 03 Dec 2012 13:33:02 -0800 (PST) +Received: from mpn-glaptop ([2620:0:105f:5:e550:22e2:cbaa:1724]) + by mx.google.com with ESMTPS id d3sm7692246eeo.13.2012.12.03.13.33.00 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 03 Dec 2012 13:33:01 -0800 (PST) +Sender: Michal Nazarewicz +From: Michal Nazarewicz +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/2] cli: fix notmuch top level argument parsing +In-Reply-To: + +Organization: http://mina86.com/ +References: + +User-Agent: Notmuch/ (http://notmuchmail.org) Emacs/24.2.50.1 + (x86_64-unknown-linux-gnu) +X-Face: PbkBB1w#)bOqd`iCe"Ds{e+!C7`pkC9a|f)Qo^BMQvy\q5x3?vDQJeN(DS?|-^$uMti[3D*#^_Ts"pU$jBQLq~Ud6iNwAw_r_o_4]|JO?]}P_}Nc&"p#D(ZgUb4uCNPe7~a[DbPG0T~!&c.y$Ur,=N4RT>]dNpd; KFrfMCylc}gc??'U2j,!8%xdD +Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACQElEQVQ4jW3TMWvbQBQHcBk1xE6WyALX1069oZBMlq+ouUwpEQQ6uRjttkWP4CmBgGM0BQLBdPFZYPsyFUo6uEtKDQ7oy/U96XR2Ux8ehH/89Z6enqxBcS7Lg81jmSuujrfCZcLI/TYYvbGj+jbgFpHJ/bqQAUISj8iLyu4LuFHJTosxsucO4jSDNE0Hq3hwK/ceQ5sx97b8LcUDsILfk+ovHkOIsMbBfg43VuQ5Ln9YAGCkUdKJoXR9EclFBhixy3EGVz1K6eEkhxCAkeMMnqoAhAKwhoUJkDrCqvbecaYINlFKSRS1i12VKH1XpUd4qxL876EkMcDvHj3s5RBajHHMlA5iK32e0C7VgG0RlzFPvoYHZLRmAC0BmNcBruhkE0KsMsbEc62ZwUJDxWUdMsMhVqovoT96i/DnX/ASvz/6hbCabELLk/6FF/8PNpPCGqcZTGFcBhhAaZZDbQPaAB3+KrWWy2XgbYDNIinkdWAFcCpraDE/knwe5DBqGmgzESl1p2E4MWAz0VUPgYYzmfWb9yS4vCvgsxJriNTHoIBz5YteBvg+VGISQWUqhMiByPIPpygeDBE6elD973xWwKkEiHZAHKjhuPsFnBuArrzxtakRcISv+XMIPl4aGBUJm8Emk7qBYU8IlgNEIpiJhk/No24jHwkKTFHDWfPniR4iw5vJaw2nzSjfq2zffcE/GDjRC2dn0J0XwPAbDL84TvaFCJEU4Oml9pRyEUhR3Cl2t01AoEjRbs0sYugp14/4X5n4pU4EHHnMAAAAAElFTkSuQmCC +X-PGP: 50751FF4 +X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4 +Date: Mon, 03 Dec 2012 22:32:52 +0100 +Message-ID: +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" +X-Gm-Message-State: ALoCoQkbqW6r2Sexhrt8hTeKwoUEwuvNs9HKcbQ1HZXOBUqV6whehrSaeEm07UsX1l7/14PX6mp6cHSeNo/Xzci8fj3G9YMFXSJKhmQndDgcbKc93J9Ohxf3bjcyfWn+QuAw0Ui+4UVrX3y5jQ+QX5I7sNJCmXCfL2P55aCvvIgha19NOVzGrrVvBcEyu4TUESUUfseQRT6NqiaMzzfXADSnRCK8hOfV5A== +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 21:33:05 -0000 + +--=-=-= +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + +On Mon, Dec 03 2012, Jani Nikula wrote: +> Use strcmp instead of STRNCMP_LITERAL, which matches the prefix +> instead of the whole argument. + +Perhaps add and use this instead: + +#define STRCMP_LITERAL(var, literal) \ + strncmp ((var), (literal), sizeof (literal)) + +Than again, it's argument parsing so hardly a performance critical path, +so maybe readability is more important. + +> --- +> 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 =3D=3D 1) +> return notmuch (local); +>=20=20 +> - if (STRNCMP_LITERAL (argv[1], "--help") =3D=3D 0) +> + if (strcmp (argv[1], "--help") =3D=3D 0) +> return notmuch_help_command (NULL, argc - 1, &argv[1]); +>=20=20 +> - if (STRNCMP_LITERAL (argv[1], "--version") =3D=3D 0) { +> + if (strcmp (argv[1], "--version") =3D=3D 0) { +> printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); +> return 0; +> } + +--=20 +Best regards, _ _ +.o. | Liege of Serenely Enlightened Majesty of o' \,=3D./ `o +..o | Computer Science, Micha=C5=82 =E2=80=9Cmina86=E2=80=9D Nazarewicz = + (o o) +ooo +------------------ooO--(_)--Ooo-- +--=-=-= +Content-Type: multipart/signed; boundary="==-=-="; + micalg=pgp-sha1; protocol="application/pgp-signature" + +--==-=-= +Content-Type: text/plain + + +--==-=-= +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQIcBAEBAgAGBQJQvRqEAAoJECBgQBJQdR/06wUP/1DlPwlaQNU9tHKrHvv/+Z4S +4ctpMBI61COGRost+qf06Gm0PaFgbhIAaZVKschVE+IDESAROsakS1Ona3oNx1tZ +1MQ9H7l/JBAx8r+6rvKPNxU+h270k9kkt6qZ9VunAwPxAsvYOyFnI1uEZSKIk6io +fh5XLmUkfaTs5DplawYZoL2fczL1OVIaC4LclixKW4m4EYPbUduwewvPVR6OrOt+ +UWBgx+JGQozzEOE5tI6nNkz3stIp58pe1Wl+zKmuaUf4ZdqWbLym94K4VeLyA+cC +CuDB37D8zhSrYcvD/d3Yh4MgvDPqMCq323mFtdmO5kE+J9NX159IelyYk3qaVIJ3 +f4QlTkTQIogsQXI/iX3CcVhtyd9mOTOrinmHqdw1RwFQ98JXmB/JemjbdboacLr7 +JrO+rX/FuZQHPJRe921xLiZ3sEHzlxinAZeGu3gNfzmDxa1QCnRs+gVKReF00wcz +yZzIA9FZFCxR2p9hTfsHFPmoCyD3F61UsuLLK2RUBNbqwZGNBp5/qDpMCLs9NsgM +HQ1ObiPdrDdsP9ImBzohW1PUYGt5xOB4giXgRECJyU3PZyZzSAttEd56YxJ+35L1 +kRgu3F5JicFuuDDD762khRnKmAIytLyEKCGEERf/355WdSO2Y3qUaTH2eobrIAMC +AJOPXyUIKtk2BJyyEH7F +=9Hj4 +-----END PGP SIGNATURE----- +--==-=-=-- + +--=-=-=-- -- 2.26.2