cvs commit: apachen/src/main fnmatch.c

[dgaudet]

dgaudet     97/11/06 14:03:40

  Modified:    src      CHANGES
               src/main fnmatch.c
  Log:
  Inherit a bugfix to fnmatch.c from FreeBSD sources.
  
  PR:             1311
  Obtained from:        FreeBSD-current
  Submitted by:   "[KOI8-R] Андрей Чернов" <[EMAIL PROTECTED]>
  Reviewed by:    Dean Gaudet, Jim Jagielski, Martin Kraemer
  
  Revision  Changes    Path
  1.491     +3 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.490
  retrieving revision 1.491
  diff -u -r1.490 -r1.491
  --- CHANGES   1997/11/06 22:00:35     1.490
  +++ CHANGES   1997/11/06 22:03:38     1.491
  @@ -1,4 +1,7 @@
   Changes with Apache 1.3b3
  +  
  +  *) Inherit a bugfix to fnmatch.c from FreeBSD sources.
  +     ["[KOI8-R] Андрей Чернов" <[EMAIL PROTECTED]>] PR#1311
   
     *) When a configuration parse complained about a bad directive,
        the logger would use whatever (unrelated) value was in errno.
  
  
  
  1.5       +4 -0      apachen/src/main/fnmatch.c
  
  Index: fnmatch.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/fnmatch.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fnmatch.c 1997/09/16 00:35:40     1.4
  +++ fnmatch.c 1997/11/06 22:03:40     1.5
  @@ -110,6 +110,10 @@
                return (FNM_NOMATCH);
            if (*string == '/' && flags & FNM_PATHNAME)
                return (FNM_NOMATCH);
  +         if (*string == '.' && (flags & FNM_PERIOD) &&
  +             (string == stringstart ||
  +             ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
  +                 return (FNM_NOMATCH);
            if ((pattern =
                 rangematch(pattern, *string, flags)) == NULL)
                return (FNM_NOMATCH);