apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: apr-util/include apr_strmatch.h
Date Thu, 09 May 2002 16:33:07 GMT
brianp      02/05/09 09:33:07

  Modified:    .        Makefile.in configure.in
  Added:       strmatch Makefile.in apr_strmatch.c
               include  apr_strmatch.h
  Log:
  Added apr_strmatch API
  
  Revision  Changes    Path
  1.62      +1 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Makefile.in	8 May 2002 22:00:57 -0000	1.61
  +++ Makefile.in	9 May 2002 16:33:07 -0000	1.62
  @@ -16,7 +16,7 @@
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
  -SUBDIRS = buckets crypto dbm encoding hooks ldap uri xml misc
  +SUBDIRS = buckets crypto dbm encoding hooks ldap uri xml misc strmatch
   CLEAN_SUBDIRS = . test
   
   CLEAN_TARGETS =
  
  
  
  1.48      +1 -1      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- configure.in	16 Apr 2002 06:55:59 -0000	1.47
  +++ configure.in	9 May 2002 16:33:07 -0000	1.48
  @@ -119,7 +119,7 @@
   
   dnl
   dnl everthing is done. 
  -MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile
hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile $test_Makefile"
  +MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile
hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile $test_Makefile"
   AC_OUTPUT([
       export_vars.sh
       apu-config
  
  
  
  1.1                  apr-util/strmatch/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  VPATH = @srcdir@
  
  INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
  
  TARGETS = apr_strmatch.lo
  
  # bring in rules.mk for standard functionality
  @INCLUDE_RULES@
  
  
  
  1.1                  apr-util/strmatch/apr_strmatch.c
  
  Index: apr_strmatch.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * 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. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
   * ITS 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.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "apr_strmatch.h"
  #include "apr_lib.h"
  #define APR_WANT_STRFUNC
  #include "apr_want.h"
  
  
  #define NUM_CHARS  256
  
  /* String searching functions
   */
  APU_DECLARE_NONSTD(const char *) match_no_op(const apr_strmatch_pattern *this_pattern, const
char *s, apr_size_t slen);
  APU_DECLARE_NONSTD(const char *) match_boyer_moore_horspool(const apr_strmatch_pattern *this_pattern,
const char *s, apr_size_t slen);
  APU_DECLARE_NONSTD(const char *) match_boyer_moore_horspool_nocase(const apr_strmatch_pattern
*this_pattern, const char *s, apr_size_t slen);
  
  APU_DECLARE(const apr_strmatch_pattern *)
       apr_strmatch_precompile(apr_pool_t *p, const char *s, int case_sensitive)
  {
      apr_strmatch_pattern *pattern;
      apr_size_t i;
      int *shift;
  
      pattern = apr_palloc(p, sizeof(*pattern));
      pattern->pattern = s;
      pattern->length = strlen(s);
      if (pattern->length == 0) {
          pattern->compare = match_no_op;
          pattern->context = NULL;
          return pattern;
      }
      else if (case_sensitive) {
          pattern->compare = match_boyer_moore_horspool;
      }
      else {
          pattern->compare = match_boyer_moore_horspool_nocase;
      }
  
      shift = (int *)apr_palloc(p, sizeof(int) * NUM_CHARS);
      for (i = 0; i < NUM_CHARS; i++) {
          shift[i] = pattern->length;
      }
      if (case_sensitive) {
          for (i = 0; i < pattern->length - 1; i++) {
              shift[(int)s[i]] = pattern->length - i - 1;
          }
      }
      else {
          for (i = 0; i < pattern->length - 1; i++) {
              shift[apr_tolower(s[i])] = pattern->length - i - 1;
          }
      }
      pattern->context = shift;
  
      return pattern;
  }
  
  APU_DECLARE_NONSTD(const char *) match_no_op(const apr_strmatch_pattern *this_pattern, const
char *s, apr_size_t slen)
  {
      return s;
  }
  
  APU_DECLARE_NONSTD(const char *) match_boyer_moore_horspool(const apr_strmatch_pattern *this_pattern,
const char *s, apr_size_t slen)
  {
      const char *s_end = s + slen;
      int *shift = (int *)(this_pattern->context);
      const char *s_next = s + this_pattern->length - 1;
      const char *p_start = this_pattern->pattern;
      const char *p_end = p_start + this_pattern->length - 1;
      while (s_next < s_end) {
          const char *s_tmp = s_next;
          const char *p_tmp = p_end;
          while (*s_tmp == *p_tmp) {
              p_tmp--;
              if (p_tmp < p_start) {
                  return s_tmp;
              }
              s_tmp--;
          }
          s_next += shift[(int)*s_next];
      }
      return NULL;
  }
  
  APU_DECLARE_NONSTD(const char *) match_boyer_moore_horspool_nocase(const apr_strmatch_pattern
*this_pattern, const char *s, apr_size_t slen)
  {
      const char *s_end = s + slen;
      int *shift = (int *)(this_pattern->context);
      const char *s_next = s + this_pattern->length - 1;
      const char *p_start = this_pattern->pattern;
      const char *p_end = p_start + this_pattern->length - 1;
      while (s_next < s_end) {
          const char *s_tmp = s_next;
          const char *p_tmp = p_end;
          while (apr_tolower(*s_tmp) == apr_tolower(*p_tmp)) {
              p_tmp--;
              if (p_tmp < p_start) {
                  return s_tmp;
              }
              s_tmp--;
          }
          s_next += shift[(int)*s_next];
      }
      return NULL;
  }
  
  
  
  1.1                  apr-util/include/apr_strmatch.h
  
  Index: apr_strmatch.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * 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. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
   * ITS 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.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * Portions of this software are based upon public domain software
   * originally written at the National Center for Supercomputing Applications,
   * University of Illinois, Urbana-Champaign.
   */
  
  #ifndef APR_STRMATCH_H
  #define APR_STRMATCH_H
  /**
   * @file apr_strmatch.h
   * @brief APR-UTIL string matching routines
   */
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  /**
   * @defgroup APR_Util_StrMatch String matching routines
   * @ingroup APR_Util
   * @{
   */
  
  #include "apu.h"
  #include "apr_pools.h"
  
  
  typedef struct apr_strmatch_pattern apr_strmatch_pattern;
  /**
   * Precompiled search pattern
   */
  struct apr_strmatch_pattern {
      const char *(*compare)(const apr_strmatch_pattern *this_pattern,
                              const char *s, apr_size_t slen);
      const char *pattern;
      apr_size_t length;
      void *context;  /* hook for subclasses to add precomputed metadata */
  };
  
  #if defined(DOXYGEN)
  /**
   * Search for a precompiled pattern within a string
   * @param pattern The pattern
   * @param s The string in which to search for the pattern
   * @param slen The length of s (excluding null terminator)
   * @return A pointer to the first instance of the pattern in s, or
   *         NULL if not found
   */
  APU_DECLARE(const char *) apr_strmatch(const apr_strmatch_pattern *pattern,
                                         const char *s; apr_size_t s);
  #else
  #define apr_strmatch(pattern, s, slen) (*((pattern)->compare))((pattern), (s), (slen))
  #endif
  
  /**
   * Precompile a pattern for matching using the Boyer-Moore-Horspool algorithm
   * @param p The pool from which to allocate the pattern
   * @param s The pattern string
   * @param case_sensitive Whether the matching should be case-sensitive
   * @return a pointer to the compiled pattern, or NULL if compilation fails
   */
  APU_DECLARE(const apr_strmatch_pattern *)
           apr_strmatch_precompile(apr_pool_t *p, const char *s,
                                   int case_sensitive);
  
  /** @} */
  #ifdef __cplusplus
  }
  #endif
  
  #endif	/* !APR_STRMATCH_H */
  
  
  

Mime
View raw message