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

Diff of /code/trunk/pcre_exec.c

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

revision 1102 by chpe, Tue Oct 16 15:56:34 2012 UTC revision 1284 by ph10, Fri Mar 15 11:54:58 2013 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-2012 University of Cambridge             Copyright (c) 1997-2013 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 56  possible. There are also some static sup Line 56  possible. There are also some static sup
56  #undef min  #undef min
57  #undef max  #undef max
58    
59    /* The md->capture_last field uses the lower 16 bits for the last captured
60    substring (which can never be greater than 65535) and a bit in the top half
61    to mean "capture vector overflowed". This odd way of doing things was
62    implemented when it was realized that preserving and restoring the overflow bit
63    whenever the last capture number was saved/restored made for a neater
64    interface, and doing it this way saved on (a) another variable, which would
65    have increased the stack frame size (a big NO-NO in PCRE) and (b) another
66    separate set of save/restore instructions. The following defines are used in
67    implementing this. */
68    
69    #define CAPLMASK    0x0000ffff    /* The bits used for last_capture */
70    #define OVFLMASK    0xffff0000    /* The bits used for the overflow flag */
71    #define OVFLBIT     0x00010000    /* The bit that is set for overflow */
72    
73  /* Values for setting in md->match_function_type to indicate two special types  /* Values for setting in md->match_function_type to indicate two special types
74  of call to match(). We do it this way to save on using another stack variable,  of call to match(). We do it this way to save on using another stack variable,
75  as stack usage is to be discouraged. */  as stack usage is to be discouraged. */
# Line 73  defined PCRE_ERROR_xxx codes, which are Line 87  defined PCRE_ERROR_xxx codes, which are
87  negative to avoid the external error codes. */  negative to avoid the external error codes. */
88    
89  #define MATCH_ACCEPT       (-999)  #define MATCH_ACCEPT       (-999)
90  #define MATCH_COMMIT       (-998)  #define MATCH_KETRPOS      (-998)
91  #define MATCH_KETRPOS      (-997)  #define MATCH_ONCE         (-997)
92  #define MATCH_ONCE         (-996)  /* The next 5 must be kept together and in sequence so that a test that checks
93    for any one of them can use a range. */
94    #define MATCH_COMMIT       (-996)
95  #define MATCH_PRUNE        (-995)  #define MATCH_PRUNE        (-995)
96  #define MATCH_SKIP         (-994)  #define MATCH_SKIP         (-994)
97  #define MATCH_SKIP_ARG     (-993)  #define MATCH_SKIP_ARG     (-993)
98  #define MATCH_THEN         (-992)  #define MATCH_THEN         (-992)
99    #define MATCH_BACKTRACK_MAX MATCH_THEN
100    #define MATCH_BACKTRACK_MIN MATCH_COMMIT
101    
102  /* Maximum number of ints of offset to save on the stack for recursive calls.  /* Maximum number of ints of offset to save on the stack for recursive calls.
103  If the offset vector is bigger, malloc is used. This should be a multiple of 3,  If the offset vector is bigger, malloc is used. This should be a multiple of 3,
# Line 149  match_ref(int offset, register PCRE_PUCH Line 167  match_ref(int offset, register PCRE_PUCH
167  {  {
168  PCRE_PUCHAR eptr_start = eptr;  PCRE_PUCHAR eptr_start = eptr;
169  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];  register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset];
170    #ifdef SUPPORT_UTF
171  BOOL utf = md->utf;  BOOL utf = md->utf;
172    #endif
173    
174  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
175  if (eptr >= md->end_subject)  if (eptr >= md->end_subject)
# Line 197  if (caseless) Line 217  if (caseless)
217        GETCHARINC(c, eptr);        GETCHARINC(c, eptr);
218        GETCHARINC(d, p);        GETCHARINC(d, p);
219        ur = GET_UCD(d);        ur = GET_UCD(d);
220        if (c != d && c != d + ur->other_case)        if (c != d && c != d + ur->other_case)
221          {          {
222          const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;          const pcre_uint32 *pp = PRIV(ucd_caseless_sets) + ur->caseset;
223          for (;;)          for (;;)
224            {            {
225            if (c < *pp) return -1;            if (c < *pp) return -1;
# Line 217  if (caseless) Line 237  if (caseless)
237      {      {
238      while (length-- > 0)      while (length-- > 0)
239        {        {
240        pcre_uchar cc, cp;        pcre_uint32 cc, cp;
241        if (eptr >= md->end_subject) return -2;   /* Partial match */        if (eptr >= md->end_subject) return -2;   /* Partial match */
242        cc = RAWUCHARTEST(eptr);        cc = RAWUCHARTEST(eptr);
243        cp = RAWUCHARTEST(p);        cp = RAWUCHARTEST(p);
# Line 292  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM Line 312  enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM
312         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,         RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
313         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,         RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
314         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,         RM51,  RM52, RM53, RM54, RM55, RM56, RM57, RM58, RM59, RM60,
315         RM61,  RM62, RM63, RM64, RM65, RM66 };         RM61,  RM62, RM63, RM64, RM65, RM66, RM67, RM68 };
316    
317  /* These versions of the macros use the stack, as normal. There are debugging  /* These versions of the macros use the stack, as normal. There are debugging
318  versions and production versions. Note that the "rw" argument of RMATCH isn't  versions and production versions. Note that the "rw" argument of RMATCH isn't
# Line 401  typedef struct heapframe { Line 421  typedef struct heapframe {
421    
422  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
423    int Xprop_type;    int Xprop_type;
424    int Xprop_value;    unsigned int Xprop_value;
425    int Xprop_fail_result;    int Xprop_fail_result;
426    int Xoclength;    int Xoclength;
427    pcre_uchar Xocchars[6];    pcre_uchar Xocchars[6];
# Line 414  typedef struct heapframe { Line 434  typedef struct heapframe {
434    int Xlength;    int Xlength;
435    int Xmax;    int Xmax;
436    int Xmin;    int Xmin;
437    int Xnumber;    unsigned int Xnumber;
438    int Xoffset;    int Xoffset;
439    int Xop;    unsigned int Xop;
440    int Xsave_capture_last;    pcre_int32 Xsave_capture_last;
441    int Xsave_offset1, Xsave_offset2, Xsave_offset3;    int Xsave_offset1, Xsave_offset2, Xsave_offset3;
442    int Xstacksave[REC_STACK_SAVE_MAX];    int Xstacksave[REC_STACK_SAVE_MAX];
443    
# Line 619  BOOL prev_is_word; Line 639  BOOL prev_is_word;
639    
640  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
641  int prop_type;  int prop_type;
642  int prop_value;  unsigned int prop_value;
643  int prop_fail_result;  int prop_fail_result;
644  int oclength;  int oclength;
645  pcre_uchar occhars[6];  pcre_uchar occhars[6];
# Line 630  int ctype; Line 650  int ctype;
650  int length;  int length;
651  int max;  int max;
652  int min;  int min;
653  int number;  unsigned int number;
654  int offset;  int offset;
655  pcre_uchar op;  unsigned int op;
656  int save_capture_last;  pcre_int32 save_capture_last;
657  int save_offset1, save_offset2, save_offset3;  int save_offset1, save_offset2, save_offset3;
658  int stacksave[REC_STACK_SAVE_MAX];  int stacksave[REC_STACK_SAVE_MAX];
659    
# Line 761  for (;;) Line 781  for (;;)
781      case OP_FAIL:      case OP_FAIL:
782      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
783    
     /* COMMIT overrides PRUNE, SKIP, and THEN */  
   
