httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/strings apr_fnmatch.c Makefile.in
Date Fri, 21 Jul 2000 20:06:00 GMT
rbb         00/07/21 13:05:59

  Modified:    src/lib/apr/lib Makefile.in
               src/lib/apr/strings Makefile.in
  Added:       src/lib/apr/strings apr_fnmatch.c
  Removed:     src/lib/apr/lib apr_fnmatch.c
  Log:
  Move apr_fnmatch.c from lib/apr/lib to lib/apr/strings.  Just the next move
  to clean out the lib/apr/lib directory.
  
  Revision  Changes    Path
  1.24      +1 -2      apache-2.0/src/lib/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.in	2000/07/21 19:50:41	1.23
  +++ Makefile.in	2000/07/21 20:05:55	1.24
  @@ -16,8 +16,7 @@
   
   #LIB=@LIBPREFIX@apr.a
   
  -OBJS=apr_fnmatch.o \
  -	apr_execve.o \
  +OBJS=apr_execve.o \
   	apr_md5.o \
   	apr_pools.o \
   	apr_signal.o \
  
  
  
  1.2       +2 -1      apache-2.0/src/lib/apr/strings/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/07/21 19:50:45	1.1
  +++ Makefile.in	2000/07/21 20:05:57	1.2
  @@ -19,7 +19,8 @@
   OBJS=apr_cpystrn.o \
   	apr_snprintf.o \
   	apr_strnatcmp.o \
  -	apr_strings.o
  +	apr_strings.o \
  +	apr_fnmatch.o
   
   .c.o:
   	$(CC) $(CFLAGS) -c $(INCLUDES) $<
  
  
  
  1.1                  apache-2.0/src/lib/apr/strings/apr_fnmatch.c
  
  Index: apr_fnmatch.c
  ===================================================================
  /*
   * Copyright (c) 1989, 1993, 1994
   *      The Regents of the University of California.  All rights reserved.
   *
   * This code is derived from software contributed to Berkeley by
   * Guido van Rossum.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in the
   *    documentation and/or other materials provided with the distribution.
   * 3. All advertising materials mentioning features or use of this software
   *    must display the following acknowledgement:
   *      This product includes software developed by the University of
   *      California, Berkeley and its contributors.
   * 4. Neither the name of the University nor the names of its contributors
   *    may be used to endorse or promote products derived from this software
   *    without specific prior written permission.
   *
   * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
  static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
  #endif /* LIBC_SCCS and not lint */
  
  /*
   * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
   * Compares a filename or pathname to a pattern.
   */
  #ifndef WIN32
  #include "apr_private.h"
  #endif
  #include "apr_fnmatch.h"
  #include "apr_lib.h"
  #include <string.h>
  #ifdef HAVE_CTYPE_H
  # include <ctype.h>
  #endif
  
  #define	EOS	'\0'
  
  static const char *rangematch(const char *, int, int);
  
  APR_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *string, int flags)
  {
      const char *stringstart;
      char c, test;
  
      for (stringstart = string;;) {
  	switch (c = *pattern++) {
  	case EOS:
  	    return (*string == EOS ? APR_SUCCESS : FNM_NOMATCH);
  	case '?':
  	    if (*string == EOS) {
  		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);
  	    }
  	    ++string;
  	    break;
  	case '*':
  	    c = *pattern;
  	    /* Collapse multiple stars. */
  	    while (c == '*') {
  		c = *++pattern;
  	    }
  
  	    if (*string == '.' && (flags & FNM_PERIOD) &&
  		(string == stringstart ||
  		 ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) {
  		return (FNM_NOMATCH);
  	    }
  
  	    /* Optimize for pattern with * at end or before /. */
  	    if (c == EOS) {
  		if (flags & FNM_PATHNAME) {
  		    return (strchr(string, '/') == NULL ? APR_SUCCESS : FNM_NOMATCH);
  		}
  		else {
  		    return (APR_SUCCESS);
  		}
  	    }
  	    else if (c == '/' && flags & FNM_PATHNAME) {
  	        if ((string = strchr(string, '/')) == NULL) {
  		    return (FNM_NOMATCH);
  		}
  		break;
  	    }
  
  	    /* General case, use recursion. */
  	    while ((test = *string) != EOS) {
  	        if (!ap_fnmatch(pattern, string, flags & ~FNM_PERIOD)) {
  		    return (APR_SUCCESS);
  		}
  		if (test == '/' && flags & FNM_PATHNAME) {
  		    break;
  		}
  		++string;
  	    }
  	    return (FNM_NOMATCH);
  	case '[':
  	    if (*string == EOS) {
  		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);
  	    }
  	    ++string;
  	    break;
  	case '\\':
  	    if (!(flags & FNM_NOESCAPE)) {
  		if ((c = *pattern++) == EOS) {
  		    c = '\\';
  		    --pattern;
  		}
  	    }
  	    /* FALLTHROUGH */
  	default:
  	    if (flags & FNM_CASE_BLIND) {
  	        if (ap_tolower(c) != ap_tolower(*string)) {
  		    return (FNM_NOMATCH);
  		}
  	    }
  	    else if (c != *string) {
  	        return (FNM_NOMATCH);
  	    }
  	    string++;
  	    break;
  	}
      /* NOTREACHED */
      }
  }
  
  static const char *rangematch(const char *pattern, int test, int flags)
  {
      int negate, ok;
      char c, c2;
  
      /*
       * A bracket expression starting with an unquoted circumflex
       * character produces unspecified results (IEEE 1003.2-1992,
       * 3.13.2).  This implementation treats it like '!', for
       * consistency with the regular expression syntax.
       * J.T. Conklin (conklin@ngai.kaleida.com)
       */
      if ((negate = (*pattern == '!' || *pattern == '^'))) {
  	++pattern;
      }
  
      for (ok = 0; (c = *pattern++) != ']';) {
          if (c == '\\' && !(flags & FNM_NOESCAPE)) {
  	    c = *pattern++;
  	}
  	if (c == EOS) {
  	    return (NULL);
  	}
  	if (*pattern == '-' && (c2 = *(pattern + 1)) != EOS && c2 != ']') {
  	    pattern += 2;
  	    if (c2 == '\\' && !(flags & FNM_NOESCAPE)) {
  		c2 = *pattern++;
  	    }
  	    if (c2 == EOS) {
  		return (NULL);
  	    }
  	    if ((c <= test && test <= c2)
  		|| ((flags & FNM_CASE_BLIND)
  		    && ((ap_tolower(c) <= ap_tolower(test))
  			&& (ap_tolower(test) <= ap_tolower(c2))))) {
  		ok = 1;
  	    }
  	}
  	else if ((c == test)
  		 || ((flags & FNM_CASE_BLIND)
  		     && (ap_tolower(c) == ap_tolower(test)))) {
  	    ok = 1;
  	}
      }
      return (ok == negate ? NULL : pattern);
  }
  
  
  /* This function is an Apache addition */
  /* return non-zero if pattern has any glob chars in it */
  APR_EXPORT(int) ap_is_fnmatch(const char *pattern)
  {
      int nesting;
  
      nesting = 0;
      while (*pattern) {
  	switch (*pattern) {
  	case '?':
  	case '*':
  	    return 1;
  
  	case '\\':
  	    if (*pattern++ == '\0') {
  		return 0;
  	    }
  	    break;
  
  	case '[':	/* '[' is only a glob if it has a matching ']' */
  	    ++nesting;
  	    break;
  
  	case ']':
  	    if (nesting) {
  		return 1;
  	    }
  	    break;
  	}
  	++pattern;
      }
      return 0;
  }
  
  
  

Mime
View raw message