/[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 27 by nigel, Sat Feb 24 21:38:49 2007 UTC revision 51 by nigel, Sat Feb 24 21:39: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-1999 University of Cambridge             Copyright (c) 1997-2000 University of Cambridge
16    
17  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
18  Permission is granted to anyone to use this software for any purpose on any  Permission is granted to anyone to use this software for any purpose on any
# Line 28  restrictions: Line 28  restrictions:
28    
29  3. Altered versions must be plainly marked as such, and must not be  3. Altered versions must be plainly marked as such, and must not be
30     misrepresented as being the original software.     misrepresented as being the original software.
31    
32    4. If PCRE is embedded in any software that is released under the GNU
33       General Purpose Licence (GPL), then the terms of that licence shall
34       supersede any condition above with which it is incompatible.
35  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
36  */  */
37    
# Line 42  restrictions: Line 46  restrictions:
46  static const char *estring[] = {  static const char *estring[] = {
47    ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,    ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,
48    ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,    ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,
49    ERR21, ERR22, ERR23, ERR24, ERR25 };    ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR29, ERR29, ERR30,
50      ERR31 };
51    
52  static int eint[] = {  static int eint[] = {
53    REG_EESCAPE, /* "\\ at end of pattern" */    REG_EESCAPE, /* "\\ at end of pattern" */
# Line 72  static int eint[] = { Line 77  static int eint[] = {
77    REG_BADPAT,  /* "lookbehind assertion is not fixed length" */    REG_BADPAT,  /* "lookbehind assertion is not fixed length" */
78    REG_BADPAT,  /* "malformed number after (?(" */    REG_BADPAT,  /* "malformed number after (?(" */
79    REG_BADPAT,  /* "conditional group containe more than two branches" */    REG_BADPAT,  /* "conditional group containe more than two branches" */
80    REG_BADPAT   /* "assertion expected after (?(" */    REG_BADPAT,  /* "assertion expected after (?(" */
81      REG_BADPAT,  /* "(?p must be followed by )" */
82      REG_ECTYPE,  /* "unknown POSIX class name" */
83      REG_BADPAT,  /* "POSIX collating elements are not supported" */
84      REG_INVARG,  /* "this version of PCRE is not compiled with PCRE_UTF8 support" */
85      REG_BADPAT,  /* "characters with values > 255 are not yet supported in classes" */
86      REG_BADPAT,  /* "character value in \x{...} sequence is too large" */
87      REG_BADPAT   /* "invalid condition (?(0)" */
88  };  };
89    
90  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
# Line 207  return 0; Line 219  return 0;
219  *              Match a regular expression        *  *              Match a regular expression        *
220  *************************************************/  *************************************************/
221    
222    /* Unfortunately, PCRE requires 3 ints of working space for each captured
223    substring, so we have to get and release working store instead of just using
224    the POSIX structures as was done in earlier releases when PCRE needed only 2
225    ints. */
226    
227  int  int
228  regexec(regex_t *preg, const char *string, size_t nmatch,  regexec(regex_t *preg, const char *string, size_t nmatch,
229    regmatch_t pmatch[], int eflags)    regmatch_t pmatch[], int eflags)
230  {  {
231  int rc;  int rc;
232  int options = 0;  int options = 0;
233    int *ovector = NULL;
234    
235  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
236  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
237    
238  preg->re_erroffset = (size_t)(-1);   /* Only has meaning after compile */  preg->re_erroffset = (size_t)(-1);   /* Only has meaning after compile */
239    
240  rc = pcre_exec(preg->re_pcre, NULL, string, (int)strlen(string), options,  if (nmatch > 0)
241    (int *)pmatch, nmatch * 2);    {
242      ovector = (int *)malloc(sizeof(int) * nmatch * 3);
243      if (ovector == NULL) return REG_ESPACE;
244      }
245    
246    rc = pcre_exec(preg->re_pcre, NULL, string, (int)strlen(string), 0, options,
247      ovector, nmatch * 3);
248    
249  if (rc == 0) return 0;    /* All pmatch were filled in */  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */
250    
251  if (rc > 0)  if (rc >= 0)
252    {    {
253    size_t i;    size_t i;
254    for (i = rc; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;    for (i = 0; i < rc; i++)
255        {
256        pmatch[i].rm_so = ovector[i*2];
257        pmatch[i].rm_eo = ovector[i*2+1];
258        }
259      if (ovector != NULL) free(ovector);
260      for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;
261    return 0;    return 0;
262    }    }
263    
264  else switch(rc)  else
265    {    {
266    case PCRE_ERROR_NOMATCH: return REG_NOMATCH;    if (ovector != NULL) free(ovector);
267    case PCRE_ERROR_NULL: return REG_INVARG;    switch(rc)
268    case PCRE_ERROR_BADOPTION: return REG_INVARG;      {
269    case PCRE_ERROR_BADMAGIC: return REG_INVARG;      case PCRE_ERROR_NOMATCH: return REG_NOMATCH;
270    case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;      case PCRE_ERROR_NULL: return REG_INVARG;
271    case PCRE_ERROR_NOMEMORY: return REG_ESPACE;      case PCRE_ERROR_BADOPTION: return REG_INVARG;
272    default: return REG_ASSERT;      case PCRE_ERROR_BADMAGIC: return REG_INVARG;
273        case PCRE_ERROR_UNKNOWN_NODE: return REG_ASSERT;
274        case PCRE_ERROR_NOMEMORY: return REG_ESPACE;
275        default: return REG_ASSERT;
276        }
277    }    }
278  }  }
279    
Legend:
Removed from v.27  
changed lines
  Added in v.51
  ViewVC Help
Powered by ViewVC 1.1.5