/[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 336 by ph10, Sat Apr 12 15:59:03 2008 UTC revision 758 by ph10, Mon Nov 21 12:05:36 2011 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-2008 University of Cambridge             Copyright (c) 1997-2010 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 57  previously been set. */ Line 57  previously been set. */
57  #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)  #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)
58  #endif  #endif
59    
60    /* We include pcre.h before pcre_internal.h so that the PCRE library functions
61    are declared as "import" for Windows by defining PCRE_EXP_DECL as "import".
62    This is needed even though pcre_internal.h itself includes pcre.h, because it
63    does so after it has set PCRE_EXP_DECL to "export" if it is not already set. */
64    
65  #include "pcre.h"  #include "pcre.h"
66  #include "pcre_internal.h"  #include "pcre_internal.h"
67  #include "pcreposix.h"  #include "pcreposix.h"
# Line 70  static const int eint[] = { Line 75  static const int eint[] = {
75    REG_EESCAPE, /* \c at end of pattern */    REG_EESCAPE, /* \c at end of pattern */
76    REG_EESCAPE, /* unrecognized character follows \ */    REG_EESCAPE, /* unrecognized character follows \ */
77    REG_BADBR,   /* numbers out of order in {} quantifier */    REG_BADBR,   /* numbers out of order in {} quantifier */
78      /* 5 */
79    REG_BADBR,   /* number too big in {} quantifier */    REG_BADBR,   /* number too big in {} quantifier */
80    REG_EBRACK,  /* missing terminating ] for character class */    REG_EBRACK,  /* missing terminating ] for character class */
81    REG_ECTYPE,  /* invalid escape sequence in character class */    REG_ECTYPE,  /* invalid escape sequence in character class */
82    REG_ERANGE,  /* range out of order in character class */    REG_ERANGE,  /* range out of order in character class */
83    REG_BADRPT,  /* nothing to repeat */    REG_BADRPT,  /* nothing to repeat */
84      /* 10 */
85    REG_BADRPT,  /* operand of unlimited repeat could match the empty string */    REG_BADRPT,  /* operand of unlimited repeat could match the empty string */
86    REG_ASSERT,  /* internal error: unexpected repeat */    REG_ASSERT,  /* internal error: unexpected repeat */
87    REG_BADPAT,  /* unrecognized character after (? */    REG_BADPAT,  /* unrecognized character after (? */
88    REG_BADPAT,  /* POSIX named classes are supported only within a class */    REG_BADPAT,  /* POSIX named classes are supported only within a class */
89    REG_EPAREN,  /* missing ) */    REG_EPAREN,  /* missing ) */
90      /* 15 */
91    REG_ESUBREG, /* reference to non-existent subpattern */    REG_ESUBREG, /* reference to non-existent subpattern */
92    REG_INVARG,  /* erroffset passed as NULL */    REG_INVARG,  /* erroffset passed as NULL */
93    REG_INVARG,  /* unknown option bit(s) set */    REG_INVARG,  /* unknown option bit(s) set */
94    REG_EPAREN,  /* missing ) after comment */    REG_EPAREN,  /* missing ) after comment */
95    REG_ESIZE,   /* parentheses nested too deeply */    REG_ESIZE,   /* parentheses nested too deeply */
96      /* 20 */
97    REG_ESIZE,   /* regular expression too large */    REG_ESIZE,   /* regular expression too large */
98    REG_ESPACE,  /* failed to get memory */    REG_ESPACE,  /* failed to get memory */
99    REG_EPAREN,  /* unmatched brackets */    REG_EPAREN,  /* unmatched parentheses */
100    REG_ASSERT,  /* internal error: code overflow */    REG_ASSERT,  /* internal error: code overflow */
101    REG_BADPAT,  /* unrecognized character after (?< */    REG_BADPAT,  /* unrecognized character after (?< */
102      /* 25 */
103    REG_BADPAT,  /* lookbehind assertion is not fixed length */    REG_BADPAT,  /* lookbehind assertion is not fixed length */
104    REG_BADPAT,  /* malformed number or name after (?( */    REG_BADPAT,  /* malformed number or name after (?( */
105    REG_BADPAT,  /* conditional group contains more than two branches */    REG_BADPAT,  /* conditional group contains more than two branches */
106    REG_BADPAT,  /* assertion expected after (?( */    REG_BADPAT,  /* assertion expected after (?( */
107    REG_BADPAT,  /* (?R or (?[+-]digits must be followed by ) */    REG_BADPAT,  /* (?R or (?[+-]digits must be followed by ) */
108      /* 30 */
109    REG_ECTYPE,  /* unknown POSIX class name */    REG_ECTYPE,  /* unknown POSIX class name */
110    REG_BADPAT,  /* POSIX collating elements are not supported */    REG_BADPAT,  /* POSIX collating elements are not supported */
111    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 */
112    REG_BADPAT,  /* spare error */    REG_BADPAT,  /* spare error */
113    REG_BADPAT,  /* character value in \x{...} sequence is too large */    REG_BADPAT,  /* character value in \x{...} sequence is too large */
114      /* 35 */
115    REG_BADPAT,  /* invalid condition (?(0) */    REG_BADPAT,  /* invalid condition (?(0) */
116    REG_BADPAT,  /* \C not allowed in lookbehind assertion */    REG_BADPAT,  /* \C not allowed in lookbehind assertion */
117    REG_EESCAPE, /* PCRE does not support \L, \l, \N, \U, or \u */    REG_EESCAPE, /* PCRE does not support \L, \l, \N, \U, or \u */
118    REG_BADPAT,  /* number after (?C is > 255 */    REG_BADPAT,  /* number after (?C is > 255 */
119    REG_BADPAT,  /* closing ) for (?C expected */    REG_BADPAT,  /* closing ) for (?C expected */
120      /* 40 */
121    REG_BADPAT,  /* recursive call could loop indefinitely */    REG_BADPAT,  /* recursive call could loop indefinitely */
122    REG_BADPAT,  /* unrecognized character after (?P */    REG_BADPAT,  /* unrecognized character after (?P */
123    REG_BADPAT,  /* syntax error in subpattern name (missing terminator) */    REG_BADPAT,  /* syntax error in subpattern name (missing terminator) */
124    REG_BADPAT,  /* two named subpatterns have the same name */    REG_BADPAT,  /* two named subpatterns have the same name */
125    REG_BADPAT,  /* invalid UTF-8 string */    REG_BADPAT,  /* invalid UTF-8 string */
126      /* 45 */
127    REG_BADPAT,  /* support for \P, \p, and \X has not been compiled */    REG_BADPAT,  /* support for \P, \p, and \X has not been compiled */
128    REG_BADPAT,  /* malformed \P or \p sequence */    REG_BADPAT,  /* malformed \P or \p sequence */
129    REG_BADPAT,  /* unknown property name after \P or \p */    REG_BADPAT,  /* unknown property name after \P or \p */
130    REG_BADPAT,  /* subpattern name is too long (maximum 32 characters) */    REG_BADPAT,  /* subpattern name is too long (maximum 32 characters) */
131    REG_BADPAT,  /* too many named subpatterns (maximum 10,000) */    REG_BADPAT,  /* too many named subpatterns (maximum 10,000) */
132      /* 50 */
133    REG_BADPAT,  /* repeated subpattern is too long */    REG_BADPAT,  /* repeated subpattern is too long */
134    REG_BADPAT,  /* octal value is greater than \377 (not in UTF-8 mode) */    REG_BADPAT,  /* octal value is greater than \377 (not in UTF-8 mode) */
135    REG_BADPAT,  /* internal error: overran compiling workspace */    REG_BADPAT,  /* internal error: overran compiling workspace */
136    REG_BADPAT,  /* internal error: previously-checked referenced subpattern not found */    REG_BADPAT,  /* internal error: previously-checked referenced subpattern not found */
137    REG_BADPAT,  /* DEFINE group contains more than one branch */    REG_BADPAT,  /* DEFINE group contains more than one branch */
138      /* 55 */
139    REG_BADPAT,  /* repeating a DEFINE group is not allowed */    REG_BADPAT,  /* repeating a DEFINE group is not allowed */
140    REG_INVARG,  /* inconsistent NEWLINE options */    REG_INVARG,  /* inconsistent NEWLINE options */
141    REG_BADPAT,  /* \g is not followed followed by an (optionally braced) non-zero number */    REG_BADPAT,  /* \g is not followed followed by an (optionally braced) non-zero number */
142    REG_BADPAT,  /* (?+ or (?- must be followed by a non-zero number */    REG_BADPAT,  /* a numbered reference must not be zero */
143      REG_BADPAT,  /* an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT) */
144      /* 60 */
145      REG_BADPAT,  /* (*VERB) not recognized */
146    REG_BADPAT,  /* number is too big */    REG_BADPAT,  /* number is too big */
147    REG_BADPAT,  /* subpattern name expected */    REG_BADPAT,  /* subpattern name expected */
148    REG_BADPAT,  /* digit expected after (?+ */    REG_BADPAT,  /* digit expected after (?+ */
149    REG_BADPAT   /* ] is an invalid data character in JavaScript compatibility mode */    REG_BADPAT,  /* ] is an invalid data character in JavaScript compatibility mode */
150      /* 65 */
151      REG_BADPAT,  /* different names for subpatterns of the same number are not allowed */
152      REG_BADPAT,  /* (*MARK) must have an argument */
153      REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UCP support */
154      REG_BADPAT,  /* \c must be followed by an ASCII character */
155      REG_BADPAT,  /* \k is not followed by a braced, angle-bracketed, or quoted name */
156      /* 70 */
157      REG_BADPAT,  /* internal error: unknown opcode in find_fixedlength() */
158      REG_BADPAT,  /* \N is not supported in a class */
159  };  };
160    
161  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
# Line 160  static const char *const pstring[] = { Line 188  static const char *const pstring[] = {
188  *          Translate error code to string        *  *          Translate error code to string        *
189  *************************************************/  *************************************************/
190    
191  PCREPOSIX_EXP_DEFN size_t  PCREPOSIX_EXP_DEFN size_t PCRE_CALL_CONVENTION
192  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)
193  {  {
194  const char *message, *addmessage;  const char *message, *addmessage;
# Line 195  return length + addlength; Line 223  return length + addlength;
223  *           Free store held by a regex           *  *           Free store held by a regex           *
224  *************************************************/  *************************************************/
225    
226  PCREPOSIX_EXP_DEFN void  PCREPOSIX_EXP_DEFN void PCRE_CALL_CONVENTION
227  regfree(regex_t *preg)  regfree(regex_t *preg)
228  {  {
229  (pcre_free)(preg->re_pcre);  (pcre_free)(preg->re_pcre);
# Line 218  Returns: 0 on success Line 246  Returns: 0 on success
246                various non-zero codes on failure                various non-zero codes on failure
247  */  */
248    
249  PCREPOSIX_EXP_DEFN int  PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
250  regcomp(regex_t *preg, const char *pattern, int cflags)  regcomp(regex_t *preg, const char *pattern, int cflags)
251  {  {
252  const char *errorptr;  const char *errorptr;
# Line 226  int erroffset; Line 254  int erroffset;
254  int errorcode;  int errorcode;
255  int options = 0;  int options = 0;
256    
257  if ((cflags & REG_ICASE) != 0)   options |= PCRE_CASELESS;  if ((cflags & REG_ICASE) != 0)    options |= PCRE_CASELESS;
258  if ((cflags & REG_NEWLINE) != 0) options |= PCRE_MULTILINE;  if ((cflags & REG_NEWLINE) != 0)  options |= PCRE_MULTILINE;
259  if ((cflags & REG_DOTALL) != 0)  options |= PCRE_DOTALL;  if ((cflags & REG_DOTALL) != 0)   options |= PCRE_DOTALL;
260  if ((cflags & REG_NOSUB) != 0)   options |= PCRE_NO_AUTO_CAPTURE;  if ((cflags & REG_NOSUB) != 0)    options |= PCRE_NO_AUTO_CAPTURE;
261  if ((cflags & REG_UTF8) != 0)    options |= PCRE_UTF8;  if ((cflags & REG_UTF8) != 0)     options |= PCRE_UTF8;
262    if ((cflags & REG_UCP) != 0)      options |= PCRE_UCP;
263    if ((cflags & REG_UNGREEDY) != 0) options |= PCRE_UNGREEDY;
264    
265  preg->re_pcre = pcre_compile2(pattern, options, &errorcode, &errorptr,  preg->re_pcre = pcre_compile2(pattern, options, &errorcode, &errorptr,
266    &erroffset, NULL);    &erroffset, NULL);
267  preg->re_erroffset = erroffset;  preg->re_erroffset = erroffset;
268    
269  if (preg->re_pcre == NULL) return eint[errorcode];  /* Safety: if the error code is too big for the translation vector (which
270    should not happen, but we all make mistakes), return REG_BADPAT. */
271    
272    if (preg->re_pcre == NULL)
273      {
274      return (errorcode < sizeof(eint)/sizeof(const int))?
275        eint[errorcode] : REG_BADPAT;
276      }
277    
278  preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);  preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
279  return 0;  return 0;
# Line 260  If REG_NOSUB was specified at compile ti Line 297  If REG_NOSUB was specified at compile ti
297  be set. When this is the case, the nmatch and pmatch arguments are ignored, and  be set. When this is the case, the nmatch and pmatch arguments are ignored, and
298  the only result is yes/no/error. */  the only result is yes/no/error. */
299    
300  PCREPOSIX_EXP_DEFN int  PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
301  regexec(const regex_t *preg, const char *string, size_t nmatch,  regexec(const regex_t *preg, const char *string, size_t nmatch,
302    regmatch_t pmatch[], int eflags)    regmatch_t pmatch[], int eflags)
303  {  {
# Line 274  BOOL nosub = Line 311  BOOL nosub =
311    
312  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
313  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
314    if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY;
315    
316  ((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 */
317    
318  /* When no string data is being returned, ensure that nmatch is zero.  /* When no string data is being returned, or no vector has been passed in which
319  Otherwise, ensure the vector for holding the return data is large enough. */  to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding
320    the return data is large enough. */
321    
322  if (nosub) nmatch = 0;  if (nosub || pmatch == NULL) nmatch = 0;
323    
324  else if (nmatch > 0)  else if (nmatch > 0)
325    {    {
# Line 299  else if (nmatch > 0) Line 338  else if (nmatch > 0)
338    
339  /* REG_STARTEND is a BSD extension, to allow for non-NUL-terminated strings.  /* REG_STARTEND is a BSD extension, to allow for non-NUL-terminated strings.
340  The man page from OS X says "REG_STARTEND affects only the location of the  The man page from OS X says "REG_STARTEND affects only the location of the
341  string, not how it is matched". That is why the "so" value is used to bump the  string, not how it is matched". That is why the "so" value is used to bump the
342  start location rather than being passed as a PCRE "starting offset". */  start location rather than being passed as a PCRE "starting offset". */
343    
344  if ((eflags & REG_STARTEND) != 0)  if ((eflags & REG_STARTEND) != 0)
345    {    {
346    so = pmatch[0].rm_so;    so = pmatch[0].rm_so;
347    eo = pmatch[0].rm_eo;    eo = pmatch[0].rm_eo;
348    }    }
349  else  else
350    {    {
351    so = 0;    so = 0;
352    eo = strlen(string);    eo = (int)strlen(string);
353    }    }
354    
355  rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),  rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),
356    0, options, ovector, nmatch * 3);    0, options, ovector, (int)(nmatch * 3));
357    
358  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */  if (rc == 0) rc = (int)nmatch;    /* All captured slots were filled in */
359    
360    /* Successful match */
361    
362  if (rc >= 0)  if (rc >= 0)
363    {    {
# Line 334  if (rc >= 0) Line 375  if (rc >= 0)
375    return 0;    return 0;
376    }    }
377    
378  else  /* Unsuccessful match */
379    
380    if (allocated_ovector) free(ovector);
381    switch(rc)
382    {    {
383    if (allocated_ovector) free(ovector);  /* ========================================================================== */
384    switch(rc)    /* These cases are never obeyed. This is a fudge that causes a compile-time
385      {    error if the vector eint, which is indexed by compile-time error number, is
386      case PCRE_ERROR_NOMATCH: return REG_NOMATCH;    not the correct length. It seems to be the only way to do such a check at
387      case PCRE_ERROR_NULL: return REG_INVARG;    compile time, as the sizeof() operator does not work in the C preprocessor.
388      case PCRE_ERROR_BADOPTION: return REG_INVARG;    As all the PCRE_ERROR_xxx values are negative, we can use 0 and 1. */
389      case PCRE_ERROR_BADMAGIC: return REG_INVARG;  
390      case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;    case 0:
391      case PCRE_ERROR_NOMEMORY: return REG_ESPACE;    case (sizeof(eint)/sizeof(int) == ERRCOUNT):
392      case PCRE_ERROR_MATCHLIMIT: return REG_ESPACE;    return REG_ASSERT;
393      case PCRE_ERROR_BADUTF8: return REG_INVARG;  /* ========================================================================== */
394      case PCRE_ERROR_BADUTF8_OFFSET: return REG_INVARG;  
395      default: return REG_ASSERT;    case PCRE_ERROR_NOMATCH: return REG_NOMATCH;
396      }    case PCRE_ERROR_NULL: return REG_INVARG;
397      case PCRE_ERROR_BADOPTION: return REG_INVARG;
398      case PCRE_ERROR_BADMAGIC: return REG_INVARG;
399      case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;
400      case PCRE_ERROR_NOMEMORY: return REG_ESPACE;
401      case PCRE_ERROR_MATCHLIMIT: return REG_ESPACE;
402      case PCRE_ERROR_BADUTF8: return REG_INVARG;
403      case PCRE_ERROR_BADUTF8_OFFSET: return REG_INVARG;
404      default: return REG_ASSERT;
405    }    }
406  }  }
407    

Legend:
Removed from v.336  
changed lines
  Added in v.758

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12