patch for cvs modules parsing bug

patch for cvs modules parsing bug

[Brendan Conoboy]

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

Hi there.  Attached is a patch to fix inadvertent substring matches in 
excluded module directories.  The problem manifests itself when a short 
directory name, say "f" is excluded.  If there are other directories 
which start with "f" they also are excluded.  This happens in the gcc 
sources with "fixinc".  The below patch fixes the problem:

ChangeLog:

Tue Oct  7 00:22:31 UTC 2003  Brendan Conoboy

         * ignore.c (ignore_directory): Disallow substring directory 
matches.


[-- Attachment #2: cvs-substringnomatch.patch --]
[-- Type: text/plain, Size: 691 bytes --]

Index: ignore.c
===================================================================
RCS file: /cvs/cvsfiles/coolo-cvs/src/ignore.c,v
retrieving revision 1.1.1.6
diff -c -r1.1.1.6 ignore.c
*** ignore.c	1 Apr 2002 09:18:34 -0000	1.1.1.6
--- ignore.c	7 Oct 2003 00:19:45 -0000
***************
*** 351,357 ****
      i = dir_ign_current;
      while (i--)
      {
! 	if (strncmp (name, dir_ign_list[i], strlen (dir_ign_list[i])) == 0)
  	    return 1;
      }
  
--- 351,358 ----
      i = dir_ign_current;
      while (i--)
      {
! 	if ((strlen (dir_ign_list[i]) == strlen (name) ) &&
!            (strncmp (name, dir_ign_list[i], strlen (dir_ign_list[i])) == 0))
  	    return 1;
      }
  

Re: patch for cvs modules parsing bug

[Christopher Faylor]

On Mon, Oct 06, 2003 at 07:20:07PM -0600, Brendan Conoboy wrote:
>Hi there.  Attached is a patch to fix inadvertent substring matches in 
>excluded module directories.  The problem manifests itself when a short 
>directory name, say "f" is excluded.  If there are other directories 
>which start with "f" they also are excluded.  This happens in the gcc 
>sources with "fixinc".  The below patch fixes the problem:
>
>ChangeLog:
>
>Tue Oct  7 00:22:31 UTC 2003  Brendan Conoboy
>
>        * ignore.c (ignore_directory): Disallow substring directory 
>matches.

Out of curiousity, is this fixed in later versions of cvs, Brendan?

cgf

Re: patch for cvs modules parsing bug

[Brendan Conoboy]

Christopher Faylor wrote:
>>Tue Oct  7 00:22:31 UTC 2003  Brendan Conoboy
>>
>>       * ignore.c (ignore_directory): Disallow substring directory 
>>matches.
> 
> Out of curiousity, is this fixed in later versions of cvs, Brendan?

The sources at cvshome.org also have the problem.  I've submitted the 
same patch there.

-Brendan (blc@redhat.com)