From: Jani Nikula <jani@nikula.org>
To: Michal Nazarewicz <mina86@mina86.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH 1/2] cli: fix notmuch top level argument parsing
In-Reply-To: <xa1tpq2qstx7.fsf@mina86.com>
References:
 <c4f2a1048763950dd14e13c99a4e7eb333be8c9d.1354568072.git.jani@nikula.org>
	<xa1tpq2qstx7.fsf@mina86.com>
User-Agent: Notmuch/0.14+137~g9203c35 (http://notmuchmail.org) Emacs/23.4.1
	(i686-pc-linux-gnu)
Date: Tue, 04 Dec 2012 00:17:41 +0200
Message-ID: <874nk2aigq.fsf@nikula.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list

On Mon, 03 Dec 2012, Michal Nazarewicz <mina86@mina86.com> wrote:
> 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))

That's broken the same way STRNCMP_LITERAL is broken in this use case:
it matches if literal is a prefix of var.

BR,
Jani.


>
> 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 +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--