/[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 199 by ph10, Tue Jul 31 14:39:09 2007 UTC revision 388 by ph10, Wed Mar 11 17:03:17 2009 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-2007 University of Cambridge             Copyright (c) 1997-2009 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  #ifdef HAVE_CONFIG_H
46  #include <config.h>  #include "config.h"
47  #endif  #endif
48    
49    
50  /* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for  /* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for
51  compiling these functions. This must come before including pcreposix.h, where  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  they are set for an application (using these functions) if they have not
53  previously been set. */  previously been set. */
# 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    #include "pcre.h"
61  #include "pcre_internal.h"  #include "pcre_internal.h"
62  #include "pcreposix.h"  #include "pcreposix.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. */
66    
67  static const int eint[] = {  static const int eint[] = {
# Line 123  static const int eint[] = { Line 123  static const int eint[] = {
123    REG_BADPAT,  /* repeating a DEFINE group is not allowed */    REG_BADPAT,  /* repeating a DEFINE group is not allowed */
124    REG_INVARG,  /* inconsistent NEWLINE options */    REG_INVARG,  /* inconsistent NEWLINE options */
125    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 */
126    REG_BADPAT   /* (?+ or (?- must be followed by a non-zero number */    REG_BADPAT,  /* (?+ or (?- must be followed by a non-zero number */
127      REG_BADPAT,  /* number is too big */
128      REG_BADPAT,  /* subpattern name expected */
129      REG_BADPAT,  /* digit expected after (?+ */
130      REG_BADPAT   /* ] is an invalid data character in JavaScript compatibility mode */
131  };  };
132    
133  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
# Line 156  static const char *const pstring[] = { Line 160  static const char *const pstring[] = {
160  *          Translate error code to string        *  *          Translate error code to string        *
161  *************************************************/  *************************************************/
162    
163  PCREPOSIX_EXP_DEFN size_t  PCREPOSIX_EXP_DEFN size_t PCRE_CALL_CONVENTION
164  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)
165  {  {
166  const char *message, *addmessage;  const char *message, *addmessage;
# Line 191  return length + addlength; Line 195  return length + addlength;
195  *           Free store held by a regex           *  *           Free store held by a regex           *
196  *************************************************/  *************************************************/
197    
198  PCREPOSIX_EXP_DEFN void  PCREPOSIX_EXP_DEFN void PCRE_CALL_CONVENTION
199  regfree(regex_t *preg)  regfree(regex_t *preg)
200  {  {
201  (pcre_free)(preg->re_pcre);  (pcre_free)(preg->re_pcre);
# Line 214  Returns:      0 on success Line 218  Returns:      0 on success
218                various non-zero codes on failure                various non-zero codes on failure
219  */  */
220    
221  PCREPOSIX_EXP_DEFN int  PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
222  regcomp(regex_t *preg, const char *pattern, int cflags)  regcomp(regex_t *preg, const char *pattern, int cflags)
223  {  {
224  const char *errorptr;  const char *errorptr;
# Line 256  If REG_NOSUB was specified at compile ti Line 260  If REG_NOSUB was specified at compile ti
260  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
261  the only result is yes/no/error. */  the only result is yes/no/error. */
262    
263  PCREPOSIX_EXP_DEFN int  PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
264  regexec(const regex_t *preg, const char *string, size_t nmatch,  regexec(const regex_t *preg, const char *string, size_t nmatch,
265    regmatch_t pmatch[], int eflags)    regmatch_t pmatch[], int eflags)
266  {  {
267  int rc;  int rc, so, eo;
268  int options = 0;  int options = 0;
269  int *ovector = NULL;  int *ovector = NULL;
270  int small_ovector[POSIX_MALLOC_THRESHOLD * 3];  int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
# Line 270  BOOL nosub = Line 274  BOOL nosub =
274    
275  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;  if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
276  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;  if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
277    if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY;
278    
279  ((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 */
280    
# Line 293  else if (nmatch > 0) Line 298  else if (nmatch > 0)
298      }      }
299    }    }
300    
301  rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string, (int)strlen(string),  /* REG_STARTEND is a BSD extension, to allow for non-NUL-terminated strings.
302    The man page from OS X says "REG_STARTEND affects only the location of the
303    string, not how it is matched". That is why the "so" value is used to bump the
304    start location rather than being passed as a PCRE "starting offset". */
305    
306    if ((eflags & REG_STARTEND) != 0)
307      {
308      so = pmatch[0].rm_so;
309      eo = pmatch[0].rm_eo;
310      }
311    else
312      {
313      so = 0;
314      eo = strlen(string);
315      }
316    
317    rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),
318    0, options, ovector, nmatch * 3);    0, options, ovector, nmatch * 3);
319    
320  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */

Legend:
Removed from v.199  
changed lines
  Added in v.388

  ViewVC Help
Powered by ViewVC 1.1.5