784      case OP_COMMIT:      case OP_COMMIT:
785      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
786        eptrb, RM52);        eptrb, RM52);
787      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE &&      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
         rrc != MATCH_SKIP && rrc != MATCH_SKIP_ARG &&  
         rrc != MATCH_THEN)  
       RRETURN(rrc);  
788      RRETURN(MATCH_COMMIT);      RRETURN(MATCH_COMMIT);
789    
     /* PRUNE overrides THEN */  
   
790      case OP_PRUNE:      case OP_PRUNE:
791      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
792        eptrb, RM51);        eptrb, RM51);
793      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
794      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
795    
796      case OP_PRUNE_ARG:      case OP_PRUNE_ARG:
# Line 787  for (;;) Line 800  for (;;)
800        eptrb, RM56);        eptrb, RM56);
801      if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&      if ((rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) &&
802           md->mark == NULL) md->mark = ecode + 2;           md->mark == NULL) md->mark = ecode + 2;
803      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
804      RRETURN(MATCH_PRUNE);      RRETURN(MATCH_PRUNE);
805    
     /* SKIP overrides PRUNE and THEN */  
   
806      case OP_SKIP:      case OP_SKIP:
807      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md,
808        eptrb, RM53);        eptrb, RM53);
809      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       RRETURN(rrc);  
810      md->start_match_ptr = eptr;   /* Pass back current position */      md->start_match_ptr = eptr;   /* Pass back current position */
811      RRETURN(MATCH_SKIP);      RRETURN(MATCH_SKIP);
812    
813      /* Note that, for Perl compatibility, SKIP with an argument does NOT set      /* Note that, for Perl compatibility, SKIP with an argument does NOT set
814      nomatch_mark. There is a flag that disables this opcode when re-matching a      nomatch_mark. When a pattern match ends with a SKIP_ARG for which there was
815      pattern that ended with a SKIP for which there was not a matching MARK. */      not a matching mark, we have to re-run the match, ignoring the SKIP_ARG
816        that failed and any that preceed it (either they also failed, or were not
817        triggered). To do this, we maintain a count of executed SKIP_ARGs. If a
818        SKIP_ARG gets to top level, the match is re-run with md->ignore_skip_arg
819        set to the count of the one that failed. */
820    
821      case OP_SKIP_ARG:      case OP_SKIP_ARG:
822      if (md->ignore_skip_arg)      md->skip_arg_count++;
823        if (md->skip_arg_count <= md->ignore_skip_arg)
824        {        {
825        ecode += PRIV(OP_lengths)[*ecode] + ecode[1];        ecode += PRIV(OP_lengths)[*ecode] + ecode[1];
826        break;        break;
827        }        }
828      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,      RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode] + ecode[1], offset_top, md,
829        eptrb, RM57);        eptrb, RM57);
830      if (rrc != MATCH_NOMATCH && rrc != MATCH_PRUNE && rrc != MATCH_THEN)      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
831        RRETURN(rrc);  
   
