Date: 30 Jun 1998 02:11:36 -0000
Message-ID: <19980630021136.6588.qmail@hyperreal.org>
From: coar@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src/main fnmatch.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

coar        98/06/29 19:11:36

  Modified:    src/main fnmatch.c
  Log:
  	Logic error.. resulted in case-blind byte-for-byte matches
  	not.
  
  Revision  Changes    Path
  1.12      +7 -4      apache-1.3/src/main/fnmatch.c
  
  Index: fnmatch.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/fnmatch.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- fnmatch.c	1998/06/28 14:43:19	1.11
  +++ fnmatch.c	1998/06/30 02:11:34	1.12
  @@ -140,10 +140,13 @@
   	    }
   	    /* FALLTHROUGH */
   	default:
  -	    if ((c != *string)
  -		|| ((flags & FNM_CASE_BLIND)
  -		    && (toupper(c) != toupper(*string)))) {
  -		return (FNM_NOMATCH);
  +	    if (flags & FNM_CASE_BLIND) {
  +	        if (toupper(c) != toupper(*string)) {
  +		    return (FNM_NOMATCH);
  +		}
  +	    }
  +	    else if (c != *string) {
  +	        return (FNM_NOMATCH);
   	    }
   	    string++;
   	    break;