/[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 77 by nigel, Sat Feb 24 21:40:45 2007 UTC revision 269 by ph10, Fri Nov 16 16:22:24 2007 UTC
# Line 6  Line 6 
6  and semantics are as close as possible to those of the Perl 5 language.  and semantics are as close as possible to those of the Perl 5 language.
7    
8                         Written by Philip Hazel                         Written by Philip Hazel
9             Copyright (c) 1997-2005 University of Cambridge             Copyright (c) 1997-2007 University of Cambridge
10    
11  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
12  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 42  POSSIBILITY OF SUCH DAMAGE. Line 42  POSSIBILITY OF SUCH DAMAGE.
42  functions. */  functions. */
43    
44    
45    #ifdef HAVE_CONFIG_H
46    #include "config.h"
47    #endif
48    
49    
50    /* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for
51    compiling these functions. This must come before including pcreposix.h, where
52    they are set for an application (using these functions) if they have not
53    previously been set. */
54    
55    #if defined(_WIN32) && !defined(PCRE_STATIC)
56    #  define PCREPOSIX_EXP_DECL extern __declspec(dllexport)
57    #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)
58    #endif
59    
60    #include "pcre.h"
61  #include "pcre_internal.h"  #include "pcre_internal.h"
62  #include "pcreposix.h"  #include "pcreposix.h"
 #include "stdlib.h"  
   
63    
64    
65  /* Table to translate PCRE compile time error codes into POSIX error codes. */  /* Table to translate PCRE compile time error codes into POSIX error codes. */
# Line 77  static const int eint[] = { Line 91  static const int eint[] = {
91    REG_ASSERT,  /* internal error: code overflow */    REG_ASSERT,  /* internal error: code overflow */
92    REG_BADPAT,  /* unrecognized character after (?< */    REG_BADPAT,  /* unrecognized character after (?< */
93    REG_BADPAT,  /* lookbehind assertion is not fixed length */    REG_BADPAT,  /* lookbehind assertion is not fixed length */
94    REG_BADPAT,  /* malformed number after (?( */    REG_BADPAT,  /* malformed number or name after (?( */
95    REG_BADPAT,  /* conditional group containe more than two branches */    REG_BADPAT,  /* conditional group contains more than two branches */
96    REG_BADPAT,  /* assertion expected after (?( */    REG_BADPAT,  /* assertion expected after (?( */
97    REG_BADPAT,  /* (?R or (?digits must be followed by ) */    REG_BADPAT,  /* (?R or (?[+-]digits must be followed by ) */
98    REG_ECTYPE,  /* unknown POSIX class name */    REG_ECTYPE,  /* unknown POSIX class name */
99    REG_BADPAT,  /* POSIX collating elements are not supported */    REG_BADPAT,  /* POSIX collating elements are not supported */
100    REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UTF8 support */    REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UTF8 support */
# Line 93  static const int eint[] = { Line 107  static const int eint[] = {
107    REG_BADPAT,  /* closing ) for (?C expected */    REG_BADPAT,  /* closing ) for (?C expected */
108    REG_BADPAT,  /* recursive call could loop indefinitely */    REG_BADPAT,  /* recursive call could loop indefinitely */
109    REG_BADPAT,  /* unrecognized character after (?P */    REG_BADPAT,  /* unrecognized character after (?P */
110    REG_BADPAT,  /* syntax error after (?P */    REG_BADPAT,  /* syntax error in subpattern name (missing terminator) */
111    REG_BADPAT,  /* two named groups have the same name */    REG_BADPAT,  /* two named subpatterns have the same name */
112    REG_BADPAT,  /* invalid UTF-8 string */    REG_BADPAT,  /* invalid UTF-8 string */
113    REG_BADPAT,  /* support for \P, \p, and \X has not been compiled */    REG_BADPAT,  /* support for \P, \p, and \X has not been compiled */
114    REG_BADPAT,  /* malformed \P or \p sequence */    REG_BADPAT,  /* malformed \P or \p sequence */
115    REG_BADPAT   /* unknown property name after \P or \p */    REG_BADPAT,  /* unknown property name after \P or \p */
116      REG_BADPAT,  /* subpattern name is too long (maximum 32 characters) */
117      REG_BADPAT,  /* too many named subpatterns (maximum 10,000) */
118      REG_BADPAT,  /* repeated subpattern is too long */
119      REG_BADPAT,  /* octal value is greater than \377 (not in UTF-8 mode) */
120      REG_BADPAT,  /* internal error: overran compiling workspace */
121      REG_BADPAT,  /* internal error: previously-checked referenced subpattern not found */
122      REG_BADPAT,  /* DEFINE group contains more than one branch */
123      REG_BADPAT,  /* repeating a DEFINE group is not allowed */
124      REG_INVARG,  /* inconsistent NEWLINE options */
125      REG_BADPAT,  /* \g is not followed followed by an (optionally braced) non-zero number */
126      REG_BADPAT,  /* (?+ or (?- must be followed by a non-zero number */
127      REG_BADPAT,  /* number is too big */
128      REG_BADPAT,  /* subpattern name expected after (?& */
129      REG_BADPAT   /* digit expected after (?+ */
130  };  };
131    
132  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
# Line 131  static const char *const pstring[] = { Line 159  static const char *const pstring[] = {
159  *          Translate error code to string        *  *          Translate error code to string        *
160  *************************************************/  *************************************************/
161    
162  EXPORT size_t  PCREPOSIX_EXP_DEFN size_t
163  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)
164  {  {
165  const char *message, *addmessage;  const char *message, *addmessage;
# Line 166  return length + addlength; Line 194  return length + addlength;
194  *           Free store held by a regex           *  *           Free store held by a regex           *
195  *************************************************/  *************************************************/
196    
197  EXPORT void  PCREPOSIX_EXP_DEFN void
198  regfree(regex_t *preg)  regfree(regex_t *preg)
199  {  {
200  (pcre_free)(preg->re_pcre);  (pcre_free)(preg->re_pcre);
# Line 189  Returns:      0 on success Line 217  Returns:      0 on success
217                various non-zero codes on failure                various non-zero codes on failure
218  */  */
219    
220  EXPORT int  PCREPOSIX_EXP_DEFN int
221  regcomp(regex_t *preg, const char *pattern, int cflags)  regcomp(regex_t *preg, const char *pattern, int cflags)
222  {  {
223  const char *errorptr;  const char *errorptr;
# Line 197  int erroffset; Line 225  int erroffset;
225  int errorcode;  int errorcode;
226  int options = 0;  int options = 0;
227    
228  if ((cflags & REG_ICASE) != 0) options |= PCRE_CASELESS;  if ((cflags & REG_ICASE) != 0)   options |= PCRE_CASELESS;
229  if ((cflags & REG_NEWLINE) != 0) options |= PCRE_MULTILINE;  if ((cflags & REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
230  if ((cflags & REG_DOTALL) != 0) options |= PCRE_DOTALL;  if ((cflags & REG_DOTALL) != 0)  options |= PCRE_DOTALL;
231    if ((cflags & REG_NOSUB) != 0)   options |= PCRE_NO_AUTO_CAPTURE;
232    if ((cflags & REG_UTF8) != 0)    options |= PCRE_UTF8;
233    
234  preg->re_pcre = pcre_compile2(pattern, options, &errorcode, &errorptr,  preg->re_pcre = pcre_compile2(pattern, options, &errorcode, &errorptr,
235    &erroffset, NULL);    &erroffset, NULL);
# Line 223  substring, so we have to get and release Line 253  substring, so we have to get and release
253  the POSIX structures as was done in earlier releases when PCRE needed only 2  the POSIX structures as was done in earlier releases when PCRE needed only 2
254  ints. However, if the number of possible capturing brackets is small, use a  ints. However, if the number of possible capturing brackets is small, use a
255  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
256  in a macro that can be changed at configure time. */  in a macro that can be changed at configure time.
257    
258    If REG_NOSUB was specified at compile time, the PCRE_NO_AUTO_CAPTURE flag will
259    be set. When this is the case, the nmatch and pmatch arguments are ignored, and
260    the only result is yes/no/error. */
261    
262  EXPORT int  PCREPOSIX_EXP_DEFN int
263  regexec(const regex_t *preg, const char *string, size_t nmatch,  regexec(const regex_t *preg, const char *string, size_t nmatch,
264    regmatch_t pmatch[], int eflags)    regmatch_t pmatch[], int eflags)
265  {  {
# Line 234  int options = 0; Line 268  int options = 0;
268  int *ovector = NULL;  int *ovector = NULL;
269  int small_ovector[POSIX_MALLOC_THRESHOLD * 3];  int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
270  BOOL allocated_ovector = FALSE;  BOOL allocated_ovector = FALSE;
271    BOOL nosub =
272      (((const pcre *)preg->re_pcre)->options & PCRE_NO_AUTO_CAPTURE) != 0;
273    
274  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
275  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
276    
277  ((regex_t *)preg)->re_erroffset = (size_t)(-1);  /* Only has meaning after compile */  ((regex_t *)preg)->re_erroffset = (size_t)(-1);  /* Only has meaning after compile */
278    
279  if (nmatch > 0)  /* When no string data is being returned, ensure that nmatch is zero.
280    Otherwise, ensure the vector for holding the return data is large enough. */
281    
282    if (nosub) nmatch = 0;
283    
284    else if (nmatch > 0)
285    {    {
286    if (nmatch <= POSIX_MALLOC_THRESHOLD)    if (nmatch <= POSIX_MALLOC_THRESHOLD)
287      {      {
# Line 248  if (nmatch > 0) Line 289  if (nmatch > 0)
289      }      }
290    else    else
291      {      {
292        if (nmatch > INT_MAX/(sizeof(int) * 3)) return REG_ESPACE;
293      ovector = (int *)malloc(sizeof(int) * nmatch * 3);      ovector = (int *)malloc(sizeof(int) * nmatch * 3);
294      if (ovector == NULL) return REG_ESPACE;      if (ovector == NULL) return REG_ESPACE;
295      allocated_ovector = TRUE;      allocated_ovector = TRUE;
# Line 262  if (rc == 0) rc = nmatch;    /* All capt Line 304  if (rc == 0) rc = nmatch;    /* All capt
304  if (rc >= 0)  if (rc >= 0)
305    {    {
306    size_t i;    size_t i;
307    for (i = 0; i < (size_t)rc; i++)    if (!nosub)
308      {      {
309      pmatch[i].rm_so = ovector[i*2];      for (i = 0; i < (size_t)rc; i++)
310      pmatch[i].rm_eo = ovector[i*2+1];        {
311          pmatch[i].rm_so = ovector[i*2];
312          pmatch[i].rm_eo = ovector[i*2+1];
313          }
314        if (allocated_ovector) free(ovector);
315        for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;
316      }      }
   if (allocated_ovector) free(ovector);  
   for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;  
317    return 0;    return 0;
318    }    }
319    

Legend:
Removed from v.77  
changed lines
  Added in v.269

  ViewVC Help
Powered by ViewVC 1.1.5