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

Diff of /code/trunk/pcre_compile.c

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

revision 210 by ph10, Wed Aug 8 14:24:50 2007 UTC revision 264 by ph10, Tue Nov 13 11:07:16 2007 UTC
# Line 43  supporting internal functions that are n Line 43  supporting internal functions that are n
43    
44    
45  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
46  #include <config.h>  #include "config.h"
47  #endif  #endif
48    
49  #define NLBLOCK cd             /* Block containing newline information */  #define NLBLOCK cd             /* Block containing newline information */
# Line 140  static const short int escapes[] = { Line 140  static const short int escapes[] = {
140  #endif  #endif
141    
142    
143  /* Table of special "verbs" like (*PRUNE) */  /* Table of special "verbs" like (*PRUNE). This is a short table, so it is
144    searched linearly. Put all the names into a single string, in order to reduce
145    the number of relocations when a shared library is dynamically linked. */
146    
147  typedef struct verbitem {  typedef struct verbitem {
   const char *name;  
148    int   len;    int   len;
149    int   op;    int   op;
150  } verbitem;  } verbitem;
151    
152    static const char verbnames[] =
153      "ACCEPT\0"
154      "COMMIT\0"
155      "F\0"
156      "FAIL\0"
157      "PRUNE\0"
158      "SKIP\0"
159      "THEN";
160    
161  static verbitem verbs[] = {  static verbitem verbs[] = {
162    { "ACCEPT", 6, OP_ACCEPT },    { 6, OP_ACCEPT },
163    { "COMMIT", 6, OP_COMMIT },    { 6, OP_COMMIT },
164    { "F",      1, OP_FAIL },    { 1, OP_FAIL },
165    { "FAIL",   4, OP_FAIL },    { 4, OP_FAIL },
166    { "PRUNE",  5, OP_PRUNE },    { 5, OP_PRUNE },
167    { "SKIP",   4, OP_SKIP  },    { 4, OP_SKIP  },
168    { "THEN",   4, OP_THEN  }    { 4, OP_THEN  }
169  };  };
170    
171  static int verbcount = sizeof(verbs)/sizeof(verbitem);  static int verbcount = sizeof(verbs)/sizeof(verbitem);
172    
173    
174  /* Tables of names of POSIX character classes and their lengths. The list is  /* Tables of names of POSIX character classes and their lengths. The names are
175  terminated by a zero length entry. The first three must be alpha, lower, upper,  now all in a single string, to reduce the number of relocations when a shared
176  as this is assumed for handling case independence. */  library is dynamically loaded. The list of lengths is terminated by a zero
177    length entry. The first three must be alpha, lower, upper, as this is assumed
178  static const char *const posix_names[] = {  for handling case independence. */
179    "alpha", "lower", "upper",  
180    "alnum", "ascii", "blank", "cntrl", "digit", "graph",  static const char posix_names[] =
181    "print", "punct", "space", "word",  "xdigit" };    "alpha\0"  "lower\0"  "upper\0"  "alnum\0"  "ascii\0"  "blank\0"
182      "cntrl\0"  "digit\0"  "graph\0"  "print\0"  "punct\0"  "space\0"
183      "word\0"   "xdigit";
184    
185  static const uschar posix_name_lengths[] = {  static const uschar posix_name_lengths[] = {
186    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
# Line 207  static const int posix_class_maps[] = { Line 219  static const int posix_class_maps[] = {
219  /* The texts of compile-time error messages. These are "char *" because they  /* The texts of compile-time error messages. These are "char *" because they
220  are passed to the outside world. Do not ever re-use any error number, because  are passed to the outside world. Do not ever re-use any error number, because
221  they are documented. Always add a new error instead. Messages marked DEAD below  they are documented. Always add a new error instead. Messages marked DEAD below
222  are no longer used. */  are no longer used. This used to be a table of strings, but in order to reduce
223    the number of relocations needed when a shared library is loaded dynamically,
224  static const char *error_texts[] = {  it is now one long string. We cannot use a table of offsets, because the
225    "no error",  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
226    "\\ at end of pattern",  simply count through to the one we want - this isn't a performance issue
227    "\\c at end of pattern",  because these strings are used only when there is a compilation error. */
228    "unrecognized character follows \\",  
229    "numbers out of order in {} quantifier",  static const char error_texts[] =
230      "no error\0"
231      "\\ at end of pattern\0"
232      "\\c at end of pattern\0"
233      "unrecognized character follows \\\0"
234      "numbers out of order in {} quantifier\0"
235    /* 5 */    /* 5 */
236    "number too big in {} quantifier",    "number too big in {} quantifier\0"
237    "missing terminating ] for character class",    "missing terminating ] for character class\0"
238    "invalid escape sequence in character class",    "invalid escape sequence in character class\0"
239    "range out of order in character class",    "range out of order in character class\0"
240    "nothing to repeat",    "nothing to repeat\0"
241    /* 10 */    /* 10 */
242    "operand of unlimited repeat could match the empty string",  /** DEAD **/    "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
243    "internal error: unexpected repeat",    "internal error: unexpected repeat\0"
244    "unrecognized character after (?",    "unrecognized character after (?\0"
245    "POSIX named classes are supported only within a class",    "POSIX named classes are supported only within a class\0"
246    "missing )",    "missing )\0"
247    /* 15 */    /* 15 */
248    "reference to non-existent subpattern",    "reference to non-existent subpattern\0"
249    "erroffset passed as NULL",    "erroffset passed as NULL\0"
250    "unknown option bit(s) set",    "unknown option bit(s) set\0"
251    "missing ) after comment",    "missing ) after comment\0"
252    "parentheses nested too deeply",  /** DEAD **/    "parentheses nested too deeply\0"  /** DEAD **/
253    /* 20 */    /* 20 */
254    "regular expression is too large",    "regular expression is too large\0"
255    "failed to get memory",    "failed to get memory\0"
256    "unmatched parentheses",    "unmatched parentheses\0"
257    "internal error: code overflow",    "internal error: code overflow\0"
258    "unrecognized character after (?<",    "unrecognized character after (?<\0"
259    /* 25 */    /* 25 */
260    "lookbehind assertion is not fixed length",    "lookbehind assertion is not fixed length\0"
261    "malformed number or name after (?(",    "malformed number or name after (?(\0"
262    "conditional group contains more than two branches",    "conditional group contains more than two branches\0"
263    "assertion expected after (?(",    "assertion expected after (?(\0"
264    "(?R or (?[+-]digits must be followed by )",    "(?R or (?[+-]digits must be followed by )\0"
265    /* 30 */    /* 30 */
266    "unknown POSIX class name",    "unknown POSIX class name\0"
267    "POSIX collating elements are not supported",    "POSIX collating elements are not supported\0"
268    "this version of PCRE is not compiled with PCRE_UTF8 support",    "this version of PCRE is not compiled with PCRE_UTF8 support\0"
269    "spare error",  /** DEAD **/    "spare error\0"  /** DEAD **/
270    "character value in \\x{...} sequence is too large",    "character value in \\x{...} sequence is too large\0"
271    /* 35 */    /* 35 */
272    "invalid condition (?(0)",    "invalid condition (?(0)\0"
273    "\\C not allowed in lookbehind assertion",    "\\C not allowed in lookbehind assertion\0"
274    "PCRE does not support \\L, \\l, \\N, \\U, or \\u",    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
275    "number after (?C is > 255",    "number after (?C is > 255\0"
276    "closing ) for (?C expected",    "closing ) for (?C expected\0"
277    /* 40 */    /* 40 */
278    "recursive call could loop indefinitely",    "recursive call could loop indefinitely\0"
279    "unrecognized character after (?P",    "unrecognized character after (?P\0"
280    "syntax error in subpattern name (missing terminator)",    "syntax error in subpattern name (missing terminator)\0"
281    "two named subpatterns have the same name",    "two named subpatterns have the same name\0"
282    "invalid UTF-8 string",    "invalid UTF-8 string\0"
283    /* 45 */    /* 45 */
284    "support for \\P, \\p, and \\X has not been compiled",    "support for \\P, \\p, and \\X has not been compiled\0"
285    "malformed \\P or \\p sequence",    "malformed \\P or \\p sequence\0"
286    "unknown property name after \\P or \\p",    "unknown property name after \\P or \\p\0"
287    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)",    "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
288    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")",    "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
289    /* 50 */    /* 50 */
290    "repeated subpattern is too long",    /** DEAD **/    "repeated subpattern is too long\0"    /** DEAD **/
291    "octal value is greater than \\377 (not in UTF-8 mode)",    "octal value is greater than \\377 (not in UTF-8 mode)\0"
292    "internal error: overran compiling workspace",    "internal error: overran compiling workspace\0"
293    "internal error: previously-checked referenced subpattern not found",    "internal error: previously-checked referenced subpattern not found\0"
294    "DEFINE group contains more than one branch",    "DEFINE group contains more than one branch\0"
295    /* 55 */    /* 55 */
296    "repeating a DEFINE group is not allowed",    "repeating a DEFINE group is not allowed\0"
297    "inconsistent NEWLINE options",    "inconsistent NEWLINE options\0"
298    "\\g is not followed by a braced name or an optionally braced non-zero number",    "\\g is not followed by a braced name or an optionally braced non-zero number\0"
299    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number",    "(?+ or (?- or (?(+ or (?(- must be followed by a non-zero number\0"
300    "(*VERB) with an argument is not supported",    "(*VERB) with an argument is not supported\0"
301    /* 60 */    /* 60 */
302    "(*VERB) not recognized"    "(*VERB) not recognized\0"
303  };    "number is too big";
304    
305    
306  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 419  static BOOL Line 436  static BOOL
436    
437    
438  /*************************************************  /*************************************************
439    *            Find an error text                  *
440    *************************************************/
441    
442    /* The error texts are now all in one long string, to save on relocations. As
443    some of the text is of unknown length, we can't use a table of offsets.
444    Instead, just count through the strings. This is not a performance issue
445    because it happens only when there has been a compilation error.
446    
447    Argument:   the error number
448    Returns:    pointer to the error string
449    */
450    
451    static const char *
452    find_error_text(int n)
453    {
454    const char *s = error_texts;
455    for (; n > 0; n--) while (*s++ != 0);
456    return s;
457    }
458    
459    
460    /*************************************************
461  *            Handle escapes                      *  *            Handle escapes                      *
462  *************************************************/  *************************************************/
463    
# Line 439  Arguments: Line 478  Arguments:
478    
479  Returns:         zero or positive => a data character  Returns:         zero or positive => a data character
480                   negative => a special escape sequence                   negative => a special escape sequence
481                   on error, errorptr is set                   on error, errorcodeptr is set
482  */  */
483    
484  static int  static int
# Line 524  else Line 563  else
563      while ((digitab[ptr[1]] & ctype_digit) != 0)      while ((digitab[ptr[1]] & ctype_digit) != 0)
564        c = c * 10 + *(++ptr) - '0';        c = c * 10 + *(++ptr) - '0';
565    
566        if (c < 0)
567          {
568          *errorcodeptr = ERR61;
569          break;
570          }
571    
572      if (c == 0 || (braced && *(++ptr) != '}'))      if (c == 0 || (braced && *(++ptr) != '}'))
573        {        {
574        *errorcodeptr = ERR57;        *errorcodeptr = ERR57;
575        return 0;        break;
576        }        }
577    
578      if (negated)      if (negated)
# Line 535  else Line 580  else
580        if (c > bracount)        if (c > bracount)
581          {          {
582          *errorcodeptr = ERR15;          *errorcodeptr = ERR15;
583          return 0;          break;
584          }          }
585        c = bracount - (c - 1);        c = bracount - (c - 1);
586        }        }
# Line 564  else Line 609  else
609        c -= '0';        c -= '0';
610        while ((digitab[ptr[1]] & ctype_digit) != 0)        while ((digitab[ptr[1]] & ctype_digit) != 0)
611          c = c * 10 + *(++ptr) - '0';          c = c * 10 + *(++ptr) - '0';
612          if (c < 0)
613            {
614            *errorcodeptr = ERR61;
615            break;
616            }
617        if (c < 10 || c <= bracount)        if (c < 10 || c <= bracount)
618          {          {
619          c = -(ESC_REF + c);          c = -(ESC_REF + c);
# Line 659  else Line 709  else
709      if (c == 0)      if (c == 0)
710        {        {
711        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
712        return 0;        break;
713        }        }
714    
715  #ifndef EBCDIC  /* ASCII coding */  #ifndef EBCDIC  /* ASCII coding */
# Line 764  top = _pcre_utt_size; Line 814  top = _pcre_utt_size;
814  while (bot < top)  while (bot < top)
815    {    {
816    i = (bot + top) >> 1;    i = (bot + top) >> 1;
817    c = strcmp(name, _pcre_utt[i].name);    c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
818    if (c == 0)    if (c == 0)
819      {      {
820      *dptr = _pcre_utt[i].value;      *dptr = _pcre_utt[i].value;
# Line 938  for (; *ptr != 0; ptr++) Line 988  for (; *ptr != 0; ptr++)
988      {      {
989      while (*(++ptr) != ']')      while (*(++ptr) != ']')
990        {        {
991          if (*ptr == 0) return -1;
992        if (*ptr == '\\')        if (*ptr == '\\')
993          {          {
994          if (*(++ptr) == 0) return -1;          if (*(++ptr) == 0) return -1;
# Line 1093  for (;;) Line 1144  for (;;)
1144    {    {
1145    int d;    int d;
1146    register int op = *cc;    register int op = *cc;
   
1147    switch (op)    switch (op)
1148      {      {
1149      case OP_CBRA:      case OP_CBRA:
# Line 1182  for (;;) Line 1232  for (;;)
1232    
1233      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1234      branchlength += GET2(cc,1);      branchlength += GET2(cc,1);
1235        if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
1236      cc += 4;      cc += 4;
1237      break;      break;
1238    
# Line 1290  for (;;) Line 1341  for (;;)
1341      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1342      }      }
1343    
1344    /* In UTF-8 mode, opcodes that are followed by a character may be followed by    /* Otherwise, we can get the item's length from the table, except that for
1345    a multi-byte character. The length in the table is a minimum, so we have to    repeated character types, we have to test for \p and \P, which have an extra
1346    arrange to skip the extra bytes. */    two bytes of parameters. */
1347    
1348    else    else
1349      {      {
1350        switch(c)
1351          {
1352          case OP_TYPESTAR:
1353          case OP_TYPEMINSTAR:
1354          case OP_TYPEPLUS:
1355          case OP_TYPEMINPLUS:
1356          case OP_TYPEQUERY:
1357          case OP_TYPEMINQUERY:
1358          case OP_TYPEPOSSTAR:
1359          case OP_TYPEPOSPLUS:
1360          case OP_TYPEPOSQUERY:
1361          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1362          break;
1363    
1364          case OP_TYPEUPTO:
1365          case OP_TYPEMINUPTO:
1366          case OP_TYPEEXACT:
1367          case OP_TYPEPOSUPTO:
1368          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1369          break;
1370          }
1371    
1372        /* Add in the fixed length from the table */
1373    
1374      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1375    
1376      /* In UTF-8 mode, opcodes that are followed by a character may be followed by
1377      a multi-byte character. The length in the table is a minimum, so we have to
1378      arrange to skip the extra bytes. */
1379    
1380  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1381      if (utf8) switch(c)      if (utf8) switch(c)
1382        {        {
# Line 1354  for (;;) Line 1434  for (;;)
1434    
1435    if (c == OP_XCLASS) code += GET(code, 1);    if (c == OP_XCLASS) code += GET(code, 1);
1436    
1437    /* Otherwise, we get the item's length from the table. In UTF-8 mode, opcodes    /* Otherwise, we can get the item's length from the table, except that for
1438    that are followed by a character may be followed by a multi-byte character.    repeated character types, we have to test for \p and \P, which have an extra
1439    The length in the table is a minimum, so we have to arrange to skip the extra    two bytes of parameters. */
   bytes. */  
1440    
1441    else    else
1442      {      {
1443        switch(c)
1444          {
1445          case OP_TYPESTAR:
1446          case OP_TYPEMINSTAR:
1447          case OP_TYPEPLUS:
1448          case OP_TYPEMINPLUS:
1449          case OP_TYPEQUERY:
1450          case OP_TYPEMINQUERY:
1451          case OP_TYPEPOSSTAR:
1452          case OP_TYPEPOSPLUS:
1453          case OP_TYPEPOSQUERY:
1454          if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1455          break;
1456    
1457          case OP_TYPEPOSUPTO:
1458          case OP_TYPEUPTO:
1459          case OP_TYPEMINUPTO:
1460          case OP_TYPEEXACT:
1461          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1462          break;
1463          }
1464    
1465        /* Add in the fixed length from the table */
1466    
1467      code += _pcre_OP_lengths[c];      code += _pcre_OP_lengths[c];
1468    
1469        /* In UTF-8 mode, opcodes that are followed by a character may be followed
1470        by a multi-byte character. The length in the table is a minimum, so we have
1471        to arrange to skip the extra bytes. */
1472    
1473  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1474      if (utf8) switch(c)      if (utf8) switch(c)
1475        {        {
# Line 1457  for (code = first_significant_code(code Line 1565  for (code = first_significant_code(code
1565    
1566    switch (c)    switch (c)
1567      {      {
1568      /* Check for quantifiers after a class */      /* Check for quantifiers after a class. XCLASS is used for classes that
1569        cannot be represented just by a bit map. This includes negated single
1570        high-valued characters. The length in _pcre_OP_lengths[] is zero; the
1571        actual length is stored in the compiled code, so we must update "code"
1572        here. */
1573    
1574  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
1575      case OP_XCLASS:      case OP_XCLASS:
1576      ccode = code + GET(code, 1);      ccode = code += GET(code, 1);
1577      goto CHECK_CLASS_REPEAT;      goto CHECK_CLASS_REPEAT;
1578  #endif  #endif
1579    
# Line 1523  for (code = first_significant_code(code Line 1635  for (code = first_significant_code(code
1635      case OP_TYPEEXACT:      case OP_TYPEEXACT:
1636      return FALSE;      return FALSE;
1637    
1638        /* These are going to continue, as they may be empty, but we have to
1639        fudge the length for the \p and \P cases. */
1640    
1641        case OP_TYPESTAR:
1642        case OP_TYPEMINSTAR:
1643        case OP_TYPEPOSSTAR:
1644        case OP_TYPEQUERY:
1645        case OP_TYPEMINQUERY:
1646        case OP_TYPEPOSQUERY:
1647        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1648        break;
1649    
1650        /* Same for these */
1651    
1652        case OP_TYPEUPTO:
1653        case OP_TYPEMINUPTO:
1654        case OP_TYPEPOSUPTO:
1655        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1656        break;
1657    
1658      /* End of branch */      /* End of branch */
1659    
1660      case OP_KET:      case OP_KET:
# Line 1639  Returns:     a value representing the na Line 1771  Returns:     a value representing the na
1771  static int  static int
1772  check_posix_name(const uschar *ptr, int len)  check_posix_name(const uschar *ptr, int len)
1773  {  {
1774    const char *pn = posix_names;
1775  register int yield = 0;  register int yield = 0;
1776  while (posix_name_lengths[yield] != 0)  while (posix_name_lengths[yield] != 0)
1777    {    {
1778    if (len == posix_name_lengths[yield] &&    if (len == posix_name_lengths[yield] &&
1779      strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;      strncmp((const char *)ptr, pn, len) == 0) return yield;
1780      pn += posix_name_lengths[yield] + 1;
1781    yield++;    yield++;
1782    }    }
1783  return -1;  return -1;
# Line 1685  adjust_recurse(uschar *group, int adjust Line 1819  adjust_recurse(uschar *group, int adjust
1819    uschar *save_hwm)    uschar *save_hwm)
1820  {  {
1821  uschar *ptr = group;  uschar *ptr = group;
1822    
1823  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)  while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
1824    {    {
1825    int offset;    int offset;
# Line 2248  req_caseopt = ((options & PCRE_CASELESS) Line 2383  req_caseopt = ((options & PCRE_CASELESS)
2383  for (;; ptr++)  for (;; ptr++)
2384    {    {
2385    BOOL negate_class;    BOOL negate_class;
2386      BOOL should_flip_negation;
2387    BOOL possessive_quantifier;    BOOL possessive_quantifier;
2388    BOOL is_quantifier;    BOOL is_quantifier;
2389    BOOL is_recurse;    BOOL is_recurse;
# Line 2496  for (;; ptr++) Line 2632  for (;; ptr++)
2632        else break;        else break;
2633        }        }
2634    
2635        /* If a class contains a negative special such as \S, we need to flip the
2636        negation flag at the end, so that support for characters > 255 works
2637        correctly (they are all included in the class). */
2638    
2639        should_flip_negation = FALSE;
2640    
2641      /* Keep a count of chars with values < 256 so that we can optimize the case      /* Keep a count of chars with values < 256 so that we can optimize the case
2642      of just a single character (as long as it's < 256). However, For higher      of just a single character (as long as it's < 256). However, For higher
2643      valued UTF-8 characters, we don't yet do any optimization. */      valued UTF-8 characters, we don't yet do any optimization. */
# Line 2654  for (;; ptr++) Line 2796  for (;; ptr++)
2796            else inescq = TRUE;            else inescq = TRUE;
2797            continue;            continue;
2798            }            }
2799            else if (-c == ESC_E) continue;  /* Ignore orphan \E */
2800    
2801          if (c < 0)          if (c < 0)
2802            {            {
# Line 2669  for (;; ptr++) Line 2812  for (;; ptr++)
2812              continue;              continue;
2813    
2814              case ESC_D:              case ESC_D:
2815                should_flip_negation = TRUE;
2816              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
2817              continue;              continue;
2818    
# Line 2677  for (;; ptr++) Line 2821  for (;; ptr++)
2821              continue;              continue;
2822    
2823              case ESC_W:              case ESC_W:
2824                should_flip_negation = TRUE;
2825              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
2826              continue;              continue;
2827    
# Line 2686  for (;; ptr++) Line 2831  for (;; ptr++)
2831              continue;              continue;
2832    
2833              case ESC_S:              case ESC_S:
2834                should_flip_negation = TRUE;
2835              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];              for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
2836              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
2837              continue;              continue;
# Line 2880  for (;; ptr++) Line 3026  for (;; ptr++)
3026    
3027        oldptr = ptr;        oldptr = ptr;
3028    
3029          /* Remember \r or \n */
3030    
3031          if (c == '\r' || c == '\n') cd->external_flags |= PCRE_HASCRORLF;
3032    
3033          /* Check for range */
3034    
3035        if (!inescq && ptr[1] == '-')        if (!inescq && ptr[1] == '-')
3036          {          {
3037          int d;          int d;
# Line 2947  for (;; ptr++) Line 3099  for (;; ptr++)
3099    
3100          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */          if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
3101    
3102            /* Remember \r or \n */
3103    
3104            if (d == '\r' || d == '\n') cd->external_flags |= PCRE_HASCRORLF;
3105    
3106          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless          /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
3107          matching, we have to use an XCLASS with extra data items. Caseless          matching, we have to use an XCLASS with extra data items. Caseless
3108          matching for characters > 127 is available only if UCP support is          matching for characters > 127 is available only if UCP support is
# Line 3100  for (;; ptr++) Line 3256  for (;; ptr++)
3256        goto FAILED;        goto FAILED;
3257        }        }
3258    
3259    
3260    /* This code has been disabled because it would mean that \s counts as
3261    an explicit \r or \n reference, and that's not really what is wanted. Now
3262    we set the flag only if there is a literal "\r" or "\n" in the class. */
3263    
3264    #if 0
3265        /* Remember whether \r or \n are in this class */
3266    
3267        if (negate_class)
3268          {
3269          if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
3270          }
3271        else
3272          {
3273          if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
3274          }
3275    #endif
3276    
3277    
3278      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
3279      less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we      less than 256. As long as there were no characters >= 128 and there was no
3280      can optimize the negative case only if there were no characters >= 128      use of \p or \P, in other words, no use of any XCLASS features, we can
3281      because OP_NOT and the related opcodes like OP_NOTSTAR operate on      optimize.
3282      single-bytes only. This is an historical hangover. Maybe one day we can  
3283      tidy these opcodes to handle multi-byte characters.      In UTF-8 mode, we can optimize the negative case only if there were no
3284        characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
3285        operate on single-bytes only. This is an historical hangover. Maybe one day
3286        we can tidy these opcodes to handle multi-byte characters.
3287    
3288      The optimization throws away the bit map. We turn the item into a      The optimization throws away the bit map. We turn the item into a
3289      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
# Line 3115  for (;; ptr++) Line 3293  for (;; ptr++)
3293      reqbyte, save the previous value for reinstating. */      reqbyte, save the previous value for reinstating. */
3294    
3295  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3296      if (class_charcount == 1 &&      if (class_charcount == 1 && !class_utf8 &&
3297            (!utf8 ||        (!utf8 || !negate_class || class_lastchar < 128))
           (!class_utf8 && (!negate_class || class_lastchar < 128))))  
   
3298  #else  #else
3299      if (class_charcount == 1)      if (class_charcount == 1)
3300  #endif  #endif
# Line 3161  for (;; ptr++) Line 3337  for (;; ptr++)
3337      zeroreqbyte = reqbyte;      zeroreqbyte = reqbyte;
3338    
3339      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
3340      extended class, with its own opcode. If there are no characters < 256,      extended class, with its own opcode, unless there was a negated special
3341      we can omit the bitmap in the actual compiled code. */      such as \S in the class, because in that case all characters > 255 are in
3342        the class, so any that were explicitly given as well can be ignored. If
3343        (when there are explicit characters > 255 that must be listed) there are no
3344        characters < 256, we can omit the bitmap in the actual compiled code. */
3345    
3346  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3347      if (class_utf8)      if (class_utf8 && !should_flip_negation)
3348        {        {
3349        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
3350        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 3191  for (;; ptr++) Line 3370  for (;; ptr++)
3370        }        }
3371  #endif  #endif
3372    
3373      /* If there are no characters > 255, negate the 32-byte map if necessary,      /* If there are no characters > 255, set the opcode to OP_CLASS or
3374      and copy it into the code vector. If this is the first thing in the branch,      OP_NCLASS, depending on whether the whole class was negated and whether
3375      there can be no first char setting, whatever the repeat count. Any reqbyte      there were negative specials such as \S in the class. Then copy the 32-byte
3376      setting must remain unchanged after any kind of repeat. */      map into the code vector, negating it if necessary. */
3377    
3378        *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
3379      if (negate_class)      if (negate_class)
3380        {        {
       *code++ = OP_NCLASS;  
3381        if (lengthptr == NULL)    /* Save time in the pre-compile phase */        if (lengthptr == NULL)    /* Save time in the pre-compile phase */
3382          for (c = 0; c < 32; c++) code[c] = ~classbits[c];          for (c = 0; c < 32; c++) code[c] = ~classbits[c];
3383        }        }
3384      else      else
3385        {        {
       *code++ = OP_CLASS;  
3386        memcpy(code, classbits, 32);        memcpy(code, classbits, 32);
3387        }        }
3388      code += 32;      code += 32;
# Line 3390  for (;; ptr++) Line 3568  for (;; ptr++)
3568        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3569        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3570    
3571        if (repeat_max != 1) cd->nopartial = TRUE;        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
3572    
3573        /* Combine the op_type with the repeat_type */        /* Combine the op_type with the repeat_type */
3574    
# Line 3540  for (;; ptr++) Line 3718  for (;; ptr++)
3718        /* All real repeats make it impossible to handle partial matching (maybe        /* All real repeats make it impossible to handle partial matching (maybe
3719        one day we will be able to remove this restriction). */        one day we will be able to remove this restriction). */
3720    
3721        if (repeat_max != 1) cd->nopartial = TRUE;        if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
3722    
3723        if (repeat_min == 0 && repeat_max == -1)        if (repeat_min == 0 && repeat_max == -1)
3724          *code++ = OP_CRSTAR + repeat_type;          *code++ = OP_CRSTAR + repeat_type;
# Line 3892  for (;; ptr++) Line 4070  for (;; ptr++)
4070      bravalue = OP_CBRA;      bravalue = OP_CBRA;
4071      save_hwm = cd->hwm;      save_hwm = cd->hwm;
4072      reset_bracount = FALSE;      reset_bracount = FALSE;
4073    
4074      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4075    
4076      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == '*' && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
4077        {        {
4078        int i, namelen;        int i, namelen;
4079          const char *vn = verbnames;
4080        const uschar *name = ++ptr;        const uschar *name = ++ptr;
4081        previous = NULL;        previous = NULL;
4082        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);        while ((cd->ctypes[*++ptr] & ctype_letter) != 0);
4083        if (*ptr == ':')        if (*ptr == ':')
4084          {          {
4085          *errorcodeptr = ERR59;   /* Not supported */          *errorcodeptr = ERR59;   /* Not supported */
4086          goto FAILED;          goto FAILED;
4087          }          }
4088        if (*ptr != ')')        if (*ptr != ')')
4089          {          {
4090          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
4091          goto FAILED;          goto FAILED;
4092          }          }
4093        namelen = ptr - name;        namelen = ptr - name;
4094        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
4095          {          {
4096          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
4097              strncmp((char *)name, verbs[i].name, namelen) == 0)              strncmp((char *)name, vn, namelen) == 0)
4098            {            {
4099            *code = verbs[i].op;            *code = verbs[i].op;
4100            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;            if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
4101            break;            break;
4102            }            }
4103          }          vn += verbs[i].len + 1;
4104        if (i < verbcount) continue;          }
4105          if (i < verbcount) continue;
4106        *errorcodeptr = ERR60;        *errorcodeptr = ERR60;
4107        goto FAILED;        goto FAILED;
4108        }        }
4109    
4110      /* Deal with the extended parentheses; all are introduced by '?', and the      /* Deal with the extended parentheses; all are introduced by '?', and the
4111      appearance of any of them means that this is not a capturing group. */      appearance of any of them means that this is not a capturing group. */
4112    
# Line 4176  for (;; ptr++) Line 4356  for (;; ptr++)
4356          if (*ptr == ')')          /* Optimize (?!) */          if (*ptr == ')')          /* Optimize (?!) */
4357            {            {
4358            *code++ = OP_FAIL;            *code++ = OP_FAIL;
4359            previous = NULL;            previous = NULL;
4360            continue;            continue;
4361            }            }
4362          bravalue = OP_ASSERT_NOT;          bravalue = OP_ASSERT_NOT;
4363          break;          break;
4364    
# Line 4537  for (;; ptr++) Line 4717  for (;; ptr++)
4717    
4718              case 'J':    /* Record that it changed in the external options */              case 'J':    /* Record that it changed in the external options */
4719              *optset |= PCRE_DUPNAMES;              *optset |= PCRE_DUPNAMES;
4720              cd->external_options |= PCRE_JCHANGED;              cd->external_flags |= PCRE_JCHANGED;
4721              break;              break;
4722    
4723              case 'i': *optset |= PCRE_CASELESS; break;              case 'i': *optset |= PCRE_CASELESS; break;
# Line 4728  for (;; ptr++) Line 4908  for (;; ptr++)
4908        goto FAILED;        goto FAILED;
4909        }        }
4910    
4911      /* In the pre-compile phase, update the length by the length of the nested      /* In the pre-compile phase, update the length by the length of the group,
4912      group, less the brackets at either end. Then reduce the compiled code to      less the brackets at either end. Then reduce the compiled code to just a
4913      just the brackets so that it doesn't use much memory if it is duplicated by      set of non-capturing brackets so that it doesn't use much memory if it is
4914      a quantifier. */      duplicated by a quantifier.*/
4915    
4916      if (lengthptr != NULL)      if (lengthptr != NULL)
4917        {        {
# Line 4741  for (;; ptr++) Line 4921  for (;; ptr++)
4921          goto FAILED;          goto FAILED;
4922          }          }
4923        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;        *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
4924        code++;        *code++ = OP_BRA;
4925        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
4926        *code++ = OP_KET;        *code++ = OP_KET;
4927        PUTINC(code, 0, 1 + LINK_SIZE);        PUTINC(code, 0, 1 + LINK_SIZE);
4928          break;    /* No need to waste time with special character handling */
4929        }        }
4930    
4931      /* Otherwise update the main code pointer to the end of the group. */      /* Otherwise update the main code pointer to the end of the group. */
4932    
4933      else code = tempcode;      code = tempcode;
4934    
4935      /* For a DEFINE group, required and first character settings are not      /* For a DEFINE group, required and first character settings are not
4936      relevant. */      relevant. */
# Line 4953  for (;; ptr++) Line 5134  for (;; ptr++)
5134      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;      *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
5135      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];      for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
5136    
5137        /* Remember if \r or \n were seen */
5138    
5139        if (mcbuffer[0] == '\r' || mcbuffer[0] == '\n')
5140          cd->external_flags |= PCRE_HASCRORLF;
5141    
5142      /* Set the first and required bytes appropriately. If no previous first      /* Set the first and required bytes appropriately. If no previous first
5143      byte, set it from this character, but revert to none on a zero repeat.      byte, set it from this character, but revert to none on a zero repeat.
5144      Otherwise, leave the firstbyte value alone, and don't change it on a zero      Otherwise, leave the firstbyte value alone, and don't change it on a zero
# Line 5552  real_pcre *re; Line 5738  real_pcre *re;
5738  int length = 1;  /* For final END opcode */  int length = 1;  /* For final END opcode */
5739  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
5740  int errorcode = 0;  int errorcode = 0;
5741    int skipatstart = 0;
5742  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
5743  BOOL utf8;  BOOL utf8;
5744  #endif  #endif
# Line 5630  cd->fcc = tables + fcc_offset; Line 5817  cd->fcc = tables + fcc_offset;
5817  cd->cbits = tables + cbits_offset;  cd->cbits = tables + cbits_offset;
5818  cd->ctypes = tables + ctypes_offset;  cd->ctypes = tables + ctypes_offset;
5819    
5820    /* Check for global one-time settings at the start of the pattern, and remember
5821    the offset for later. */
5822    
5823    while (ptr[skipatstart] == '(' && ptr[skipatstart+1] == '*')
5824      {
5825      int newnl = 0;
5826      int newbsr = 0;
5827    
5828      if (strncmp((char *)(ptr+skipatstart+2), "CR)", 3) == 0)
5829        { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
5830      else if (strncmp((char *)(ptr+skipatstart+2), "LF)", 3)  == 0)
5831        { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
5832      else if (strncmp((char *)(ptr+skipatstart+2), "CRLF)", 5)  == 0)
5833        { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
5834      else if (strncmp((char *)(ptr+skipatstart+2), "ANY)", 4) == 0)
5835        { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
5836      else if (strncmp((char *)(ptr+skipatstart+2), "ANYCRLF)", 8)  == 0)
5837        { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
5838    
5839      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_ANYCRLF)", 12) == 0)
5840        { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
5841      else if (strncmp((char *)(ptr+skipatstart+2), "BSR_UNICODE)", 12) == 0)
5842        { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
5843    
5844      if (newnl != 0)
5845        options = (options & ~PCRE_NEWLINE_BITS) | newnl;
5846      else if (newbsr != 0)
5847        options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
5848      else break;
5849      }
5850    
5851    /* Check validity of \R options. */
5852    
5853    switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
5854      {
5855      case 0:
5856      case PCRE_BSR_ANYCRLF:
5857      case PCRE_BSR_UNICODE:
5858      break;
5859      default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
5860      }
5861    
5862  /* Handle different types of newline. The three bits give seven cases. The  /* Handle different types of newline. The three bits give seven cases. The
5863  current code allows for fixed one- or two-byte sequences, plus "any" and  current code allows for fixed one- or two-byte sequences, plus "any" and
5864  "anycrlf". */  "anycrlf". */
5865    
5866  switch (options & (PCRE_NEWLINE_CRLF | PCRE_NEWLINE_ANY))  switch (options & PCRE_NEWLINE_BITS)
5867    {    {
5868    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Build-time default */
5869    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = '\r'; break;
5870    case PCRE_NEWLINE_LF: newline = '\n'; break;    case PCRE_NEWLINE_LF: newline = '\n'; break;
5871    case PCRE_NEWLINE_CR+    case PCRE_NEWLINE_CR+
# Line 5699  cd->hwm = cworkspace; Line 5928  cd->hwm = cworkspace;
5928  cd->start_pattern = (const uschar *)pattern;  cd->start_pattern = (const uschar *)pattern;
5929  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));  cd->end_pattern = (const uschar *)(pattern + strlen(pattern));
5930  cd->req_varyopt = 0;  cd->req_varyopt = 0;
 cd->nopartial = FALSE;  
5931  cd->external_options = options;  cd->external_options = options;
5932    cd->external_flags = 0;
5933    
5934  /* Now do the pre-compile. On error, errorcode will be set non-zero, so we  /* Now do the pre-compile. On error, errorcode will be set non-zero, so we
5935  don't need to look at the result of the function here. The initial options have  don't need to look at the result of the function here. The initial options have
# Line 5708  been put into the cd block so that they Line 5937  been put into the cd block so that they
5937  found within the regex right at the beginning. Bringing initial option settings  found within the regex right at the beginning. Bringing initial option settings
5938  outside can help speed up starting point checks. */  outside can help speed up starting point checks. */
5939    
5940    ptr += skipatstart;
5941  code = cworkspace;  code = cworkspace;
5942  *code = OP_BRA;  *code = OP_BRA;
5943  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,  (void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,
# Line 5738  if (re == NULL) Line 5968  if (re == NULL)
5968    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN;
5969    }    }
5970    
5971  /* Put in the magic number, and save the sizes, initial options, and character  /* Put in the magic number, and save the sizes, initial options, internal
5972  table pointer. NULL is used for the default character tables. The nullpad field  flags, and character table pointer. NULL is used for the default character
5973  is at the end; it's there to help in the case when a regex compiled on a system  tables. The nullpad field is at the end; it's there to help in the case when a
5974  with 4-byte pointers is run on another with 8-byte pointers. */  regex compiled on a system with 4-byte pointers is run on another with 8-byte
5975    pointers. */
5976    
5977  re->magic_number = MAGIC_NUMBER;  re->magic_number = MAGIC_NUMBER;
5978  re->size = size;  re->size = size;
5979  re->options = cd->external_options;  re->options = cd->external_options;
5980    re->flags = cd->external_flags;
5981  re->dummy1 = 0;  re->dummy1 = 0;
5982  re->first_byte = 0;  re->first_byte = 0;
5983  re->req_byte = 0;  re->req_byte = 0;
# Line 5770  codestart = cd->name_table + re->name_en Line 6002  codestart = cd->name_table + re->name_en
6002  cd->start_code = codestart;  cd->start_code = codestart;
6003  cd->hwm = cworkspace;  cd->hwm = cworkspace;
6004  cd->req_varyopt = 0;  cd->req_varyopt = 0;
 cd->nopartial = FALSE;  
6005  cd->had_accept = FALSE;  cd->had_accept = FALSE;
6006    
6007  /* Set up a starting, non-extracting bracket, then compile the expression. On  /* Set up a starting, non-extracting bracket, then compile the expression. On
6008  error, errorcode will be set non-zero, so we don't need to look at the result  error, errorcode will be set non-zero, so we don't need to look at the result
6009  of the function here. */  of the function here. */
6010    
6011  ptr = (const uschar *)pattern;  ptr = (const uschar *)pattern + skipatstart;
6012  code = (uschar *)codestart;  code = (uschar *)codestart;
6013  *code = OP_BRA;  *code = OP_BRA;
6014  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,  (void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,
6015    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);    &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);
6016  re->top_bracket = cd->bracount;  re->top_bracket = cd->bracount;
6017  re->top_backref = cd->top_backref;  re->top_backref = cd->top_backref;
6018    re->flags = cd->external_flags;
6019    
 if (cd->nopartial) re->options |= PCRE_NOPARTIAL;  
6020  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */  if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */
6021    
6022  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
# Line 5828  if (errorcode != 0) Line 6059  if (errorcode != 0)
6059    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
6060    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = ptr - (const uschar *)pattern;
6061    PCRE_EARLY_ERROR_RETURN2:    PCRE_EARLY_ERROR_RETURN2:
6062    *errorptr = error_texts[errorcode];    *errorptr = find_error_text(errorcode);
6063    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
6064    return NULL;    return NULL;
6065    }    }
# Line 5857  if ((re->options & PCRE_ANCHORED) == 0) Line 6088  if ((re->options & PCRE_ANCHORED) == 0)
6088        int ch = firstbyte & 255;        int ch = firstbyte & 255;
6089        re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&        re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
6090           cd->fcc[ch] == ch)? ch : firstbyte;           cd->fcc[ch] == ch)? ch : firstbyte;
6091        re->options |= PCRE_FIRSTSET;        re->flags |= PCRE_FIRSTSET;
6092        }        }
6093      else if (is_startline(codestart, 0, cd->backref_map))      else if (is_startline(codestart, 0, cd->backref_map))
6094        re->options |= PCRE_STARTLINE;        re->flags |= PCRE_STARTLINE;
6095      }      }
6096    }    }
6097    
# Line 5874  if (reqbyte >= 0 && Line 6105  if (reqbyte >= 0 &&
6105    int ch = reqbyte & 255;    int ch = reqbyte & 255;
6106    re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&    re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
6107      cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;      cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
6108    re->options |= PCRE_REQCHSET;    re->flags |= PCRE_REQCHSET;
6109    }    }
6110    
6111  /* Print out the compiled data if debugging is enabled. This is never the  /* Print out the compiled data if debugging is enabled. This is never the
# Line 5885  case when building a production library. Line 6116  case when building a production library.
6116  printf("Length = %d top_bracket = %d top_backref = %d\n",  printf("Length = %d top_bracket = %d top_backref = %d\n",
6117    length, re->top_bracket, re->top_backref);    length, re->top_bracket, re->top_backref);
6118    
6119  if (re->options != 0)  printf("Options=%08x\n", re->options);
   {  
   printf("%s%s%s%s%s%s%s%s%s\n",  
     ((re->options & PCRE_NOPARTIAL) != 0)? "nopartial " : "",  
     ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "",  
     ((re->options & PCRE_CASELESS) != 0)? "caseless " : "",  
     ((re->options & PCRE_EXTENDED) != 0)? "extended " : "",  
     ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "",  
     ((re->options & PCRE_DOTALL) != 0)? "dotall " : "",  
     ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "",  
     ((re->options & PCRE_EXTRA) != 0)? "extra " : "",  
     ((re->options & PCRE_UNGREEDY) != 0)? "ungreedy " : "");  
   }  
6120    
6121  if ((re->options & PCRE_FIRSTSET) != 0)  if ((re->flags & PCRE_FIRSTSET) != 0)
6122    {    {
6123    int ch = re->first_byte & 255;    int ch = re->first_byte & 255;
6124    const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?    const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?
# Line 5908  if ((re->options & PCRE_FIRSTSET) != 0) Line 6127  if ((re->options & PCRE_FIRSTSET) != 0)
6127      else printf("First char = \\x%02x%s\n", ch, caseless);      else printf("First char = \\x%02x%s\n", ch, caseless);
6128    }    }
6129    
6130  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
6131    {    {
6132    int ch = re->req_byte & 255;    int ch = re->req_byte & 255;
6133    const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?    const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?
# Line 5925  was compiled can be seen. */ Line 6144  was compiled can be seen. */
6144  if (code - codestart > length)  if (code - codestart > length)
6145    {    {
6146    (pcre_free)(re);    (pcre_free)(re);
6147    *errorptr = error_texts[ERR23];    *errorptr = find_error_text(ERR23);
6148    *erroroffset = ptr - (uschar *)pattern;    *erroroffset = ptr - (uschar *)pattern;
6149    if (errorcodeptr != NULL) *errorcodeptr = ERR23;    if (errorcodeptr != NULL) *errorcodeptr = ERR23;
6150    return NULL;    return NULL;
Legend:
Removed from v.210  
changed lines
  Added in v.264
  ViewVC Help
Powered by ViewVC 1.1.5