832      /* Pass back the current skip name by overloading md->start_match_ptr and      /* Pass back the current skip name by overloading md->start_match_ptr and
833      returning the special MATCH_SKIP_ARG return code. This will either be      returning the special MATCH_SKIP_ARG return code. This will either be
834      caught by a matching MARK, or get to the top, where it causes a rematch      caught by a matching MARK, or get to the top, where it causes a rematch
835      with the md->ignore_skip_arg flag set. */      with md->ignore_skip_arg set to the value of md->skip_arg_count. */
836    
837      md->start_match_ptr = ecode + 2;      md->start_match_ptr = ecode + 2;
838      RRETURN(MATCH_SKIP_ARG);      RRETURN(MATCH_SKIP_ARG);
# Line 1064  for (;;) Line 1078  for (;;)
1078        /* In all other cases, we have to make another call to match(). */        /* In all other cases, we have to make another call to match(). */
1079    
1080        save_mark = md->mark;        save_mark = md->mark;
1081          save_capture_last = md->capture_last;
1082        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,        RMATCH(eptr, ecode + PRIV(OP_lengths)[*ecode], offset_top, md, eptrb,
1083          RM2);          RM2);
1084    
# Line 1095  for (;;) Line 1110  for (;;)
1110        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1111        md->mark = save_mark;        md->mark = save_mark;
1112        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1113          md->capture_last = save_capture_last;
1114        }        }
1115    
1116      RRETURN(MATCH_NOMATCH);      RRETURN(MATCH_NOMATCH);
# Line 1216  for (;;) Line 1232  for (;;)
1232      POSSESSIVE_NON_CAPTURE:      POSSESSIVE_NON_CAPTURE:
1233      matched_once = FALSE;      matched_once = FALSE;
1234      code_offset = (int)(ecode - md->start_code);      code_offset = (int)(ecode - md->start_code);
1235        save_capture_last = md->capture_last;
1236    
1237      for (;;)      for (;;)
1238        {        {
# Line 1245  for (;;) Line 1262  for (;;)
1262        if (rrc != MATCH_NOMATCH) RRETURN(rrc);        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
1263        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1264        if (*ecode != OP_ALT) break;        if (*ecode != OP_ALT) break;
1265          md->capture_last = save_capture_last;
1266        }        }
1267    
1268      if (matched_once || allow_zero)      if (matched_once || allow_zero)
# Line 1289  for (;;) Line 1307  for (;;)
1307          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, LINK_SIZE + 3);
1308          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
1309          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1310          cb.capture_last     = md->capture_last;          cb.capture_last     = md->capture_last & CAPLMASK;
1311            /* Internal change requires this for API compatibility. */
1312            if (cb.capture_last == 0) cb.capture_last = -1;
1313          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
1314          cb.mark             = md->nomatch_mark;          cb.mark             = md->nomatch_mark;
1315          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1316          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1317          }          }
1318        ecode += PRIV(OP_lengths)[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1319          codelink -= PRIV(OP_lengths)[OP_CALLOUT];
1320        }        }
1321    
1322      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
# Line 1311  for (;;) Line 1332  for (;;)
1332          }          }
1333        else        else
1334          {          {
1335          int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/          unsigned int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/
1336          condition = (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1337    
1338          /* If the test is for recursion into a specific subpattern, and it is          /* If the test is for recursion into a specific subpattern, and it is
# Line 1383  for (;;) Line 1404  for (;;)
1404    
1405        if (!condition && condcode == OP_NCREF)        if (!condition && condcode == OP_NCREF)
1406          {          {
1407          int refno = offset >> 1;          unsigned int refno = offset >> 1;
1408          pcre_uchar *slotA = md->name_table;          pcre_uchar *slotA = md->name_table;
1409    
1410          for (i = 0; i < md->name_count; i++)          for (i = 0; i < md->name_count; i++)
# Line 1511  for (;;) Line 1532  for (;;)
1532      to close any currently open capturing brackets. */      to close any currently open capturing brackets. */
1533    
1534      case OP_CLOSE:      case OP_CLOSE:
1535      number = GET2(ecode, 1);      number = GET2(ecode, 1);   /* Must be less than 65536 */
1536      offset = number << 1;      offset = number << 1;
1537    
1538  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
# Line 1519  for (;;) Line 1540  for (;;)
1540        printf("\n");        printf("\n");
1541  #endif  #endif
1542    
1543      md->capture_last = number;      md->capture_last = (md->capture_last & OVFLMASK) | number;
1544      if (offset >= md->offset_max) md->offset_overflow = TRUE; else      if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1545        {        {
1546        md->offset_vector[offset] =        md->offset_vector[offset] =
1547          md->offset_vector[md->offset_end - number];          md->offset_vector[md->offset_end - number];
# Line 1714  for (;;) Line 1735  for (;;)
1735        cb.pattern_position = GET(ecode, 2);        cb.pattern_position = GET(ecode, 2);
1736        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);        cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1737        cb.capture_top      = offset_top/2;        cb.capture_top      = offset_top/2;
1738        cb.capture_last     = md->capture_last;        cb.capture_last     = md->capture_last & CAPLMASK;
1739          /* Internal change requires this for API compatibility. */
1740          if (cb.capture_last == 0) cb.capture_last = -1;
1741        cb.callout_data     = md->callout_data;        cb.callout_data     = md->callout_data;
1742        cb.mark             = md->nomatch_mark;        cb.mark             = md->nomatch_mark;
1743        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);        if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
# Line 1743  for (;;) Line 1766  for (;;)
1766      case OP_RECURSE:      case OP_RECURSE:
1767        {        {
1768        recursion_info *ri;        recursion_info *ri;
1769        int recno;        unsigned int recno;
1770    
1771        callpat = md->start_code + GET(ecode, 1);        callpat = md->start_code + GET(ecode, 1);
1772        recno = (callpat == md->start_code)? 0 :        recno = (callpat == md->start_code)? 0 :
# Line 1760  for (;;) Line 1783  for (;;)
1783        /* Add to "recursing stack" */        /* Add to "recursing stack" */
1784    
1785        new_recursive.group_num = recno;        new_recursive.group_num = recno;
1786          new_recursive.saved_capture_last = md->capture_last;
1787        new_recursive.subject_position = eptr;        new_recursive.subject_position = eptr;
1788        new_recursive.prevrec = md->recursive;        new_recursive.prevrec = md->recursive;
1789        md->recursive = &new_recursive;        md->recursive = &new_recursive;
# Line 1783  for (;;) Line 1807  for (;;)
1807              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1808    
1809        /* OK, now we can do the recursion. After processing each alternative,        /* OK, now we can do the recursion. After processing each alternative,
1810        restore the offset data. If there were nested recursions, md->recursive        restore the offset data and the last captured value. If there were nested
1811        might be changed, so reset it before looping. */        recursions, md->recursive might be changed, so reset it before looping.
1812          */
1813    
1814        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));        DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
1815        cbegroup = (*callpat >= OP_SBRA);        cbegroup = (*callpat >= OP_SBRA);
# Line 1795  for (;;) Line 1820  for (;;)
1820            md, eptrb, RM6);            md, eptrb, RM6);
1821          memcpy(md->offset_vector, new_recursive.offset_save,          memcpy(md->offset_vector, new_recursive.offset_save,
1822              new_recursive.saved_max * sizeof(int));              new_recursive.saved_max * sizeof(int));
1823            md->capture_last = new_recursive.saved_capture_last;
1824          md->recursive = new_recursive.prevrec;          md->recursive = new_recursive.prevrec;
1825          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)          if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT)
1826            {            {
# Line 1811  for (;;) Line 1837  for (;;)
1837            goto RECURSION_MATCHED;        /* Exit loop; end processing */            goto RECURSION_MATCHED;        /* Exit loop; end processing */
1838            }            }
1839    
1840          /* PCRE does not allow THEN or COMMIT to escape beyond a recursion; it          /* PCRE does not allow THEN, SKIP, PRUNE or COMMIT to escape beyond a
1841          is treated as NOMATCH. */          recursion; they are treated as NOMATCH. These codes are defined in a
1842            range that can be tested for. Any other return code is an error. */
1843    
1844          else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN &&          else if (rrc != MATCH_NOMATCH &&
1845                   rrc != MATCH_COMMIT)                   (rrc < MATCH_BACKTRACK_MIN || rrc > MATCH_BACKTRACK_MAX))
1846            {            {
1847            DPRINTF(("Recursion gave error %d\n", rrc));            DPRINTF(("Recursion gave error %d\n", rrc));
1848            if (new_recursive.offset_save != stacksave)            if (new_recursive.offset_save != stacksave)
# Line 1945  for (;;) Line 1972  for (;;)
1972    
1973        /* Deal with capturing */        /* Deal with capturing */
1974    
1975        md->capture_last = number;        md->capture_last = (md->capture_last & OVFLMASK) | number;
1976        if (offset >= md->offset_max) md->offset_overflow = TRUE; else        if (offset >= md->offset_max) md->capture_last |= OVFLBIT; else
1977          {          {
1978          /* If offset is greater than offset_top, it means that we are          /* If offset is greater than offset_top, it means that we are
1979          "skipping" a capturing group, and that group's offsets must be marked          "skipping" a capturing group, and that group's offsets must be marked
# Line 2530  for (;;) Line 2557  for (;;)
2557        }        }
2558      GETCHARINCTEST(c, eptr);      GETCHARINCTEST(c, eptr);
2559        {        {
2560        const pcre_uint32 *cp;        const pcre_uint32 *cp;
2561        const ucd_record *prop = GET_UCD(c);        const ucd_record *prop = GET_UCD(c);
2562    
2563        switch(ecode[1])        switch(ecode[1])
# Line 2592  for (;;) Line 2619  for (;;)
2619          break;          break;
2620    
2621          case PT_CLIST:          case PT_CLIST:
2622          cp = PRIV(ucd_caseless_sets) + prop->caseset;          cp = PRIV(ucd_caseless_sets) + ecode[2];
2623          for (;;)          for (;;)
2624            {            {
2625            if (c < *cp)            if (c < *cp)
# Line 2602  for (;;) Line 2629  for (;;)
2629            }            }
2630          break;          break;
2631    
2632            case PT_UCNC:
2633            if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
2634                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
2635                 c >= 0xe000) == (op == OP_NOTPROP))
2636              RRETURN(MATCH_NOMATCH);
2637            break;
2638    
2639          /* This should never occur */          /* This should never occur */
2640    
2641          default:          default:
# Line 3188  for (;;) Line 3222  for (;;)
3222    
3223        if (fc < 128)        if (fc < 128)
3224          {          {
3225          pcre_uchar cc = RAWUCHAR(eptr);          pcre_uint32 cc = RAWUCHAR(eptr);
3226          if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);          if (md->lcc[fc] != TABLE_GET(cc, md->lcc, cc)) RRETURN(MATCH_NOMATCH);
3227          ecode++;          ecode++;
3228          eptr++;          eptr++;
# Line 3437  for (;;) Line 3471  for (;;)
3471    
3472        for (i = 1; i <= min; i++)        for (i = 1; i <= min; i++)
3473          {          {
3474          pcre_uchar cc;          pcre_uint32 cc;                 /* Faster than pcre_uchar */
   
3475          if (eptr >= md->end_subject)          if (eptr >= md->end_subject)
3476            {            {
3477            SCHECK_PARTIAL();            SCHECK_PARTIAL();
# Line 3453  for (;;) Line 3486  for (;;)
3486          {          {
3487          for (fi = min;; fi++)          for (fi = min;; fi++)
3488            {            {
3489            pcre_uchar cc;            pcre_uint32 cc;               /* Faster than pcre_uchar */
   
3490            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM24);
3491            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3492            if (fi >= max) RRETURN(MATCH_NOMATCH);            if (fi >= max) RRETURN(MATCH_NOMATCH);
# Line 3474  for (;;) Line 3506  for (;;)
3506          pp = eptr;          pp = eptr;
3507          for (i = min; i < max; i++)          for (i = min; i < max; i++)
3508            {            {
3509            pcre_uchar cc;            pcre_uint32 cc;               /* Faster than pcre_uchar */
   
3510            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
3511              {              {
3512              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 4201  for (;;) Line 4232  for (;;)
4232                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4233              }              }
4234            break;            break;
4235    
4236            case PT_CLIST:            case PT_CLIST:
4237            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
4238              {              {
4239              const pcre_uint32 *cp;              const pcre_uint32 *cp;
4240              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
4241                {                {
# Line 4212  for (;;) Line 4243  for (;;)
4243                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4244                }                }
4245              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4246              cp = PRIV(ucd_caseless_sets) + UCD_CASESET(c);              cp = PRIV(ucd_caseless_sets) + prop_value;
4247              for (;;)              for (;;)
4248                {                {
4249                if (c < *cp)                if (c < *cp)
4250                  { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }                  { if (prop_fail_result) break; else { RRETURN(MATCH_NOMATCH); } }
4251                if (c == *cp++)                if (c == *cp++)
4252                  { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }                  { if (prop_fail_result) { RRETURN(MATCH_NOMATCH); } else break; }
4253                }                }
4254              }              }
4255            break;            break;
4256    
4257              case PT_UCNC:
4258              for (i = 1; i <= min; i++)
4259                {
4260                if (eptr >= md->end_subject)
4261                  {
4262                  SCHECK_PARTIAL();
4263                  RRETURN(MATCH_NOMATCH);
4264                  }
4265                GETCHARINCTEST(c, eptr);
4266                if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
4267                     c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
4268                     c >= 0xe000) == prop_fail_result)
4269                  RRETURN(MATCH_NOMATCH);
4270                }
4271              break;
4272    
4273            /* This should not occur */            /* This should not occur */
4274    
4275            default:            default:
# Line 4428  for (;;) Line 4475  for (;;)
4475          case OP_DIGIT:          case OP_DIGIT:
4476          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4477            {            {
4478            pcre_uchar cc;            pcre_uint32 cc;
   
4479            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4480              {              {
4481              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 4446  for (;;) Line 4492  for (;;)
4492          case OP_NOT_WHITESPACE:          case OP_NOT_WHITESPACE:
4493          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4494            {            {
4495            pcre_uchar cc;            pcre_uint32 cc;
   
4496            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4497              {              {
4498              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 4464  for (;;) Line 4509  for (;;)
4509          case OP_WHITESPACE:          case OP_WHITESPACE:
4510          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4511            {            {
4512            pcre_uchar cc;            pcre_uint32 cc;
   
4513            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4514              {              {
4515              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 4482  for (;;) Line 4526  for (;;)
4526          case OP_NOT_WORDCHAR:          case OP_NOT_WORDCHAR:
4527          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4528            {            {
4529            pcre_uchar cc;            pcre_uint32 cc;
   
4530            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4531              {              {
4532              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 4500  for (;;) Line 4543  for (;;)
4543          case OP_WORDCHAR:          case OP_WORDCHAR:
4544          for (i = 1; i <= min; i++)          for (i = 1; i <= min; i++)
4545            {            {
4546            pcre_uchar cc;            pcre_uint32 cc;
   
4547            if (eptr >= md->end_subject)            if (eptr >= md->end_subject)
4548              {              {
4549              SCHECK_PARTIAL();              SCHECK_PARTIAL();
# Line 4952  for (;;) Line 4994  for (;;)
4994    
4995            case PT_CLIST:            case PT_CLIST:
4996            for (fi = min;; fi++)            for (fi = min;; fi++)
4997              {              {
4998              const pcre_uint32 *cp;              const pcre_uint32 *cp;
4999              RMATCH(eptr, ecode, offset_top, md, eptrb, RM62);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM67);
5000              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5001              if (fi >= max) RRETURN(MATCH_NOMATCH);              if (fi >= max) RRETURN(MATCH_NOMATCH);
5002              if (eptr >= md->end_subject)              if (eptr >= md->end_subject)
# Line 4963  for (;;) Line 5005  for (;;)
5005                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
5006                }                }
5007              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
5008              cp = PRIV(ucd_caseless_sets) + UCD_CASESET(c);              cp = PRIV(ucd_caseless_sets) + prop_value;
5009              for (;;)              for (;;)
5010                {                {
5011                if (c < *cp)                if (c < *cp)
# Line 4974  for (;;) Line 5016  for (;;)
5016              }              }
5017            /* Control never gets here */            /* Control never gets here */
5018    
5019              case PT_UCNC:
5020              for (fi = min;; fi++)
5021                {
5022                RMATCH(eptr, ecode, offset_top, md, eptrb, RM68);
5023                if (rrc != MATCH_NOMATCH) RRETURN(rrc);
5024                if (fi >= max) RRETURN(MATCH_NOMATCH);
5025                if (eptr >= md->end_subject)
5026                  {
5027                  SCHECK_PARTIAL();
5028                  RRETURN(MATCH_NOMATCH);
5029                  }
5030                GETCHARINCTEST(c, eptr);
5031                if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
5032                     c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
5033                     c >= 0xe000) == prop_fail_result)
5034                  RRETURN(MATCH_NOMATCH);
5035                }
5036              /* Control never gets here */
5037    
5038            /* This should never occur */            /* This should never occur */
5039            default:            default:
5040            RRETURN(PCRE_ERROR_INTERNAL);            RRETURN(PCRE_ERROR_INTERNAL);
# Line 5443  for (;;) Line 5504  for (;;)
5504              eptr+= len;              eptr+= len;
5505              }              }
5506            break;            break;
5507    
5508            case PT_CLIST:            case PT_CLIST:
5509            for (i = min; i < max; i++)            for (i = min; i < max; i++)
5510              {              {
# Line 5455  for (;;) Line 5516  for (;;)
5516                break;                break;
5517                }                }
5518              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5519              cp = PRIV(ucd_caseless_sets) + UCD_CASESET(c);              cp = PRIV(ucd_caseless_sets) + prop_value;
5520              for (;;)              for (;;)
5521                {                {
5522                if (c < *cp)                if (c < *cp)
5523                  { if (prop_fail_result) break; else goto GOT_MAX; }                  { if (prop_fail_result) break; else goto GOT_MAX; }
5524                if (c == *cp++)                if (c == *cp++)
5525                  { if (prop_fail_result) goto GOT_MAX; else break; }                  { if (prop_fail_result) goto GOT_MAX; else break; }
5526                }                }
5527              eptr += len;              eptr += len;
5528                }
5529              GOT_MAX:
5530              break;
5531    
5532              case PT_UCNC:
5533              for (i = min; i < max; i++)
5534                {
5535                int len = 1;
5536                if (eptr >= md->end_subject)
5537                  {
5538                  SCHECK_PARTIAL();
5539                  break;
5540                  }
5541                GETCHARLENTEST(c, eptr, len);
5542                if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
5543                     c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
5544                     c >= 0xe000) == prop_fail_result)
5545                  break;
5546                eptr += len;
5547              }              }
           GOT_MAX:  
5548            break;            break;
5549    
5550            default:            default:
# Line 6109  switch (frame->Xwhere) Line 6188  switch (frame->Xwhere)
6188    LBL(32) LBL(34) LBL(42) LBL(46)    LBL(32) LBL(34) LBL(42) LBL(46)
6189  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
6190    LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)    LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
6191    LBL(59) LBL(60) LBL(61) LBL(62)    LBL(59) LBL(60) LBL(61) LBL(62) LBL(67) LBL(68)
6192  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
6193  #endif  /* SUPPORT_UTF */  #endif  /* SUPPORT_UTF */
6194    default:    default:
6195    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
   
 printf("+++jump error in pcre match: label %d non-existent\n", frame->Xwhere);  
   
6196    return PCRE_ERROR_INTERNAL;    return PCRE_ERROR_INTERNAL;
6197    }    }
6198  #undef LBL  #undef LBL
# Line 6265  const pcre_uint8 *start_bits = NULL; Line 6341  const pcre_uint8 *start_bits = NULL;
6341  PCRE_PUCHAR start_match = (PCRE_PUCHAR)subject + start_offset;  PCRE_PUCHAR start_match = (PCRE_PUCHAR)subject + start_offset;
6342  PCRE_PUCHAR end_subject;  PCRE_PUCHAR end_subject;
6343  PCRE_PUCHAR start_partial = NULL;  PCRE_PUCHAR start_partial = NULL;
6344    PCRE_PUCHAR match_partial;
6345  PCRE_PUCHAR req_char_ptr = start_match - 1;  PCRE_PUCHAR req_char_ptr = start_match - 1;
6346    
6347  const pcre_study_data *study;  const pcre_study_data *study;
# Line 6296  if ((options & ~PUBLIC_EXEC_OPTIONS) != Line 6373  if ((options & ~PUBLIC_EXEC_OPTIONS) !=
6373  if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0))  if (re == NULL || subject == NULL || (offsets == NULL && offsetcount > 0))
6374    return PCRE_ERROR_NULL;    return PCRE_ERROR_NULL;
6375  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;  if (offsetcount < 0) return PCRE_ERROR_BADCOUNT;
6376    if (length < 0) return PCRE_ERROR_BADLENGTH;
6377  if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;  if (start_offset < 0 || start_offset > length) return PCRE_ERROR_BADOFFSET;
6378    
6379  /* Check that the first field in the block is the magic number. If it is not,  /* Check that the first field in the block is the magic number. If it is not,
# Line 6362  if (extra_data != NULL Line 6440  if (extra_data != NULL
6440      && (extra_data->flags & (PCRE_EXTRA_EXECUTABLE_JIT |      && (extra_data->flags & (PCRE_EXTRA_EXECUTABLE_JIT |
6441                               PCRE_EXTRA_TABLES)) == PCRE_EXTRA_EXECUTABLE_JIT                               PCRE_EXTRA_TABLES)) == PCRE_EXTRA_EXECUTABLE_JIT
6442      && extra_data->executable_jit != NULL      && extra_data->executable_jit != NULL
6443      && (options & ~(PCRE_NO_UTF8_CHECK | PCRE_NOTBOL | PCRE_NOTEOL |      && (options & ~PUBLIC_JIT_EXEC_OPTIONS) == 0)
                     PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART |  
                     PCRE_PARTIAL_SOFT | PCRE_PARTIAL_HARD)) == 0)  
6444    {    {
6445    rc = PRIV(jit_exec)(re, extra_data, (const pcre_uchar *)subject, length,    rc = PRIV(jit_exec)(extra_data, (const pcre_uchar *)subject, length,
6446         start_offset, options, offsets, offsetcount);         start_offset, options, offsets, offsetcount);
6447    
6448    /* PCRE_ERROR_NULL means that the selected normal or partial matching    /* PCRE_ERROR_NULL means that the selected normal or partial matching
6449    mode is not compiled. In this case we simply fallback to interpreter. */    mode is not compiled. In this case we simply fallback to interpreter. */
6450    
6451    if (rc != PCRE_ERROR_NULL) return rc;    if (rc != PCRE_ERROR_JIT_BADOPTION) return rc;
6452    }    }
6453  #endif  #endif
6454    
# Line 6434  end_subject = md->end_subject; Line 6510  end_subject = md->end_subject;
6510  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;  md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
6511  md->use_ucp = (re->options & PCRE_UCP) != 0;  md->use_ucp = (re->options & PCRE_UCP) != 0;
6512  md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;  md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
6513  md->ignore_skip_arg = FALSE;  md->ignore_skip_arg = 0;
6514    
6515  /* Some options are unpacked into BOOL variables in the hope that testing  /* Some options are unpacked into BOOL variables in the hope that testing
6516  them will be faster than individual option bits. */  them will be faster than individual option bits. */
# Line 6544  if (re->top_backref > 0 && re->top_backr Line 6620  if (re->top_backref > 0 && re->top_backr
6620    DPRINTF(("Got memory to hold back references\n"));    DPRINTF(("Got memory to hold back references\n"));
6621    }    }
6622  else md->offset_vector = offsets;  else md->offset_vector = offsets;
   
6623  md->offset_end = ocount;  md->offset_end = ocount;
6624  md->offset_max = (2*ocount)/3;  md->offset_max = (2*ocount)/3;
6625  md->offset_overflow = FALSE;  md->capture_last = 0;
 md->capture_last = -1;  
6626    
6627  /* Reset the working variable associated with each extraction. These should  /* Reset the working variable associated with each extraction. These should
6628  never be used unless previously set, but they get saved and restored, and so we  never be used unless previously set, but they get saved and restored, and so we
# Line 6818  for(;;) Line 6892  for(;;)
6892    md->match_call_count = 0;    md->match_call_count = 0;
6893    md->match_function_type = 0;    md->match_function_type = 0;
6894    md->end_offset_top = 0;    md->end_offset_top = 0;
6895      md->skip_arg_count = 0;
6896    rc = match(start_match, md->start_code, start_match, 2, md, NULL, 0);    rc = match(start_match, md->start_code, start_match, 2, md, NULL, 0);
6897    if (md->hitend && start_partial == NULL) start_partial = md->start_used_ptr;    if (md->hitend && start_partial == NULL)
6898        {
6899        start_partial = md->start_used_ptr;
6900        match_partial = start_match;
6901        }
6902    
6903    switch(rc)    switch(rc)
6904      {      {
# Line 6832  for(;;) Line 6911  for(;;)
6911    
6912      case MATCH_SKIP_ARG:      case MATCH_SKIP_ARG:
6913      new_start_match = start_match;      new_start_match = start_match;
6914      md->ignore_skip_arg = TRUE;      md->ignore_skip_arg = md->skip_arg_count;
6915      break;      break;
6916    
6917      /* SKIP passes back the next starting point explicitly, but if it is the      /* SKIP passes back the next starting point explicitly, but if it is no
6918      same as the match we have just done, treat it as NOMATCH. */      greater than the match we have just done, treat it as NOMATCH. */
6919    
6920      case MATCH_SKIP:      case MATCH_SKIP:
6921      if (md->start_match_ptr != start_match)      if (md->start_match_ptr > start_match)
6922        {        {
6923        new_start_match = md->start_match_ptr;        new_start_match = md->start_match_ptr;
6924        break;        break;
# Line 6847  for(;;) Line 6926  for(;;)
6926      /* Fall through */      /* Fall through */
6927    
6928      /* NOMATCH and PRUNE advance by one character. THEN at this level acts      /* NOMATCH and PRUNE advance by one character. THEN at this level acts
6929      exactly like PRUNE. Unset the ignore SKIP-with-argument flag. */      exactly like PRUNE. Unset ignore SKIP-with-argument. */
6930    
6931      case MATCH_NOMATCH:      case MATCH_NOMATCH:
6932      case MATCH_PRUNE:      case MATCH_PRUNE:
6933      case MATCH_THEN:      case MATCH_THEN:
6934      md->ignore_skip_arg = FALSE;      md->ignore_skip_arg = 0;
6935      new_start_match = start_match + 1;      new_start_match = start_match + 1;
6936  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
6937      if (utf)      if (utf)
# Line 6945  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 7024  if (rc == MATCH_MATCH || rc == MATCH_ACC
7024          (arg_offset_max - 2) * sizeof(int));          (arg_offset_max - 2) * sizeof(int));
7025        DPRINTF(("Copied offsets from temporary memory\n"));        DPRINTF(("Copied offsets from temporary memory\n"));
7026        }        }
7027      if (md->end_offset_top > arg_offset_max) md->offset_overflow = TRUE;      if (md->end_offset_top > arg_offset_max) md->capture_last |= OVFLBIT;
7028      DPRINTF(("Freeing temporary memory\n"));      DPRINTF(("Freeing temporary memory\n"));
7029      (PUBL(free))(md->offset_vector);      (PUBL(free))(md->offset_vector);
7030      }      }
# Line 6953  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 7032  if (rc == MATCH_MATCH || rc == MATCH_ACC
7032    /* Set the return code to the number of captured strings, or 0 if there were    /* Set the return code to the number of captured strings, or 0 if there were
7033    too many to fit into the vector. */    too many to fit into the vector. */
7034    
7035    rc = (md->offset_overflow && md->end_offset_top >= arg_offset_max)?    rc = ((md->capture_last & OVFLBIT) != 0 &&
7036             md->end_offset_top >= arg_offset_max)?
7037      0 : md->end_offset_top/2;      0 : md->end_offset_top/2;
7038    
7039    /* If there is space in the offset vector, set any unused pairs at the end of    /* If there is space in the offset vector, set any unused pairs at the end of
# Line 7026  if (start_partial != NULL) Line 7106  if (start_partial != NULL)
7106      {      {
7107      offsets[0] = (int)(start_partial - (PCRE_PUCHAR)subject);      offsets[0] = (int)(start_partial - (PCRE_PUCHAR)subject);
7108      offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);      offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);
7109        if (offsetcount > 2)
7110          offsets[2] = (int)(match_partial - (PCRE_PUCHAR)subject);
7111      }      }
7112    rc = PCRE_ERROR_PARTIAL;    rc = PCRE_ERROR_PARTIAL;
7113    }    }

Legend:
Removed from v.1102  
changed lines
  Added in v.1284

  ViewVC Help
Powered by ViewVC 1.1.5