From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message Date: Sat, 26 Jul 2008 19:01:16 +0200 (CEST) Message-ID: References: <1217073292-27945-1-git-send-email-vmiklos@frugalware.org> <4f2b03391e3f85cf2224f97a2a7765d08707bd73.1217037178.git.vmiklos@frugalware.org> <68749731fe8de8b2a9ffc53963291aeab9256b82.1217037178.git.vmiklos@frugalware.org> <99c90877657be0ed439a9918f500d6ad132550a2.1217037178.git.vmiklos@frugalware.org> <13f39dd6752a34beeb6ecccb51dbc7546ef87182.1217037178.git.vmiklos@frugalware.org> <65a569c389352c5d0500b8c44c28e5572352e6ba.1217037178.git.vmiklos@frugalware.org> <20080726152502.GL32057@genesis.frugalware.org> <20080726160022.GM32057@genesis.frugalware.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org To: Miklos Vajna X-From: git-owner@vger.kernel.org Sat Jul 26 19:01:20 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KMn8v-0004oX-JE for gcvg-git-2@gmane.org; Sat, 26 Jul 2008 19:01:18 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753517AbYGZRAP (ORCPT ); Sat, 26 Jul 2008 13:00:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753099AbYGZRAP (ORCPT ); Sat, 26 Jul 2008 13:00:15 -0400 Received: from mail.gmx.net ([213.165.64.20]:47687 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753161AbYGZRAN (ORCPT ); Sat, 26 Jul 2008 13:00:13 -0400 Received: (qmail invoked by alias); 26 Jul 2008 17:00:11 -0000 Received: from 88-107-142-10.dynamic.dsl.as9105.com (EHLO eeepc-johanness.st-andrews.ac.uk) [88.107.142.10] by mail.gmx.net (mp036) with SMTP; 26 Jul 2008 19:00:11 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX19sZ+wA9kZsy8gMEMTvhvLg9BFsNmjkHG8ZRYW3BS Isx2pbqc1u+Tsq X-X-Sender: user@eeepc-johanness In-Reply-To: <20080726160022.GM32057@genesis.frugalware.org> User-Agent: Alpine 1.00 (DEB 882 2007-12-20) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.62 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Sat, 26 Jul 2008, Miklos Vajna wrote: > On Sat, Jul 26, 2008 at 05:38:55PM +0200, Johannes Schindelin 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