/[pcre]/code/trunk/pcreposix.c
ViewVC logotype

Diff of /code/trunk/pcreposix.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 69 by nigel, Sat Feb 24 21:40:18 2007 UTC revision 75 by nigel, Sat Feb 24 21:40:37 2007 UTC
# Line 12  functions. Line 12  functions.
12    
13  Written by: Philip Hazel <ph10@cam.ac.uk>  Written by: Philip Hazel <ph10@cam.ac.uk>
14    
15             Copyright (c) 1997-2003 University of Cambridge             Copyright (c) 1997-2004 University of Cambridge
16    
17  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
18  Permission is granted to anyone to use this software for any purpose on any  Redistribution and use in source and binary forms, with or without
19  computer system, and to redistribute it freely, subject to the following  modification, are permitted provided that the following conditions are met:
20  restrictions:  
21        * Redistributions of source code must retain the above copyright notice,
22  1. This software is distributed in the hope that it will be useful,        this list of conditions and the following disclaimer.
23     but WITHOUT ANY WARRANTY; without even the implied warranty of  
24     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.      * Redistributions in binary form must reproduce the above copyright
25          notice, this list of conditions and the following disclaimer in the
26  2. The origin of this software must not be misrepresented, either by        documentation and/or other materials provided with the distribution.
27     explicit claim or by omission.  
28        * Neither the name of the University of Cambridge nor the names of its
29  3. Altered versions must be plainly marked as such, and must not be        contributors may be used to endorse or promote products derived from
30     misrepresented as being the original software.        this software without specific prior written permission.
31    
32  4. If PCRE is embedded in any software that is released under the GNU  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
33     General Purpose Licence (GPL), then the terms of that licence shall  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
34     supersede any condition above with which it is incompatible.  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
35    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
36    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
37    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
38    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
39    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
40    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
41    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
42    POSSIBILITY OF SUCH DAMAGE.
43  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
44  */  */
45    
# Line 43  restrictions: Line 51  restrictions:
51    
52  /* Corresponding tables of PCRE error messages and POSIX error codes. */  /* Corresponding tables of PCRE error messages and POSIX error codes. */
53    
54  static const char *estring[] = {  static const char *const estring[] = {
55    ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,    ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,
56    ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,    ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,
57    ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR29, ERR29, ERR30,    ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR29, ERR29, ERR30,
58    ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40,    ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40,
59    ERR41, ERR42, ERR43 };    ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47 };
60    
61  static int eint[] = {  static const int eint[] = {
62    REG_EESCAPE, /* "\\ at end of pattern" */    REG_EESCAPE, /* "\\ at end of pattern" */
63    REG_EESCAPE, /* "\\c at end of pattern" */    REG_EESCAPE, /* "\\c at end of pattern" */
64    REG_EESCAPE, /* "unrecognized character follows \\" */    REG_EESCAPE, /* "unrecognized character follows \\" */
# Line 87  static int eint[] = { Line 95  static int eint[] = {
95    REG_BADPAT,  /* "character value in \x{...} sequence is too large" */    REG_BADPAT,  /* "character value in \x{...} sequence is too large" */
96    REG_BADPAT,  /* "invalid condition (?(0)" */    REG_BADPAT,  /* "invalid condition (?(0)" */
97    REG_BADPAT,  /* "\\C not allowed in lookbehind assertion" */    REG_BADPAT,  /* "\\C not allowed in lookbehind assertion" */
98    REG_EESCAPE, /* "PCRE does not support \\L, \\l, \\N, \\P, \\p, \\U, \\u, or \\X" */    REG_EESCAPE, /* "PCRE does not support \\L, \\l, \\N, \\U, or \\u" */
99    REG_BADPAT,  /* "number after (?C is > 255" */    REG_BADPAT,  /* "number after (?C is > 255" */
100    REG_BADPAT,  /* "closing ) for (?C expected" */    REG_BADPAT,  /* "closing ) for (?C expected" */
101    REG_BADPAT,  /* "recursive call could loop indefinitely" */    REG_BADPAT,  /* "recursive call could loop indefinitely" */
102    REG_BADPAT,  /* "unrecognized character after (?P" */    REG_BADPAT,  /* "unrecognized character after (?P" */
103    REG_BADPAT,  /* "syntax error after (?P" */    REG_BADPAT,  /* "syntax error after (?P" */
104    REG_BADPAT   /* "two named groups have the same name" */    REG_BADPAT,  /* "two named groups have the same name" */
105      REG_BADPAT,  /* "invalid UTF-8 string" */
106      REG_BADPAT,  /* "support for \\P, \\p, and \\X has not been compiled" */
107      REG_BADPAT,  /* "malformed \\P or \\p sequence" */
108      REG_BADPAT   /* "unknown property name after \\P or \\p" */
109  };  };
110    
111  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
112    
113  static const char *pstring[] = {  static const char *const pstring[] = {
114    "",                                /* Dummy for value 0 */    "",                                /* Dummy for value 0 */
115    "internal error",                  /* REG_ASSERT */    "internal error",                  /* REG_ASSERT */
116    "invalid repeat counts in {}",     /* BADBR      */    "invalid repeat counts in {}",     /* BADBR      */
# Line 144  return REG_ASSERT; Line 156  return REG_ASSERT;
156  *          Translate error code to string        *  *          Translate error code to string        *
157  *************************************************/  *************************************************/
158    
159  size_t  EXPORT size_t
160  regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)  regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
161  {  {
162  const char *message, *addmessage;  const char *message, *addmessage;
# Line 179  return length + addlength; Line 191  return length + addlength;
191  *           Free store held by a regex           *  *           Free store held by a regex           *
192  *************************************************/  *************************************************/
193    
194  void  EXPORT void
195  regfree(regex_t *preg)  regfree(regex_t *preg)
196  {  {
197  (pcre_free)(preg->re_pcre);  (pcre_free)(preg->re_pcre);
# Line 202  Returns: 0 on success Line 214  Returns: 0 on success
214                various non-zero codes on failure                various non-zero codes on failure
215  */  */
216    
217  int  EXPORT int
218  regcomp(regex_t *preg, const char *pattern, int cflags)  regcomp(regex_t *preg, const char *pattern, int cflags)
219  {  {
220  const char *errorptr;  const char *errorptr;
# Line 217  preg->re_erroffset = erroffset; Line 229  preg->re_erroffset = erroffset;
229    
230  if (preg->re_pcre == NULL) return pcre_posix_error_code(errorptr);  if (preg->re_pcre == NULL) return pcre_posix_error_code(errorptr);
231    
232  preg->re_nsub = pcre_info(preg->re_pcre, NULL, NULL);  preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
233  return 0;  return 0;
234  }  }
235    
# Line 235  ints. However, if the number of possible Line 247  ints. However, if the number of possible
247  block of store on the stack, to reduce the use of malloc/free. The threshold is  block of store on the stack, to reduce the use of malloc/free. The threshold is
248  in a macro that can be changed at configure time. */  in a macro that can be changed at configure time. */
249    
250  int  EXPORT int
251  regexec(const regex_t *preg, const char *string, size_t nmatch,  regexec(const regex_t *preg, const char *string, size_t nmatch,
252    regmatch_t pmatch[], int eflags)    regmatch_t pmatch[], int eflags)
253  {  {
# Line 264  if (nmatch > 0) Line 276  if (nmatch > 0)
276      }      }
277    }    }
278    
279  rc = pcre_exec(preg->re_pcre, NULL, string, (int)strlen(string), 0, options,  rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string, (int)strlen(string),
280    ovector, nmatch * 3);    0, options, ovector, nmatch * 3);
281    
282  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */
283    
# Line 293  else Line 305  else
305      case PCRE_ERROR_BADMAGIC: return REG_INVARG;      case PCRE_ERROR_BADMAGIC: return REG_INVARG;
306      case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;      case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;
307      case PCRE_ERROR_NOMEMORY: return REG_ESPACE;      case PCRE_ERROR_NOMEMORY: return REG_ESPACE;
308        case PCRE_ERROR_MATCHLIMIT: return REG_ESPACE;
309        case PCRE_ERROR_BADUTF8: return REG_INVARG;
310        case PCRE_ERROR_BADUTF8_OFFSET: return REG_INVARG;
311      default: return REG_ASSERT;      default: return REG_ASSERT;
312      }      }
313    }    }
Legend:
Removed from v.69  
changed lines
  Added in v.75
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12