Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 26, 2008, 17:01 UTC
Message-ID: <alpine.DEB.1.00.0807261900180.26810@eeepc-johanness>
In-Reply-To: <20080726160022.GM32057@genesis.frugalware.org>

Hi,

On Sat, 26 Jul 2008, Miklos Vajna wrote:

Show 11 quoted lines

> On Sat, Jul 26, 2008 at 05:38:55PM +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > -				if (!strcmp(main_cmds.names[i]->name, all_strategy[j].name))
> > > +				if (!strncmp(ent->name, all_strategy[j].name, ent->len))
> > 
> > Oops... that is not what I meant.  You'd have to check if 
> > !all_strategy[j].name[ent->len], too...
> 
> Hmm. So let's say ent->name is "ours.exe", ent->len is set to 4.
> 
> Then !strncmp(ent->name, all_strategy[j].name, ent->len) will be true,
> and the command will not be added to the exclude list.

What I meant is: if you change the strcmp to strncmp because one of the both strings is not supposed to be NUL terminated, you still want to make sure that one is not a strict prefix of the other.

Ciao, Dscho