/[pcre]/code/branches/pcre16/pcretest.c
ViewVC logotype

Diff of /code/branches/pcre16/pcretest.c

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

code/trunk/pcretest.c revision 626 by ph10, Wed Jul 20 17:51:54 2011 UTC code/branches/pcre16/pcretest.c revision 811 by zherczeg, Mon Dec 19 14:05:44 2011 UTC
# Line 4  Line 4 
4    
5  /* This program was hacked up as a tester for PCRE. I really should have  /* This program was hacked up as a tester for PCRE. I really should have
6  written it more tidily in the first place. Will I ever learn? It has grown and  written it more tidily in the first place. Will I ever learn? It has grown and
7  been extended and consequently is now rather, er, *very* untidy in places.  been extended and consequently is now rather, er, *very* untidy in places. The
8    addition of 16-bit support has made it even worse. :-(
9    
10  -----------------------------------------------------------------------------  -----------------------------------------------------------------------------
11  Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
# Line 107  appropriately for an application, not fo Line 108  appropriately for an application, not fo
108  #include "pcre.h"  #include "pcre.h"
109  #include "pcre_internal.h"  #include "pcre_internal.h"
110    
111    /* The pcre_printint() function, which prints the internal form of a compiled
112    regex, is held in a separate file so that (a) it can be compiled in either
113    8-bit or 16-bit mode, and (b) it can be #included directly in pcre_compile.c
114    when that is compiled in debug mode. */
115    
116    #ifdef SUPPORT_PCRE8
117    void pcre_printint(pcre *external_re, FILE *f, BOOL print_lengths);
118    #endif
119    #ifdef SUPPORT_PCRE16
120    void pcre16_printint(pcre *external_re, FILE *f, BOOL print_lengths);
121    #endif
122    
123  /* We need access to some of the data tables that PCRE uses. So as not to have  /* We need access to some of the data tables that PCRE uses. So as not to have
124  to keep two copies, we include the source file here, changing the names of the  to keep two copies, we include the source file here, changing the names of the
125  external symbols to prevent clashes. */  external symbols to prevent clashes. */
126    
127  #define _pcre_ucp_gentype      ucp_gentype  #define _pcre_ucp_gentype      ucp_gentype
128    #define _pcre_ucp_typerange    ucp_typerange
129  #define _pcre_utf8_table1      utf8_table1  #define _pcre_utf8_table1      utf8_table1
130  #define _pcre_utf8_table1_size utf8_table1_size  #define _pcre_utf8_table1_size utf8_table1_size
131  #define _pcre_utf8_table2      utf8_table2  #define _pcre_utf8_table2      utf8_table2
# Line 124  external symbols to prevent clashes. */ Line 138  external symbols to prevent clashes. */
138    
139  #include "pcre_tables.c"  #include "pcre_tables.c"
140    
 /* We also need the pcre_printint() function for printing out compiled  
 patterns. This function is in a separate file so that it can be included in  
 pcre_compile.c when that module is compiled with debugging enabled. It needs to  
 know which case is being compiled. */  
   
 #define COMPILING_PCRETEST  
 #include "pcre_printint.src"  
   
141  /* The definition of the macro PRINTABLE, which determines whether to print an  /* The definition of the macro PRINTABLE, which determines whether to print an
142  output character as-is or as a hex value when showing compiled patterns, is  output character as-is or as a hex value when showing compiled patterns, is
143  contained in the printint.src file. We uses it here also, in cases when the  the same as in the printint.src file. We uses it here in cases when the locale
144  locale has not been explicitly changed, so as to get consistent output from  has not been explicitly changed, so as to get consistent output from systems
145  systems that differ in their output from isprint() even in the "C" locale. */  that differ in their output from isprint() even in the "C" locale. */
146    
147  #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))  #ifdef EBCDIC
148    #define PRINTABLE(c) ((c) >= 64 && (c) < 255)
149    #else
150    #define PRINTABLE(c) ((c) >= 32 && (c) < 127)
151    #endif
152    
153    #define PRINTOK(c) (locale_set? isprint(c) : PRINTABLE(c))
154    
155  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
156  testing the POSIX interface, though this is not available via the standard  testing the POSIX interface, though this is not available via the standard
# Line 148  Makefile. */ Line 160  Makefile. */
160  #include "pcreposix.h"  #include "pcreposix.h"
161  #endif  #endif
162    
163  /* It is also possible, for the benefit of the version currently imported into  /* It is also possible, originally for the benefit of a version that was
164  Exim, to build pcretest without support for UTF8 (define NOUTF8), without the  imported into Exim, to build pcretest without support for UTF8 (define NOUTF8),
165  interface to the DFA matcher (NODFA), and without the doublecheck of the old  without the interface to the DFA matcher (NODFA), and without the doublecheck
166  "info" function (define NOINFOCHECK). In fact, we automatically cut out the  of the old "info" function (define NOINFOCHECK). In fact, we automatically cut
167  UTF8 support if PCRE is built without it. */  out the UTF8 support if PCRE is built without it. */
168    
169  #ifndef SUPPORT_UTF8  #ifndef SUPPORT_UTF8
170  #ifndef NOUTF8  #ifndef NOUTF8
# Line 160  UTF8 support if PCRE is built without it Line 172  UTF8 support if PCRE is built without it
172  #endif  #endif
173  #endif  #endif
174    
175    /* To make the code a bit tidier for 8-bit and 16-bit support, we define macros
176    for all the pcre[16]_xxx functions (except pcre16_fullinfo, which is called
177    only from one place and is handled differently). I couldn't dream up any way of
178    using a single macro to do this in a generic way, because of the many different
179    argument requirements. We know that at least one of SUPPORT_PCRE8 and
180    SUPPORT_PCRE16 must be set. First define macros for each individual mode; then
181    use these in the definitions of generic macros. */
182    
183    #ifdef SUPPORT_PCRE8
184    #define PCHARS8(lv, p, len, f) \
185      lv = pchars((pcre_uint8 *)p, len, f)
186    
187    #define PCHARSV8(p, len, f) \
188      (void)pchars((pcre_uint8 *)p, len, f)
189    
190    #define PCRE_COMPILE8(re, pat, options, error, erroffset, tables) \
191      re = pcre_compile((char *)pat, options, error, erroffset, tables)
192    
193    #define PCRE_EXEC8(count, re, extra, bptr, len, start_offset, options, \
194        offsets, size_offsets) \
195      count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options, \
196        offsets, size_offsets)
197    
198    #define PCRE_STUDY8(extra, re, options, error) \
199      extra = pcre_study(re, options, error)
200    
201    #define PCRE_FREE_STUDY8(extra) \
202      pcre_free_study(extra)
203    
204    #define PCRE_PATTERN_TO_HOST_BYTE_ORDER8(re, extra, tables) \
205      pcre_pattern_to_host_byte_order(re, extra, tables)
206    
207    #endif /* SUPPORT_PCRE8 */
208    
209    
210    #ifdef SUPPORT_PCRE16
211    #define PCHARS16(lv, p, len, f) \
212      lv = pchars16((PCRE_SPTR16)p, len, f)
213    
214    #define PCHARSV16(p, len, f) \
215      (void)pchars16((PCRE_SPTR16)p, len, f)
216    
217    #define PCRE_COMPILE16(re, pat, options, error, erroffset, tables) \
218      re = pcre16_compile((PCRE_SPTR16)pat, options, error, erroffset, tables)
219    
220    #define PCRE_EXEC16(count, re, extra, bptr, len, start_offset, options, \
221        offsets, size_offsets) \
222      count = pcre16_exec(re, extra, (PCRE_SPTR16)bptr, len, start_offset, \
223        options, offsets, size_offsets)
224    
225    #define PCRE_FREE_STUDY16(extra) \
226      pcre16_free_study(extra)
227    
228    #define PCRE_STUDY16(extra, re, options, error) \
229      extra = pcre16_study(re, options, error)
230    
231    #define PCRE_PATTERN_TO_HOST_BYTE_ORDER16(re, extra, tables) \
232      pcre16_pattern_to_host_byte_order(re, extra, tables)
233    
234    #endif /* SUPPORT_PCRE16 */
235    
236    
237    /* ----- Both modes are supported; a runtime test is needed ----- */
238    
239    #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
240    
241    #define PCHARS(lv, p, len, f) \
242      if (use_pcre16) \
243        PCHARS16(lv, p, len, f); \
244      else \
245        PCHARS8(lv, p, len, f)
246    
247    #define PCHARSV(p, len, f) \
248      if (use_pcre16) \
249        PCHARSV16(p, len, f); \
250      else \
251        PCHARSV8(p, len, f)
252    
253    #define PCRE_COMPILE(re, pat, options, error, erroffset, tables) \
254      if (use_pcre16) \
255        PCRE_COMPILE16(re, pat, options, error, erroffset, tables); \
256      else \
257        PCRE_COMPILE8(re, pat, options, error, erroffset, tables)
258    
259    #define PCRE_EXEC(count, re, extra, bptr, len, start_offset, options, \
260        offsets, size_offsets) \
261      if (use_pcre16) \
262        PCRE_EXEC16(count, re, extra, bptr, len, start_offset, options, \
263          offsets, size_offsets); \
264      else \
265        PCRE_EXEC8(count, re, extra, bptr, len, start_offset, options, \
266          offsets, size_offsets)
267    
268    #define PCRE_FREE_STUDY(extra) \
269      if (use_pcre16) \
270        PCRE_FREE_STUDY16(extra); \
271      else \
272        PCRE_FREE_STUDY8(extra)
273    
274    #define PCRE_STUDY(extra, re, options, error) \
275      if (use_pcre16) \
276        PCRE_STUDY16(extra, re, options, error); \
277      else \
278        PCRE_STUDY8(extra, re, options, error)
279    
280    #define PCRE_PATTERN_TO_HOST_BYTE_ORDER(re, extra, tables) \
281      if (use_pcre16) \
282        PCRE_PATTERN_TO_HOST_BYTE_ORDER16(re, extra, tables); \
283      else \
284        PCRE_PATTERN_TO_HOST_BYTE_ORDER8(re, extra, tables)
285    
286    /* ----- Only 8-bit mode is supported ----- */
287    
288    #elif defined SUPPORT_PCRE8
289    #define PCHARS           PCHARS8
290    #define PCHARSV          PCHARSV8
291    #define PCRE_COMPILE     PCRE_COMPILE8
292    #define PCRE_EXEC        PCRE_EXEC8
293    #define PCRE_FREE_STUDY  PCRE_FREE_STUDY8
294    #define PCRE_STUDY       PCRE_STUDY8
295    #define PCRE_PATTERN_TO_HOST_BYTE_ORDER PCRE_PATTERN_TO_HOST_BYTE_ORDER8
296    
297    /* ----- Only 16-bit mode is supported ----- */
298    
299    #else
300    #define PCHARS           PCHARS16
301    #define PCHARSV          PCHARSV16
302    #define PCRE_COMPILE     PCRE_COMPILE16
303    #define PCRE_EXEC        PCRE_EXEC16
304    #define PCRE_FREE_STUDY  PCRE_FREE_STUDY16
305    #define PCRE_STUDY       PCRE_STUDY16
306    #define PCRE_PATTERN_TO_HOST_BYTE_ORDER PCRE_PATTERN_TO_HOST_BYTE_ORDER16
307    #endif
308    
309    /* ----- End of mode-specific function call macros ----- */
310    
311    
312  /* Other parameters */  /* Other parameters */
313    
# Line 187  static int debug_lengths; Line 335  static int debug_lengths;
335  static int first_callout;  static int first_callout;
336  static int locale_set = 0;  static int locale_set = 0;
337  static int show_malloc;  static int show_malloc;
338  static int use_utf8;  static int use_utf;
339  static size_t gotten_store;  static size_t gotten_store;
340    static size_t first_gotten_store = 0;
341    static const unsigned char *last_callout_mark = NULL;
342    
343  /* The buffers grow automatically if very long input lines are encountered. */  /* The buffers grow automatically if very long input lines are encountered. */
344    
345  static int buffer_size = 50000;  static int buffer_size = 50000;
346  static uschar *buffer = NULL;  static pcre_uint8 *buffer = NULL;
347  static uschar *dbuffer = NULL;  static pcre_uint8 *dbuffer = NULL;
348  static uschar *pbuffer = NULL;  static pcre_uint8 *pbuffer = NULL;
349    
350    #ifdef SUPPORT_PCRE16
351    static int buffer16_size = 0;
352    static pcre_uint16 *buffer16 = NULL;
353    #endif
354    
355    /* If we have 8-bit support, default use_pcre16 to false; if there is also
356    16-bit support, it can be changed by an option. If there is no 8-bit support,
357    there must be 16-bit support, so default it to 1. */
358    
359    #ifdef SUPPORT_PCRE8
360    static int use_pcre16 = 0;
361    #else
362    static int use_pcre16 = 1;
363    #endif
364    
365  /* Textual explanations for runtime error codes */  /* Textual explanations for runtime error codes */
366    
# Line 207  static const char *errtexts[] = { Line 372  static const char *errtexts[] = {
372    "magic number missing",    "magic number missing",
373    "unknown opcode - pattern overwritten?",    "unknown opcode - pattern overwritten?",
374    "no more memory",    "no more memory",
375    NULL,  /* never returned by pcre_exec() or pcre_dfa_exec() */    NULL,  /* never returned by pcre_exec() or pcre_dfa_exec() */
376    "match limit exceeded",    "match limit exceeded",
377    "callout error code",    "callout error code",
378    NULL,  /* BADUTF8 is handled specially */    NULL,  /* BADUTF8 is handled specially */
# Line 220  static const char *errtexts[] = { Line 385  static const char *errtexts[] = {
385    "backreference condition or recursion test not supported for DFA matching",    "backreference condition or recursion test not supported for DFA matching",
386    "match limit not supported for DFA matching",    "match limit not supported for DFA matching",
387    "workspace size exceeded in DFA matching",    "workspace size exceeded in DFA matching",
388    "too much recursion for DFA matching",    "too much recursion for DFA matching",
389    "recursion limit exceeded",    "recursion limit exceeded",
390    "not used - internal error",    "not used - internal error",
391    "invalid combination of newline options",    "invalid combination of newline options",
392    "bad offset value",    "bad offset value",
393    NULL  /* SHORTUTF8 is handled specially */    NULL,  /* SHORTUTF8 is handled specially */
394      "nested recursion at the same subject position",
395      "JIT stack limit reached",
396      "pattern compiled in wrong mode (8-bit/16-bit error)"
397  };  };
398    
399    
400  /*************************************************  /*************************************************
401  *         Alternate character tables             *  *         Alternate character tables             *
# Line 241  the L (locale) option also adjusts the t Line 409  the L (locale) option also adjusts the t
409  /* This is the set of tables distributed as default with PCRE. It recognizes  /* This is the set of tables distributed as default with PCRE. It recognizes
410  only ASCII characters. */  only ASCII characters. */
411    
412  static const unsigned char tables0[] = {  static const pcre_uint8 tables0[] = {
413    
414  /* This table is a lower casing table. */  /* This table is a lower casing table. */
415    
# Line 414  graph, print, punct, and cntrl. Other cl Line 582  graph, print, punct, and cntrl. Other cl
582  be at least an approximation of ISO 8859. In particular, there are characters  be at least an approximation of ISO 8859. In particular, there are characters
583  greater than 128 that are marked as spaces, letters, etc. */  greater than 128 that are marked as spaces, letters, etc. */
584    
585  static const unsigned char tables1[] = {  static const pcre_uint8 tables1[] = {
586  0,1,2,3,4,5,6,7,  0,1,2,3,4,5,6,7,
587  8,9,10,11,12,13,14,15,  8,9,10,11,12,13,14,15,
588  16,17,18,19,20,21,22,23,  16,17,18,19,20,21,22,23,
# Line 577  return sys_errlist[n]; Line 745  return sys_errlist[n];
745  #endif /* HAVE_STRERROR */  #endif /* HAVE_STRERROR */
746    
747    
748    /*************************************************
749    *         JIT memory callback                    *
750    *************************************************/
751    
752    static pcre_jit_stack* jit_callback(void *arg)
753    {
754    return (pcre_jit_stack *)arg;
755    }
756    
757    
758    /*************************************************
759    *            Convert UTF-8 string to value       *
760    *************************************************/
761    
762    /* This function takes one or more bytes that represents a UTF-8 character,
763    and returns the value of the character.
764    
765    Argument:
766      utf8bytes   a pointer to the byte vector
767      vptr        a pointer to an int to receive the value
768    
769    Returns:      >  0 => the number of bytes consumed
770                  -6 to 0 => malformed UTF-8 character at offset = (-return)
771    */
772    
773    #if !defined NOUTF8
774    
775    static int
776    utf82ord(pcre_uint8 *utf8bytes, int *vptr)
777    {
778    int c = *utf8bytes++;
779    int d = c;
780    int i, j, s;
781    
782    for (i = -1; i < 6; i++)               /* i is number of additional bytes */
783      {
784      if ((d & 0x80) == 0) break;
785      d <<= 1;
786      }
787    
788    if (i == -1) { *vptr = c; return 1; }  /* ascii character */
789    if (i == 0 || i == 6) return 0;        /* invalid UTF-8 */
790    
791    /* i now has a value in the range 1-5 */
792    
793    s = 6*i;
794    d = (c & utf8_table3[i]) << s;
795    
796    for (j = 0; j < i; j++)
797      {
798      c = *utf8bytes++;
799      if ((c & 0xc0) != 0x80) return -(j+1);
800      s -= 6;
801      d |= (c & 0x3f) << s;
802      }
803    
804    /* Check that encoding was the correct unique one */
805    
806    for (j = 0; j < utf8_table1_size; j++)
807      if (d <= utf8_table1[j]) break;
808    if (j != i) return -(i+1);
809    
810    /* Valid value */
811    
812    *vptr = d;
813    return i+1;
814    }
815    
816    #endif
817    
818    
819    
820    /*************************************************
821    *       Convert character value to UTF-8         *
822    *************************************************/
823    
824    /* This function takes an integer value in the range 0 - 0x7fffffff
825    and encodes it as a UTF-8 character in 0 to 6 bytes.
826    
827    Arguments:
828      cvalue     the character value
829      utf8bytes  pointer to buffer for result - at least 6 bytes long
830    
831    Returns:     number of characters placed in the buffer
832    */
833    
834    #if !defined NOUTF8
835    
836    static int
837    ord2utf8(int cvalue, pcre_uint8 *utf8bytes)
838    {
839    register int i, j;
840    for (i = 0; i < utf8_table1_size; i++)
841      if (cvalue <= utf8_table1[i]) break;
842    utf8bytes += i;
843    for (j = i; j > 0; j--)
844     {
845     *utf8bytes-- = 0x80 | (cvalue & 0x3f);
846     cvalue >>= 6;
847     }
848    *utf8bytes = utf8_table2[i] | cvalue;
849    return i + 1;
850    }
851    
852    #endif
853    
854    
855    
856    #ifdef SUPPORT_PCRE16
857    /*************************************************
858    *         Convert a string to 16-bit             *
859    *************************************************/
860    
861    /* In non-UTF mode, the space needed for a 16-bit string is exactly double the
862    8-bit size. For a UTF-8 string, the size needed for UTF-16 is no more than
863    double, because up to 0xffff uses no more than 3 bytes in UTF-8 but possibly 4
864    in UTF-16. Higher values use 4 bytes in UTF-8 and up to 4 bytes in UTF-16. The
865    result is always left in buffer16.
866    
867    Arguments:
868      p          points to a byte string
869      utf        true if UTF-8 (to be converted to UTF-16)
870      len        number of bytes in the string (excluding trailing zero)
871    
872    Returns:     number of 16-bit data items used (excluding trailing zero)
873                 OR -1 if a UTF-8 string is malformed
874    */
875    
876    static int
877    to16(pcre_uint8 *p, int utf, int len)
878    {
879    pcre_uint16 *pp;
880    
881    if (buffer16_size < 2*len + 2)
882      {
883      if (buffer16 != NULL) free(buffer16);
884      buffer16_size = 2*len + 2;
885      buffer16 = (pcre_uint16 *)malloc(buffer16_size);
886      if (buffer16 == NULL)
887        {
888        fprintf(stderr, "pcretest: malloc(%d) failed for buffer16\n", buffer16_size);
889        exit(1);
890        }
891      }
892    
893    pp = buffer16;
894    
895    if (!utf)
896      {
897      while (len-- > 0) *pp++ = *p++;
898      }
899    
900    else
901      {
902      int c;
903      while (len > 0)
904        {
905        int chlen = utf82ord(p, &c);
906        if (chlen <= 0) return -1;
907        p += chlen;
908        len -= chlen;
909        if (c < 0x10000) *pp++ = c; else
910          {
911          c -= 0x10000;
912          *pp++ = 0xD800 | (c >> 10);
913          *pp++ = 0xDC00 | (c & 0x3ff);
914          }
915        }
916      }
917    
918    *pp = 0;
919    return pp - buffer16;
920    }
921    #endif
922    
923    
924  /*************************************************  /*************************************************
# Line 602  Returns:       pointer to the start of n Line 944  Returns:       pointer to the start of n
944                 NULL if no data read and EOF reached                 NULL if no data read and EOF reached
945  */  */
946    
947  static uschar *  static pcre_uint8 *
948  extend_inputline(FILE *f, uschar *start, const char *prompt)  extend_inputline(FILE *f, pcre_uint8 *start, const char *prompt)
949  {  {
950  uschar *here = start;  pcre_uint8 *here = start;
951    
952  for (;;)  for (;;)
953    {    {
# Line 652  for (;;) Line 994  for (;;)
994    else    else
995      {      {
996      int new_buffer_size = 2*buffer_size;      int new_buffer_size = 2*buffer_size;
997      uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);      pcre_uint8 *new_buffer = (pcre_uint8 *)malloc(new_buffer_size);
998      uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);      pcre_uint8 *new_dbuffer = (pcre_uint8 *)malloc(new_buffer_size);
999      uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);      pcre_uint8 *new_pbuffer = (pcre_uint8 *)malloc(new_buffer_size);
1000    
1001      if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)      if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
1002        {        {
# Line 685  return NULL;  /* Control never gets here Line 1027  return NULL;  /* Control never gets here
1027    
1028    
1029    
   
   
   
   
1030  /*************************************************  /*************************************************
1031  *          Read number from string               *  *          Read number from string               *
1032  *************************************************/  *************************************************/
# Line 705  Returns:        the unsigned long Line 1043  Returns:        the unsigned long
1043  */  */
1044    
1045  static int  static int
1046  get_value(unsigned char *str, unsigned char **endptr)  get_value(pcre_uint8 *str, pcre_uint8 **endptr)
1047  {  {
1048  int result = 0;  int result = 0;
1049  while(*str != 0 && isspace(*str)) str++;  while(*str != 0 && isspace(*str)) str++;
# Line 716  return(result); Line 1054  return(result);
1054    
1055    
1056    
   
1057  /*************************************************  /*************************************************
1058  *            Convert UTF-8 string to value       *  *             Print one character                *
1059  *************************************************/  *************************************************/
1060    
1061  /* This function takes one or more bytes that represents a UTF-8 character,  /* Print a single character either literally, or as a hex escape. */
 and returns the value of the character.  
   
 Argument:  
   utf8bytes   a pointer to the byte vector  
   vptr        a pointer to an int to receive the value  
   
 Returns:      >  0 => the number of bytes consumed  
               -6 to 0 => malformed UTF-8 character at offset = (-return)  
 */  
1062    
1063  #if !defined NOUTF8  static int pchar(int c, FILE *f)
   
 static int  
 utf82ord(unsigned char *utf8bytes, int *vptr)  
1064  {  {
1065  int c = *utf8bytes++;  if (PRINTOK(c))
 int d = c;  
 int i, j, s;  
   
 for (i = -1; i < 6; i++)               /* i is number of additional bytes */  
1066    {    {
1067    if ((d & 0x80) == 0) break;    if (f != NULL) fprintf(f, "%c", c);
1068    d <<= 1;    return 1;
1069    }    }
1070    
1071  if (i == -1) { *vptr = c; return 1; }  /* ascii character */  if (c < 0x100)
 if (i == 0 || i == 6) return 0;        /* invalid UTF-8 */  
   
 /* i now has a value in the range 1-5 */  
   
 s = 6*i;  
 d = (c & utf8_table3[i]) << s;  
   
 for (j = 0; j < i; j++)  
1072    {    {
1073    c = *utf8bytes++;    if (use_utf)
1074    if ((c & 0xc0) != 0x80) return -(j+1);      {
1075    s -= 6;      if (f != NULL) fprintf(f, "\\x{%02x}", c);
1076    d |= (c & 0x3f) << s;      return 6;
1077        }
1078      else
1079        {
1080        if (f != NULL) fprintf(f, "\\x%02x", c);
1081        return 4;
1082        }
1083    }    }
1084    
1085  /* Check that encoding was the correct unique one */  if (f != NULL) fprintf(f, "\\x{%02x}", c);
1086    return (c <= 0x000000ff)? 6 :
1087  for (j = 0; j < utf8_table1_size; j++)         (c <= 0x00000fff)? 7 :
1088    if (d <= utf8_table1[j]) break;         (c <= 0x0000ffff)? 8 :
1089  if (j != i) return -(i+1);         (c <= 0x000fffff)? 9 : 10;
   
 /* Valid value */  
   
 *vptr = d;  
 return i+1;  
1090  }  }
1091    
 #endif  
   
1092    
1093    
1094    #ifdef SUPPORT_PCRE8
1095  /*************************************************  /*************************************************
1096  *       Convert character value to UTF-8         *  *         Print 8-bit character string           *
1097  *************************************************/  *************************************************/
1098    
1099  /* This function takes an integer value in the range 0 - 0x7fffffff  /* Must handle UTF-8 strings in utf8 mode. Yields number of characters printed.
1100  and encodes it as a UTF-8 character in 0 to 6 bytes.  If handed a NULL file, just counts chars without printing. */
1101    
1102  Arguments:  static int pchars(pcre_uint8 *p, int length, FILE *f)
1103    cvalue     the character value  {
1104    utf8bytes  pointer to buffer for result - at least 6 bytes long  int c = 0;
1105    int yield = 0;
 Returns:     number of characters placed in the buffer  
 */  
1106    
1107    while (length-- > 0)
1108      {
1109  #if !defined NOUTF8  #if !defined NOUTF8
1110      if (use_utf)
1111        {
1112        int rc = utf82ord(p, &c);
1113        if (rc > 0 && rc <= length + 1)   /* Mustn't run over the end */
1114          {
1115          length -= rc - 1;
1116          p += rc;
1117          yield += pchar(c, f);
1118          continue;
1119          }
1120        }
1121    #endif
1122      c = *p++;
1123      yield += pchar(c, f);
1124      }
1125    
1126  static int  return yield;
 ord2utf8(int cvalue, uschar *utf8bytes)  
 {  
 register int i, j;  
 for (i = 0; i < utf8_table1_size; i++)  
   if (cvalue <= utf8_table1[i]) break;  
 utf8bytes += i;  
 for (j = i; j > 0; j--)  
  {  
  *utf8bytes-- = 0x80 | (cvalue & 0x3f);  
  cvalue >>= 6;  
  }  
 *utf8bytes = utf8_table2[i] | cvalue;  
 return i + 1;  
1127  }  }
   
1128  #endif  #endif
1129    
1130    
1131    
1132    #ifdef SUPPORT_PCRE16
1133  /*************************************************  /*************************************************
1134  *             Print character string             *  *           Print 16-bit character string        *
1135  *************************************************/  *************************************************/
1136    
1137  /* Character string printing function. Must handle UTF-8 strings in utf8  /* Must handle UTF-16 strings in utf mode. Yields number of characters printed.
1138  mode. Yields number of characters printed. If handed a NULL file, just counts  If handed a NULL file, just counts chars without printing. */
 chars without printing. */  
1139    
1140  static int pchars(unsigned char *p, int length, FILE *f)  static int pchars16(PCRE_SPTR16 p, int length, FILE *f)
1141  {  {
 int c = 0;  
1142  int yield = 0;  int yield = 0;
1143    
1144  while (length-- > 0)  while (length-- > 0)
1145    {    {
1146      int c = *p++ & 0xffff;
1147  #if !defined NOUTF8  #if !defined NOUTF8
1148    if (use_utf8)    if (use_utf && c >= 0xD800 && c < 0xDC00 && length > 0)
1149      {      {
1150      int rc = utf82ord(p, &c);      int d = *p & 0xffff;
1151        if (d >= 0xDC00 && d < 0xDFFF)
     if (rc > 0 && rc <= length + 1)   /* Mustn't run over the end */  
1152        {        {
1153        length -= rc - 1;        c = ((c & 0x3ff) << 10) + (d & 0x3ff) + 0x10000;
1154        p += rc;        length--;
1155        if (PRINTHEX(c))        p++;
         {  
         if (f != NULL) fprintf(f, "%c", c);  
         yield++;  
         }  
       else  
         {  
         int n = 4;  
         if (f != NULL) fprintf(f, "\\x{%02x}", c);  
         yield += (n <= 0x000000ff)? 2 :  
                  (n <= 0x00000fff)? 3 :  
                  (n <= 0x0000ffff)? 4 :  
                  (n <= 0x000fffff)? 5 : 6;  
         }  
       continue;  
1156        }        }
1157      }      }
1158  #endif  #endif
1159      yield += pchar(c, f);
    /* Not UTF-8, or malformed UTF-8  */  
   
   c = *p++;  
   if (PRINTHEX(c))  
     {  
     if (f != NULL) fprintf(f, "%c", c);  
     yield++;  
     }  
   else  
     {  
     if (f != NULL) fprintf(f, "\\x%02x", c);  
     yield += 4;  
     }  
1160    }    }
1161    
1162  return yield;  return yield;
1163  }  }
1164    #endif
1165    
1166    
1167    
# Line 903  if (callout_extra) Line 1190  if (callout_extra)
1190      else      else
1191        {        {
1192        fprintf(f, "%2d: ", i/2);        fprintf(f, "%2d: ", i/2);
1193        (void)pchars((unsigned char *)cb->subject + cb->offset_vector[i],        PCHARSV(cb->subject + cb->offset_vector[i],
1194          cb->offset_vector[i+1] - cb->offset_vector[i], f);          cb->offset_vector[i+1] - cb->offset_vector[i], f);
1195        fprintf(f, "\n");        fprintf(f, "\n");
1196        }        }
# Line 916  printed lengths of the substrings. */ Line 1203  printed lengths of the substrings. */
1203    
1204  if (f != NULL) fprintf(f, "--->");  if (f != NULL) fprintf(f, "--->");
1205    
1206  pre_start = pchars((unsigned char *)cb->subject, cb->start_match, f);  PCHARS(pre_start, cb->subject, cb->start_match, f);
1207  post_start = pchars((unsigned char *)(cb->subject + cb->start_match),  PCHARS(post_start, cb->subject + cb->start_match,
1208    cb->current_position - cb->start_match, f);    cb->current_position - cb->start_match, f);
1209    
1210  subject_length = pchars((unsigned char *)cb->subject, cb->subject_length, NULL);  PCHARS(subject_length, cb->subject, cb->subject_length, NULL);
1211    
1212  (void)pchars((unsigned char *)(cb->subject + cb->current_position),  PCHARSV(cb->subject + cb->current_position,
1213    cb->subject_length - cb->current_position, f);    cb->subject_length - cb->current_position, f);
1214    
1215  if (f != NULL) fprintf(f, "\n");  if (f != NULL) fprintf(f, "\n");
# Line 959  fprintf(outfile, "%.*s", (cb->next_item_ Line 1246  fprintf(outfile, "%.*s", (cb->next_item_
1246  fprintf(outfile, "\n");  fprintf(outfile, "\n");
1247  first_callout = 0;  first_callout = 0;
1248    
1249    if (cb->mark != last_callout_mark)
1250      {
1251      fprintf(outfile, "Latest Mark: %s\n",
1252        (cb->mark == NULL)? "<unset>" : (char *)(cb->mark));
1253      last_callout_mark = cb->mark;
1254      }
1255    
1256  if (cb->callout_data != NULL)  if (cb->callout_data != NULL)
1257    {    {
1258    int callout_data = *((int *)(cb->callout_data));    int callout_data = *((int *)(cb->callout_data));
# Line 978  return (cb->callout_number != callout_fa Line 1272  return (cb->callout_number != callout_fa
1272  *            Local malloc functions              *  *            Local malloc functions              *
1273  *************************************************/  *************************************************/
1274    
1275  /* Alternative malloc function, to test functionality and show the size of the  /* Alternative malloc function, to test functionality and save the size of a
1276  compiled re. */  compiled re, which is the first store request that pcre_compile() makes. The
1277    show_malloc variable is set only during matching. */
1278    
1279  static void *new_malloc(size_t size)  static void *new_malloc(size_t size)
1280  {  {
1281  void *block = malloc(size);  void *block = malloc(size);
1282  gotten_store = size;  gotten_store = size;
1283    if (first_gotten_store == 0) first_gotten_store = size;
1284  if (show_malloc)  if (show_malloc)
1285    fprintf(outfile, "malloc       %3d %p\n", (int)size, block);    fprintf(outfile, "malloc       %3d %p\n", (int)size, block);
1286  return block;  return block;
# Line 997  if (show_malloc) Line 1293  if (show_malloc)
1293  free(block);  free(block);
1294  }  }
1295    
   
1296  /* For recursion malloc/free, to test stacking calls */  /* For recursion malloc/free, to test stacking calls */
1297    
1298  static void *stack_malloc(size_t size)  static void *stack_malloc(size_t size)
# Line 1020  free(block); Line 1315  free(block);
1315  *          Call pcre_fullinfo()                  *  *          Call pcre_fullinfo()                  *
1316  *************************************************/  *************************************************/
1317    
1318  /* Get one piece of information from the pcre_fullinfo() function */  /* Get one piece of information from the pcre_fullinfo() function. When only
1319    one of 8-bit or 16-bit is supported, use_pcre16 should always have the correct
1320    value, but the code is defensive. */
1321    
1322  static void new_info(pcre *re, pcre_extra *study, int option, void *ptr)  static void new_info(pcre *re, pcre_extra *study, int option, void *ptr)
1323  {  {
1324  int rc;  int rc;
1325  if ((rc = pcre_fullinfo(re, study, option, ptr)) < 0)  
1326    fprintf(outfile, "Error %d from pcre_fullinfo(%d)\n", rc, option);  if (use_pcre16)
1327    #ifdef SUPPORT_PCRE16
1328      rc = pcre16_fullinfo(re, study, option, ptr);
1329    #else
1330      rc = PCRE_ERROR_BADMODE;
1331    #endif
1332    else
1333    #ifdef SUPPORT_PCRE8
1334      rc = pcre_fullinfo(re, study, option, ptr);
1335    #else
1336      rc = PCRE_ERROR_BADMODE;
1337    #endif
1338    
1339    if (rc < 0) fprintf(outfile, "Error %d from pcre%s_fullinfo(%d)\n", rc,
1340      use_pcre16? "16" : "", option);
1341  }  }
1342    
1343    
# Line 1053  return ((value & 0x000000ff) << 24) | Line 1364  return ((value & 0x000000ff) << 24) |
1364  *************************************************/  *************************************************/
1365    
1366  static int  static int
1367  check_match_limit(pcre *re, pcre_extra *extra, uschar *bptr, int len,  check_match_limit(pcre *re, pcre_extra *extra, pcre_uint8 *bptr, int len,
1368    int start_offset, int options, int *use_offsets, int use_size_offsets,    int start_offset, int options, int *use_offsets, int use_size_offsets,
1369    int flag, unsigned long int *limit, int errnumber, const char *msg)    int flag, unsigned long int *limit, int errnumber, const char *msg)
1370  {  {
# Line 1068  for (;;) Line 1379  for (;;)
1379    {    {
1380    *limit = mid;    *limit = mid;
1381    
1382    count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options,    PCRE_EXEC(count, re, extra, bptr, len, start_offset, options,
1383      use_offsets, use_size_offsets);      use_offsets, use_size_offsets);
1384    
1385    if (count == errnumber)    if (count == errnumber)
# Line 1113  Returns:    < 0, = 0, or > 0, according Line 1424  Returns:    < 0, = 0, or > 0, according
1424  */  */
1425    
1426  static int  static int
1427  strncmpic(uschar *s, uschar *t, int n)  strncmpic(pcre_uint8 *s, pcre_uint8 *t, int n)
1428  {  {
1429  while (n--)  while (n--)
1430    {    {
# Line 1140  Returns:      appropriate PCRE_NEWLINE_x Line 1451  Returns:      appropriate PCRE_NEWLINE_x
1451  */  */
1452    
1453  static int  static int
1454  check_newline(uschar *p, FILE *f)  check_newline(pcre_uint8 *p, FILE *f)
1455  {  {
1456  if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;  if (strncmpic(p, (pcre_uint8 *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
1457  if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;  if (strncmpic(p, (pcre_uint8 *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
1458  if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;  if (strncmpic(p, (pcre_uint8 *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
1459  if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;  if (strncmpic(p, (pcre_uint8 *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
1460  if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;  if (strncmpic(p, (pcre_uint8 *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
1461  if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;  if (strncmpic(p, (pcre_uint8 *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
1462  if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;  if (strncmpic(p, (pcre_uint8 *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
1463  fprintf(f, "Unknown newline type at: <%s\n", p);  fprintf(f, "Unknown newline type at: <%s\n", p);
1464  return 0;  return 0;
1465  }  }
# Line 1170  printf("If input is a terminal, readline Line 1481  printf("If input is a terminal, readline
1481  printf("This version of pcretest is not linked with readline().\n");  printf("This version of pcretest is not linked with readline().\n");
1482  #endif  #endif
1483  printf("\nOptions:\n");  printf("\nOptions:\n");
1484    #ifdef SUPPORT_PCRE16
1485    printf("  -16      use 16-bit interface\n");
1486    #endif
1487  printf("  -b       show compiled code (bytecode)\n");  printf("  -b       show compiled code (bytecode)\n");
1488  printf("  -C       show PCRE compile-time options and exit\n");  printf("  -C       show PCRE compile-time options and exit\n");
1489  printf("  -d       debug: show compiled code and information (-b and -i)\n");  printf("  -d       debug: show compiled code and information (-b and -i)\n");
# Line 1186  printf("  -p       use POSIX interface\n Line 1500  printf("  -p       use POSIX interface\n
1500  #endif  #endif
1501  printf("  -q       quiet: do not output PCRE version number at start\n");  printf("  -q       quiet: do not output PCRE version number at start\n");
1502  printf("  -S <n>   set stack size to <n> megabytes\n");  printf("  -S <n>   set stack size to <n> megabytes\n");
1503  printf("  -s       force each pattern to be studied\n"  printf("  -s       force each pattern to be studied at basic level\n"
1504           "  -s+      force each pattern to be studied, using JIT if available\n"
1505         "  -t       time compilation and execution\n");         "  -t       time compilation and execution\n");
1506  printf("  -t <n>   time compilation and execution, repeating <n> times\n");  printf("  -t <n>   time compilation and execution, repeating <n> times\n");
1507  printf("  -tm      time execution (matching) only\n");  printf("  -tm      time execution (matching) only\n");
# Line 1214  int timeit = 0; Line 1529  int timeit = 0;
1529  int timeitm = 0;  int timeitm = 0;
1530  int showinfo = 0;  int showinfo = 0;
1531  int showstore = 0;  int showstore = 0;
1532  int force_study = 0;  int force_study = -1;
1533    int force_study_options = 0;
1534  int quiet = 0;  int quiet = 0;
1535  int size_offsets = 45;  int size_offsets = 45;
1536  int size_offsets_max;  int size_offsets_max;
# Line 1228  int all_use_dfa = 0; Line 1544  int all_use_dfa = 0;
1544  int yield = 0;  int yield = 0;
1545  int stack_size;  int stack_size;
1546    
1547    pcre_jit_stack *jit_stack = NULL;
1548    
1549  /* These vectors store, end-to-end, a list of captured substring names. Assume  /* These vectors store, end-to-end, a list of captured substring names. Assume
1550  that 1024 is plenty long enough for the few names we'll be testing. */  that 1024 is plenty long enough for the few names we'll be testing. */
1551    
1552  uschar copynames[1024];  pcre_uchar copynames[1024];
1553  uschar getnames[1024];  pcre_uchar getnames[1024];
1554    
1555  uschar *copynamesptr;  pcre_uchar *copynamesptr;
1556  uschar *getnamesptr;  pcre_uchar *getnamesptr;
1557    
1558  /* Get buffers from malloc() so that Electric Fence will check their misuse  /* Get buffers from malloc() so that valgrind will check their misuse when
1559  when I am debugging. They grow automatically when very long lines are read. */  debugging. They grow automatically when very long lines are read. The 16-bit
1560    buffer (buffer16) is obtained only if needed. */
1561  buffer = (unsigned char *)malloc(buffer_size);  
1562  dbuffer = (unsigned char *)malloc(buffer_size);  buffer = (pcre_uint8 *)malloc(buffer_size);
1563  pbuffer = (unsigned char *)malloc(buffer_size);  dbuffer = (pcre_uint8 *)malloc(buffer_size);
1564    pbuffer = (pcre_uint8 *)malloc(buffer_size);
1565    
1566  /* The outfile variable is static so that new_malloc can use it. */  /* The outfile variable is static so that new_malloc can use it. */
1567    
# Line 1261  _setmode( _fileno( stdout ), _O_BINARY ) Line 1580  _setmode( _fileno( stdout ), _O_BINARY )
1580    
1581  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
1582    {    {
1583    unsigned char *endptr;    pcre_uint8 *endptr;
1584    
1585    if (strcmp(argv[op], "-m") == 0) showstore = 1;    if (strcmp(argv[op], "-m") == 0) showstore = 1;
1586    else if (strcmp(argv[op], "-s") == 0) force_study = 1;    else if (strcmp(argv[op], "-s") == 0) force_study = 0;
1587      else if (strcmp(argv[op], "-s+") == 0)
1588        {
1589        force_study = 1;
1590        force_study_options = PCRE_STUDY_JIT_COMPILE;
1591        }
1592    #ifdef SUPPORT_PCRE16
1593      else if (strcmp(argv[op], "-16") == 0) use_pcre16 = 1;
1594    #endif
1595    
1596    else if (strcmp(argv[op], "-q") == 0) quiet = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
1597    else if (strcmp(argv[op], "-b") == 0) debug = 1;    else if (strcmp(argv[op], "-b") == 0) debug = 1;
1598    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
# Line 1274  while (argc > 1 && argv[op][0] == '-') Line 1602  while (argc > 1 && argv[op][0] == '-')
1602    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
1603  #endif  #endif
1604    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
1605        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),        ((size_offsets = get_value((pcre_uint8 *)argv[op+1], &endptr)),
1606          *endptr == 0))          *endptr == 0))
1607      {      {
1608      op++;      op++;
# Line 1284  while (argc > 1 && argv[op][0] == '-') Line 1612  while (argc > 1 && argv[op][0] == '-')
1612      {      {
1613      int both = argv[op][2] == 0;      int both = argv[op][2] == 0;
1614      int temp;      int temp;
1615      if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),      if (argc > 2 && (temp = get_value((pcre_uint8 *)argv[op+1], &endptr),
1616                       *endptr == 0))                       *endptr == 0))
1617        {        {
1618        timeitm = temp;        timeitm = temp;
# Line 1295  while (argc > 1 && argv[op][0] == '-') Line 1623  while (argc > 1 && argv[op][0] == '-')
1623      if (both) timeit = timeitm;      if (both) timeit = timeitm;
1624      }      }
1625    else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&    else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
1626        ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),        ((stack_size = get_value((pcre_uint8 *)argv[op+1], &endptr)),
1627          *endptr == 0))          *endptr == 0))
1628      {      {
1629  #if defined(_WIN32) || defined(WIN32)  #if defined(_WIN32) || defined(WIN32) || defined(__minix)
1630      printf("PCRE: -S not supported on this OS\n");      printf("PCRE: -S not supported on this OS\n");
1631      exit(1);      exit(1);
1632  #else  #else
# Line 1325  while (argc > 1 && argv[op][0] == '-') Line 1653  while (argc > 1 && argv[op][0] == '-')
1653      unsigned long int lrc;      unsigned long int lrc;
1654      printf("PCRE version %s\n", pcre_version());      printf("PCRE version %s\n", pcre_version());
1655      printf("Compiled with\n");      printf("Compiled with\n");
1656    
1657    /* At least one of SUPPORT_PCRE8 and SUPPORT_PCRE16 will be set. If both
1658    are set, either both UTFs are supported or both are not supported. */
1659    
1660    #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
1661        printf("  8-bit and 16-bit support\n");
1662        (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
1663        if (rc)
1664          printf("  UTF-8 and UTF-16 support\n");
1665        else
1666          printf("  No UTF-8 or UTF-16 support\n");
1667    #elif defined SUPPORT_PCRE8
1668        printf("  8-bit support only\n");
1669      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
1670      printf("  %sUTF-8 support\n", rc? "" : "No ");      printf("  %sUTF-8 support\n", rc? "" : "No ");
1671    #else
1672        printf("  16-bit support only\n");
1673        (void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
1674        printf("  %sUTF-16 support\n", rc? "" : "No ");
1675    #endif
1676    
1677      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
1678      printf("  %sUnicode properties support\n", rc? "" : "No ");      printf("  %sUnicode properties support\n", rc? "" : "No ");
1679        (void)pcre_config(PCRE_CONFIG_JIT, &rc);
1680        if (rc)
1681          printf("  Just-in-time compiler support\n");
1682        else
1683          printf("  No just-in-time compiler support\n");
1684      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
1685      /* Note that these values are always the ASCII values, even      /* Note that these values are always the ASCII values, even
1686      in EBCDIC environments. CR is 13 and NL is 10. */      in EBCDIC environments. CR is 13 and NL is 10. */
# Line 1406  if (argc > 2) Line 1758  if (argc > 2)
1758    
1759  /* Set alternative malloc function */  /* Set alternative malloc function */
1760    
1761    #ifdef SUPPORT_PCRE8
1762  pcre_malloc = new_malloc;  pcre_malloc = new_malloc;
1763  pcre_free = new_free;  pcre_free = new_free;
1764  pcre_stack_malloc = stack_malloc;  pcre_stack_malloc = stack_malloc;
1765  pcre_stack_free = stack_free;  pcre_stack_free = stack_free;
1766    #endif
1767    
1768    #ifdef SUPPORT_PCRE16
1769    pcre16_malloc = new_malloc;
1770    pcre16_free = new_free;
1771    pcre16_stack_malloc = stack_malloc;
1772    pcre16_stack_free = stack_free;
1773    #endif
1774    
1775  /* Heading line unless quiet, then prompt for first regex if stdin */  /* Heading line unless quiet, then prompt for first regex if stdin */
1776    
# Line 1428  while (!done) Line 1789  while (!done)
1789  #endif  #endif
1790    
1791    const char *error;    const char *error;
1792    unsigned char *markptr;    pcre_uint8 *markptr;
1793    unsigned char *p, *pp, *ppp;    pcre_uint8 *p, *pp, *ppp;
1794    unsigned char *to_file = NULL;    pcre_uint8 *to_file = NULL;
1795    const unsigned char *tables = NULL;    const pcre_uint8 *tables = NULL;
1796    unsigned long int true_size, true_study_size = 0;    unsigned long int true_size, true_study_size = 0;
1797    size_t size, regex_gotten_store;    size_t size, regex_gotten_store;
1798    int do_allcaps = 0;    int do_allcaps = 0;
1799    int do_mark = 0;    int do_mark = 0;
1800    int do_study = 0;    int do_study = 0;
1801    int no_force_study = 0;    int no_force_study = 0;
1802    int do_debug = debug;    int do_debug = debug;
1803    int do_G = 0;    int do_G = 0;
1804    int do_g = 0;    int do_g = 0;
# Line 1447  while (!done) Line 1808  while (!done)
1808    int do_flip = 0;    int do_flip = 0;
1809    int erroroffset, len, delimiter, poffset;    int erroroffset, len, delimiter, poffset;
1810    
1811    use_utf8 = 0;    use_utf = 0;
1812    debug_lengths = 1;    debug_lengths = 1;
1813    
1814    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
# Line 1463  while (!done) Line 1824  while (!done)
1824    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
1825      {      {
1826      unsigned long int magic, get_options;      unsigned long int magic, get_options;
1827      uschar sbuf[8];      pcre_uint8 sbuf[8];
1828      FILE *f;      FILE *f;
1829    
1830      p++;      p++;
# Line 1486  while (!done) Line 1847  while (!done)
1847        (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];        (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];
1848    
1849      re = (real_pcre *)new_malloc(true_size);      re = (real_pcre *)new_malloc(true_size);
1850      regex_gotten_store = gotten_store;      regex_gotten_store = first_gotten_store;
1851    
1852      if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;      if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;
1853    
# Line 1508  while (!done) Line 1869  while (!done)
1869      fprintf(outfile, "Compiled pattern%s loaded from %s\n",      fprintf(outfile, "Compiled pattern%s loaded from %s\n",
1870        do_flip? " (byte-inverted)" : "", p);        do_flip? " (byte-inverted)" : "", p);
1871    
     /* Need to know if UTF-8 for printing data strings */  
   
     new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);  
     use_utf8 = (get_options & PCRE_UTF8) != 0;  
   
1872      /* Now see if there is any following study data. */      /* Now see if there is any following study data. */
1873    
1874      if (true_study_size != 0)      if (true_study_size != 0)
# Line 1529  while (!done) Line 1885  while (!done)
1885          {          {
1886          FAIL_READ:          FAIL_READ:
1887          fprintf(outfile, "Failed to read data from %s\n", p);          fprintf(outfile, "Failed to read data from %s\n", p);
1888          if (extra != NULL) new_free(extra);          if (extra != NULL)
1889              {
1890              PCRE_FREE_STUDY(extra);
1891              }
1892          if (re != NULL) new_free(re);          if (re != NULL) new_free(re);
1893          fclose(f);          fclose(f);
1894          continue;          continue;
# Line 1539  while (!done) Line 1898  while (!done)
1898        }        }
1899      else fprintf(outfile, "No study data\n");      else fprintf(outfile, "No study data\n");
1900    
1901        /* Flip the necessary bytes. */
1902        if (do_flip != 0)
1903          {
1904          PCRE_PATTERN_TO_HOST_BYTE_ORDER(re, extra, NULL);
1905          }
1906    
1907        /* Need to know if UTF-8 for printing data strings */
1908    
1909        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1910        use_utf = (get_options & PCRE_UTF8) != 0;
1911    
1912      fclose(f);      fclose(f);
1913      goto SHOW_INFO;      goto SHOW_INFO;
1914      }      }
1915    
1916    /* In-line pattern (the usual case). Get the delimiter and seek the end of    /* In-line pattern (the usual case). Get the delimiter and seek the end of
1917    the pattern; if is isn't complete, read more. */    the pattern; if it isn't complete, read more. */
1918    
1919    delimiter = *p++;    delimiter = *p++;
1920    
# Line 1610  while (!done) Line 1980  while (!done)
1980        case 'x': options |= PCRE_EXTENDED; break;        case 'x': options |= PCRE_EXTENDED; break;
1981    
1982        case '+':        case '+':
1983        if (do_showrest) do_showcaprest = 1; else do_showrest = 1;        if (do_showrest) do_showcaprest = 1; else do_showrest = 1;
1984        break;        break;
1985    
1986        case '=': do_allcaps = 1; break;        case '=': do_allcaps = 1; break;
1987        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1988        case 'B': do_debug = 1; break;        case 'B': do_debug = 1; break;
1989        case 'C': options |= PCRE_AUTO_CALLOUT; break;        case 'C': options |= PCRE_AUTO_CALLOUT; break;
# Line 1631  while (!done) Line 2001  while (!done)
2001        case 'P': do_posix = 1; break;        case 'P': do_posix = 1; break;
2002  #endif  #endif
2003    
2004        case 'S':        case 'S':
2005        if (do_study == 0) do_study = 1; else        if (do_study == 0)
2006            {
2007            do_study = 1;
2008            if (*pp == '+')
2009              {
2010              study_options |= PCRE_STUDY_JIT_COMPILE;
2011              pp++;
2012              }
2013            }
2014          else
2015          {          {
2016          do_study = 0;          do_study = 0;
2017          no_force_study = 1;          no_force_study = 1;
2018          }          }
2019        break;        break;
2020    
2021        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
# Line 1644  while (!done) Line 2023  while (!done)
2023        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
2024        case 'Y': options |= PCRE_NO_START_OPTIMISE; break;        case 'Y': options |= PCRE_NO_START_OPTIMISE; break;
2025        case 'Z': debug_lengths = 0; break;        case 'Z': debug_lengths = 0; break;
2026        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf = 1; break;
2027        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
2028    
2029        case 'T':        case 'T':
# Line 1691  while (!done) Line 2070  while (!done)
2070    
2071        case '<':        case '<':
2072          {          {
2073          if (strncmpic(pp, (uschar *)"JS>", 3) == 0)          if (strncmpic(pp, (pcre_uint8 *)"JS>", 3) == 0)
2074            {            {
2075            options |= PCRE_JAVASCRIPT_COMPAT;            options |= PCRE_JAVASCRIPT_COMPAT;
2076            pp += 3;            pp += 3;
# Line 1719  while (!done) Line 2098  while (!done)
2098    
2099    /* Handle compiling via the POSIX interface, which doesn't support the    /* Handle compiling via the POSIX interface, which doesn't support the
2100    timing, showing, or debugging options, nor the ability to pass over    timing, showing, or debugging options, nor the ability to pass over
2101    local character tables. */    local character tables. Neither does it have 16-bit support. */
2102    
2103  #if !defined NOPOSIX  #if !defined NOPOSIX
2104    if (posix || do_posix)    if (posix || do_posix)
# Line 1735  while (!done) Line 2114  while (!done)
2114      if ((options & PCRE_UCP) != 0) cflags |= REG_UCP;      if ((options & PCRE_UCP) != 0) cflags |= REG_UCP;
2115      if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;      if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;
2116    
2117        first_gotten_store = 0;
2118      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
2119    
2120      /* Compilation failed; go back for another re, skipping to blank line      /* Compilation failed; go back for another re, skipping to blank line
# Line 1756  while (!done) Line 2136  while (!done)
2136      {      {
2137      unsigned long int get_options;      unsigned long int get_options;
2138    
2139        /* In 16-bit mode, convert the input. */
2140    
2141    #ifdef SUPPORT_PCRE16
2142        if (use_pcre16)
2143          {
2144          if (to16(p, options & PCRE_UTF8, (int)strlen((char *)p)) < 0)
2145            {
2146            fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
2147              "converted to UTF-16\n");
2148            goto SKIP_DATA;
2149            }
2150          p = (pcre_uint8 *)buffer16;
2151          }
2152    #endif
2153    
2154        /* Compile many times when timing */
2155    
2156      if (timeit > 0)      if (timeit > 0)
2157        {        {
2158        register int i;        register int i;
# Line 1763  while (!done) Line 2160  while (!done)
2160        clock_t start_time = clock();        clock_t start_time = clock();
2161        for (i = 0; i < timeit; i++)        for (i = 0; i < timeit; i++)
2162          {          {
2163          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);          PCRE_COMPILE(re, p, options, &error, &erroroffset, tables);
2164          if (re != NULL) free(re);          if (re != NULL) free(re);
2165          }          }
2166        time_taken = clock() - start_time;        time_taken = clock() - start_time;
# Line 1772  while (!done) Line 2169  while (!done)
2169            (double)CLOCKS_PER_SEC);            (double)CLOCKS_PER_SEC);
2170        }        }
2171    
2172      re = pcre_compile((char *)p, options, &error, &erroroffset, tables);      first_gotten_store = 0;
2173        PCRE_COMPILE(re, p, options, &error, &erroroffset, tables);
2174    
2175      /* Compilation failed; go back for another re, skipping to blank line      /* Compilation failed; go back for another re, skipping to blank line
2176      if non-interactive. */      if non-interactive. */
# Line 1804  while (!done) Line 2202  while (!done)
2202      lines. */      lines. */
2203    
2204      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
2205      if ((get_options & PCRE_UTF8) != 0) use_utf8 = 1;      if ((get_options & PCRE_UTF8) != 0) use_utf = 1;
2206    
2207      /* Print information if required. There are now two info-returning      /* Extract the size for possible writing before possibly flipping it,
2208      functions. The old one has a limited interface and returns only limited      and remember the store that was got. */
2209      data. Check that it agrees with the newer one. */  
2210        true_size = ((real_pcre *)re)->size;
2211        regex_gotten_store = first_gotten_store;
2212    
2213        /* Output code size information if requested */
2214    
2215      if (log_store)      if (log_store)
2216        fprintf(outfile, "Memory allocation (code space): %d\n",        fprintf(outfile, "Memory allocation (code space): %d\n",
2217          (int)(gotten_store -          (int)(first_gotten_store -
2218                sizeof(real_pcre) -                sizeof(real_pcre) -
2219                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));
2220    
     /* Extract the size for possible writing before possibly flipping it,  
     and remember the store that was got. */  
   
     true_size = ((real_pcre *)re)->size;  
     regex_gotten_store = gotten_store;  
   
2221      /* If -s or /S was present, study the regex to generate additional info to      /* If -s or /S was present, study the regex to generate additional info to
2222      help with the matching, unless the pattern has the SS option, which      help with the matching, unless the pattern has the SS option, which
2223      suppresses the effect of /S (used for a few test patterns where studying is      suppresses the effect of /S (used for a few test patterns where studying is
2224      never sensible). */      never sensible). */
2225    
2226      if (do_study || (force_study && !no_force_study))      if (do_study || (force_study >= 0 && !no_force_study))
2227        {        {
2228        if (timeit > 0)        if (timeit > 0)
2229          {          {
# Line 1835  while (!done) Line 2231  while (!done)
2231          clock_t time_taken;          clock_t time_taken;
2232          clock_t start_time = clock();          clock_t start_time = clock();
2233          for (i = 0; i < timeit; i++)          for (i = 0; i < timeit; i++)
2234            extra = pcre_study(re, study_options, &error);            {
2235              PCRE_STUDY(extra, re, study_options | force_study_options, &error);
2236              }
2237          time_taken = clock() - start_time;          time_taken = clock() - start_time;
2238          if (extra != NULL) free(extra);          if (extra != NULL)
2239              {
2240              PCRE_FREE_STUDY(extra);
2241              }
2242          fprintf(outfile, "  Study time %.4f milliseconds\n",          fprintf(outfile, "  Study time %.4f milliseconds\n",
2243            (((double)time_taken * 1000.0) / (double)timeit) /            (((double)time_taken * 1000.0) / (double)timeit) /
2244              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
2245          }          }
2246        extra = pcre_study(re, study_options, &error);        PCRE_STUDY(extra, re, study_options | force_study_options, &error);
2247        if (error != NULL)        if (error != NULL)
2248          fprintf(outfile, "Failed to study: %s\n", error);          fprintf(outfile, "Failed to study: %s\n", error);
2249        else if (extra != NULL)        else if (extra != NULL)
2250            {
2251          true_study_size = ((pcre_study_data *)(extra->study_data))->size;          true_study_size = ((pcre_study_data *)(extra->study_data))->size;
2252            if (log_store)
2253              {
2254              size_t jitsize;
2255              new_info(re, extra, PCRE_INFO_JITSIZE, &jitsize);
2256              if (jitsize != 0)
2257                fprintf(outfile, "Memory allocation (JIT code): %d\n", jitsize);
2258              }
2259            }
2260        }        }
2261    
2262      /* If /K was present, we set up for handling MARK data. */      /* If /K was present, we set up for handling MARK data. */
# Line 1862  while (!done) Line 2272  while (!done)
2272        extra->flags |= PCRE_EXTRA_MARK;        extra->flags |= PCRE_EXTRA_MARK;
2273        }        }
2274    
2275      /* If the 'F' option was present, we flip the bytes of all the integer      /* Extract and display information from the compiled data if required. */
     fields in the regex data block and the study block. This is to make it  
     possible to test PCRE's handling of byte-flipped patterns, e.g. those  
     compiled on a different architecture. */  
   
     if (do_flip)  
       {  
       real_pcre *rre = (real_pcre *)re;  
       rre->magic_number =  
         byteflip(rre->magic_number, sizeof(rre->magic_number));  
       rre->size = byteflip(rre->size, sizeof(rre->size));  
       rre->options = byteflip(rre->options, sizeof(rre->options));  
       rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));  
       rre->top_bracket =  
         (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));  
       rre->top_backref =  
         (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));  
       rre->first_byte =  
         (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));  
       rre->req_byte =  
         (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));  
       rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,  
         sizeof(rre->name_table_offset));  
       rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,  
         sizeof(rre->name_entry_size));  
       rre->name_count = (pcre_uint16)byteflip(rre->name_count,  
         sizeof(rre->name_count));  
   
       if (extra != NULL)  
         {  
         pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);  
         rsd->size = byteflip(rsd->size, sizeof(rsd->size));  
         rsd->flags = byteflip(rsd->flags, sizeof(rsd->flags));  
         rsd->minlength = byteflip(rsd->minlength, sizeof(rsd->minlength));  
         }  
       }  
   
     /* Extract information from the compiled data if required */  
2276    
2277      SHOW_INFO:      SHOW_INFO:
2278    
2279      if (do_debug)      if (do_debug)
2280        {        {
2281        fprintf(outfile, "------------------------------------------------------------------\n");        fprintf(outfile, "------------------------------------------------------------------\n");
2282    #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
2283          if (use_pcre16)
2284            pcre16_printint(re, outfile, debug_lengths);
2285          else
2286            pcre_printint(re, outfile, debug_lengths);
2287    #elif defined SUPPORT_PCRE8
2288        pcre_printint(re, outfile, debug_lengths);        pcre_printint(re, outfile, debug_lengths);
2289    #else
2290          pcre16_printint(re, outfile, debug_lengths);
2291    #endif
2292        }        }
2293    
2294      /* We already have the options in get_options (see above) */      /* We already have the options in get_options (see above) */
# Line 1920  while (!done) Line 2302  while (!done)
2302        int count, backrefmax, first_char, need_char, okpartial, jchanged,        int count, backrefmax, first_char, need_char, okpartial, jchanged,
2303          hascrorlf;          hascrorlf;
2304        int nameentrysize, namecount;        int nameentrysize, namecount;
2305        const uschar *nametable;        const pcre_uchar *nametable;
2306    
2307        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
2308        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
# Line 1934  while (!done) Line 2316  while (!done)
2316        new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);        new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
2317        new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);        new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
2318    
2319          /* The old, obsolete function pcre_info() works only in 8-bit mode. Check
2320          that it gives the same results as the new function. */
2321    
2322  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
2323        old_count = pcre_info(re, &old_options, &old_first_char);        if (!use_pcre16)
       if (count < 0) fprintf(outfile,  
         "Error %d from pcre_info()\n", count);  
       else  
2324          {          {
2325          if (old_count != count) fprintf(outfile,          old_count = pcre_info(re, &old_options, &old_first_char);
2326            "Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count,          if (count < 0) fprintf(outfile,
2327              old_count);            "Error %d from pcre_info()\n", count);
2328            else
2329          if (old_first_char != first_char) fprintf(outfile,            {
2330            "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n",            if (old_count != count) fprintf(outfile,
2331              first_char, old_first_char);              "Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count,
2332                  old_count);
2333          if (old_options != (int)get_options) fprintf(outfile,  
2334            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",            if (old_first_char != first_char) fprintf(outfile,
2335              get_options, old_options);              "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n",
2336                  first_char, old_first_char);
2337    
2338              if (old_options != (int)get_options) fprintf(outfile,
2339                "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
2340                  get_options, old_options);
2341              }
2342          }          }
2343  #endif  #endif
2344    
# Line 1994  while (!done) Line 2382  while (!done)
2382            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
2383            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
2384            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
2385            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",            ((get_options & PCRE_UTF8) != 0)? " utf" : "",
2386            ((get_options & PCRE_UCP) != 0)? " ucp" : "",            ((get_options & PCRE_UCP) != 0)? " ucp" : "",
2387            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf_check" : "",
2388            ((get_options & PCRE_NO_START_OPTIMIZE) != 0)? " no_start_optimize" : "",            ((get_options & PCRE_NO_START_OPTIMIZE) != 0)? " no_start_optimize" : "",
2389            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
2390    
# Line 2038  while (!done) Line 2426  while (!done)
2426          }          }
2427        else        else
2428          {          {
2429          int ch = first_char & 255;          const char *caseless =
2430          const char *caseless = ((first_char & REQ_CASELESS) == 0)?            ((((real_pcre *)re)->flags & PCRE_FCH_CASELESS) == 0)?
2431            "" : " (caseless)";            "" : " (caseless)";
2432          if (PRINTHEX(ch))  
2433            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);          if (PRINTOK(first_char))
2434              fprintf(outfile, "First char = \'%c\'%s\n", first_char, caseless);
2435          else          else
2436            fprintf(outfile, "First char = %d%s\n", ch, caseless);            {
2437              fprintf(outfile, "First char = ");
2438              pchar(first_char, outfile);
2439              fprintf(outfile, "%s\n", caseless);
2440              }
2441          }          }
2442    
2443        if (need_char < 0)        if (need_char < 0)
# Line 2053  while (!done) Line 2446  while (!done)
2446          }          }
2447        else        else
2448          {          {
2449          int ch = need_char & 255;          const char *caseless =
2450          const char *caseless = ((need_char & REQ_CASELESS) == 0)?            ((((real_pcre *)re)->flags & PCRE_RCH_CASELESS) == 0)?
2451            "" : " (caseless)";            "" : " (caseless)";
2452          if (PRINTHEX(ch))  
2453            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);          if (PRINTOK(need_char))
2454              fprintf(outfile, "Need char = \'%c\'%s\n", need_char, caseless);
2455          else          else
2456            fprintf(outfile, "Need char = %d%s\n", ch, caseless);            fprintf(outfile, "Need char = %d%s\n", need_char, caseless);
2457          }          }
2458    
2459        /* Don't output study size; at present it is in any case a fixed        /* Don't output study size; at present it is in any case a fixed
2460        value, but it varies, depending on the computer architecture, and        value, but it varies, depending on the computer architecture, and
2461        so messes up the test suite. (And with the /F option, it might be        so messes up the test suite. (And with the /F option, it might be
2462        flipped.) If study was forced by an external -s, don't show this        flipped.) If study was forced by an external -s, don't show this
2463        information unless -i or -d was also present. This means that, except        information unless -i or -d was also present. This means that, except
2464        when auto-callouts are involved, the output from runs with and without        when auto-callouts are involved, the output from runs with and without
2465        -s should be identical. */        -s should be identical. */
2466    
2467        if (do_study || (force_study && showinfo && !no_force_study))        if (do_study || (force_study >= 0 && showinfo && !no_force_study))
2468          {          {
2469          if (extra == NULL)          if (extra == NULL)
2470            fprintf(outfile, "Study returned NULL\n");            fprintf(outfile, "Study returned NULL\n");
2471          else          else
2472            {            {
2473            uschar *start_bits = NULL;            pcre_uint8 *start_bits = NULL;
2474            int minlength;            int minlength;
2475    
2476            new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength);            new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength);
# Line 2099  while (!done) Line 2493  while (!done)
2493                    fprintf(outfile, "\n  ");                    fprintf(outfile, "\n  ");
2494                    c = 2;                    c = 2;
2495                    }                    }
2496                  if (PRINTHEX(i) && i != ' ')                  if (PRINTOK(i) && i != ' ')
2497                    {                    {
2498                    fprintf(outfile, "%c ", i);                    fprintf(outfile, "%c ", i);
2499                    c += 2;                    c += 2;
# Line 2114  while (!done) Line 2508  while (!done)
2508              fprintf(outfile, "\n");              fprintf(outfile, "\n");
2509              }              }
2510            }            }
2511    
2512            /* Show this only if the JIT was set by /S, not by -s. */
2513    
2514            if ((study_options & PCRE_STUDY_JIT_COMPILE) != 0)
2515              {
2516              int jit;
2517              new_info(re, extra, PCRE_INFO_JIT, &jit);
2518              if (jit)
2519                fprintf(outfile, "JIT study was successful\n");
2520              else
2521    #ifdef SUPPORT_JIT
2522                fprintf(outfile, "JIT study was not successful\n");
2523    #else
2524                fprintf(outfile, "JIT support is not available in this version of PCRE\n");
2525    #endif
2526              }
2527          }          }
2528        }        }
2529    
# Line 2123  while (!done) Line 2533  while (!done)
2533    
2534      if (to_file != NULL)      if (to_file != NULL)
2535        {        {
2536          /* If the 'F' option was present, we flip the bytes of all the integer
2537          fields in the regex data block and the study block. This is to make it
2538          possible to test PCRE's handling of byte-flipped patterns, e.g. those
2539          compiled on a different architecture. */
2540    
2541          if (do_flip)
2542            {
2543            real_pcre *rre = (real_pcre *)re;
2544            rre->magic_number =
2545              byteflip(rre->magic_number, sizeof(rre->magic_number));
2546            rre->size = byteflip(rre->size, sizeof(rre->size));
2547            rre->options = byteflip(rre->options, sizeof(rre->options));
2548            rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
2549            rre->top_bracket =
2550              (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
2551            rre->top_backref =
2552              (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
2553            rre->first_char =
2554              (pcre_uint16)byteflip(rre->first_char, sizeof(rre->first_char));
2555            rre->req_char =
2556              (pcre_uint16)byteflip(rre->req_char, sizeof(rre->req_char));
2557            rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
2558              sizeof(rre->name_table_offset));
2559            rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
2560              sizeof(rre->name_entry_size));
2561            rre->name_count = (pcre_uint16)byteflip(rre->name_count,
2562              sizeof(rre->name_count));
2563    
2564            if (extra != NULL)
2565              {
2566              pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
2567              rsd->size = byteflip(rsd->size, sizeof(rsd->size));
2568              rsd->flags = byteflip(rsd->flags, sizeof(rsd->flags));
2569              rsd->minlength = byteflip(rsd->minlength, sizeof(rsd->minlength));
2570              }
2571            }
2572    
2573        FILE *f = fopen((char *)to_file, "wb");        FILE *f = fopen((char *)to_file, "wb");
2574        if (f == NULL)        if (f == NULL)
2575          {          {
# Line 2130  while (!done) Line 2577  while (!done)
2577          }          }
2578        else        else
2579          {          {
2580          uschar sbuf[8];          pcre_uint8 sbuf[8];
2581          sbuf[0] = (uschar)((true_size >> 24) & 255);          sbuf[0] = (pcre_uint8)((true_size >> 24) & 255);
2582          sbuf[1] = (uschar)((true_size >> 16) & 255);          sbuf[1] = (pcre_uint8)((true_size >> 16) & 255);
2583          sbuf[2] = (uschar)((true_size >>  8) & 255);          sbuf[2] = (pcre_uint8)((true_size >>  8) & 255);
2584          sbuf[3] = (uschar)((true_size) & 255);          sbuf[3] = (pcre_uint8)((true_size) & 255);
2585    
2586          sbuf[4] = (uschar)((true_study_size >> 24) & 255);          sbuf[4] = (pcre_uint8)((true_study_size >> 24) & 255);
2587          sbuf[5] = (uschar)((true_study_size >> 16) & 255);          sbuf[5] = (pcre_uint8)((true_study_size >> 16) & 255);
2588          sbuf[6] = (uschar)((true_study_size >>  8) & 255);          sbuf[6] = (pcre_uint8)((true_study_size >>  8) & 255);
2589          sbuf[7] = (uschar)((true_study_size) & 255);          sbuf[7] = (pcre_uint8)((true_study_size) & 255);
2590    
2591          if (fwrite(sbuf, 1, 8, f) < 8 ||          if (fwrite(sbuf, 1, 8, f) < 8 ||
2592              fwrite(re, 1, true_size, f) < true_size)              fwrite(re, 1, true_size, f) < true_size)
# Line 2149  while (!done) Line 2596  while (!done)
2596          else          else
2597            {            {
2598            fprintf(outfile, "Compiled pattern written to %s\n", to_file);            fprintf(outfile, "Compiled pattern written to %s\n", to_file);
2599    
2600            /* If there is study data, write it, but verify the writing only            /* If there is study data, write it. */
2601            if the studying was requested by /S, not just by -s. */  
   
2602            if (extra != NULL)            if (extra != NULL)
2603              {              {
2604              if (fwrite(extra->study_data, 1, true_study_size, f) <              if (fwrite(extra->study_data, 1, true_study_size, f) <
# Line 2168  while (!done) Line 2614  while (!done)
2614          }          }
2615    
2616        new_free(re);        new_free(re);
2617        if (extra != NULL) new_free(extra);        if (extra != NULL)
2618            {
2619            PCRE_FREE_STUDY(extra);
2620            }
2621        if (locale_set)        if (locale_set)
2622          {          {
2623          new_free((void *)tables);          new_free((void *)tables);
# Line 2183  while (!done) Line 2632  while (!done)
2632    
2633    for (;;)    for (;;)
2634      {      {
2635      uschar *q;      pcre_uint8 *q;
2636      uschar *bptr;      pcre_uint8 *bptr;
2637      int *use_offsets = offsets;      int *use_offsets = offsets;
2638      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
2639      int callout_data = 0;      int callout_data = 0;
# Line 2210  while (!done) Line 2659  while (!done)
2659    
2660      pcre_callout = callout;      pcre_callout = callout;
2661      first_callout = 1;      first_callout = 1;
2662        last_callout_mark = NULL;
2663      callout_extra = 0;      callout_extra = 0;
2664      callout_count = 0;      callout_count = 0;
2665      callout_fail_count = 999999;      callout_fail_count = 999999;
# Line 2268  while (!done) Line 2718  while (!done)
2718            c = c * 8 + *p++ - '0';            c = c * 8 + *p++ - '0';
2719    
2720  #if !defined NOUTF8  #if !defined NOUTF8
2721          if (use_utf8 && c > 255)          if (use_utf && c > 255)
2722            {            {
2723            unsigned char buff8[8];            pcre_uint8 buff8[8];
2724            int ii, utn;            int ii, utn;
2725            utn = ord2utf8(c, buff8);            utn = ord2utf8(c, buff8);
2726            for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];            for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
# Line 2286  while (!done) Line 2736  while (!done)
2736  #if !defined NOUTF8  #if !defined NOUTF8
2737          if (*p == '{')          if (*p == '{')
2738            {            {
2739            unsigned char *pt = p;            pcre_uint8 *pt = p;
2740            c = 0;            c = 0;
2741            while (isxdigit(*(++pt)))  
2742              c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'W');            /* We used to have "while (isxdigit(*(++pt)))" here, but it fails
2743              when isxdigit() is a macro that refers to its argument more than
2744              once. This is banned by the C Standard, but apparently happens in at
2745              least one MacOS environment. */
2746    
2747              for (pt++; isxdigit(*pt); pt++)
2748                c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'a' - 10);
2749            if (*pt == '}')            if (*pt == '}')
2750              {              {
2751              unsigned char buff8[8];              pcre_uint8 buff8[8];
2752              int ii, utn;              int ii, utn;
2753              if (use_utf8)              if (use_utf)
2754                {                {
2755                utn = ord2utf8(c, buff8);                utn = ord2utf8(c, buff8);
2756                for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
# Line 2319  while (!done) Line 2775  while (!done)
2775          c = 0;          c = 0;
2776          while (i++ < 2 && isxdigit(*p))          while (i++ < 2 && isxdigit(*p))
2777            {            {
2778            c = c * 16 + tolower(*p) - ((isdigit(*p))? '0' : 'W');            c = c * 16 + tolower(*p) - ((isdigit(*p))? '0' : 'a' - 10);
2779            p++;            p++;
2780            }            }
2781          break;          break;
# Line 2354  while (!done) Line 2810  while (!done)
2810            }            }
2811          else if (isalnum(*p))          else if (isalnum(*p))
2812            {            {
2813            uschar *npp = copynamesptr;            pcre_uchar *npp = copynamesptr;
2814            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
2815            *npp++ = 0;            *npp++ = 0;
2816            *npp = 0;            *npp = 0;
# Line 2424  while (!done) Line 2880  while (!done)
2880            }            }
2881          else if (isalnum(*p))          else if (isalnum(*p))
2882            {            {
2883            uschar *npp = getnamesptr;            pcre_uchar *npp = getnamesptr;
2884            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
2885            *npp++ = 0;            *npp++ = 0;
2886            *npp = 0;            *npp = 0;
# Line 2435  while (!done) Line 2891  while (!done)
2891            }            }
2892          continue;          continue;
2893    
2894            case 'J':
2895            while(isdigit(*p)) n = n * 10 + *p++ - '0';
2896            if (extra != NULL
2897                && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0
2898                && extra->executable_jit != NULL)
2899              {
2900              if (jit_stack != NULL) pcre_jit_stack_free(jit_stack);
2901              jit_stack = pcre_jit_stack_alloc(1, n * 1024);
2902              pcre_assign_jit_stack(extra, jit_callback, jit_stack);
2903              }
2904            continue;
2905    
2906          case 'L':          case 'L':
2907          getlist = 1;          getlist = 1;
2908          continue;          continue;
# Line 2590  while (!done) Line 3058  while (!done)
3058            if (pmatch[i].rm_so >= 0)            if (pmatch[i].rm_so >= 0)
3059              {              {
3060              fprintf(outfile, "%2d: ", (int)i);              fprintf(outfile, "%2d: ", (int)i);
3061              (void)pchars(dbuffer + pmatch[i].rm_so,              PCHARSV(dbuffer + pmatch[i].rm_so,
3062                pmatch[i].rm_eo - pmatch[i].rm_so, outfile);                pmatch[i].rm_eo - pmatch[i].rm_so, outfile);
3063              fprintf(outfile, "\n");              fprintf(outfile, "\n");
3064              if (do_showcaprest || (i == 0 && do_showrest))              if (do_showcaprest || (i == 0 && do_showrest))
3065                {                {
3066                fprintf(outfile, "%2d+ ", (int)i);                fprintf(outfile, "%2d+ ", (int)i);
3067                (void)pchars(dbuffer + pmatch[i].rm_eo, len - pmatch[i].rm_eo,                PCHARSV(dbuffer + pmatch[i].rm_eo, len - pmatch[i].rm_eo,
3068                  outfile);                  outfile);
3069                fprintf(outfile, "\n");                fprintf(outfile, "\n");
3070                }                }
# Line 2604  while (!done) Line 3072  while (!done)
3072            }            }
3073          }          }
3074        free(pmatch);        free(pmatch);
3075          goto NEXT_DATA;
3076        }        }
3077    
3078    #endif  /* !defined NOPOSIX */
3079    
3080      /* Handle matching via the native interface - repeats for /g and /G */      /* Handle matching via the native interface - repeats for /g and /G */
3081    
3082      else  #ifdef SUPPORT_PCRE16
3083  #endif  /* !defined NOPOSIX */      if (use_pcre16)
3084          {
3085          len = to16(bptr, (((real_pcre *)re)->options) & PCRE_UTF8, len);
3086          if (len < 0)
3087            {
3088            fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
3089              "converted to UTF-16\n");
3090            goto NEXT_DATA;
3091            }
3092          bptr = (pcre_uint8 *)buffer16;
3093          }
3094    #endif
3095    
3096      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
3097        {        {
# Line 2634  while (!done) Line 3116  while (!done)
3116  #endif  #endif
3117    
3118          for (i = 0; i < timeitm; i++)          for (i = 0; i < timeitm; i++)
3119            count = pcre_exec(re, extra, (char *)bptr, len,            {
3120              PCRE_EXEC(count, re, extra, bptr, len,
3121              start_offset, options | g_notempty, use_offsets, use_size_offsets);              start_offset, options | g_notempty, use_offsets, use_size_offsets);
3122              }
3123          time_taken = clock() - start_time;          time_taken = clock() - start_time;
3124          fprintf(outfile, "Execute time %.4f milliseconds\n",          fprintf(outfile, "Execute time %.4f milliseconds\n",
3125            (((double)time_taken * 1000.0) / (double)timeitm) /            (((double)time_taken * 1000.0) / (double)timeitm) /
# Line 2645  while (!done) Line 3128  while (!done)
3128    
3129        /* If find_match_limit is set, we want to do repeated matches with        /* If find_match_limit is set, we want to do repeated matches with
3130        varying limits in order to find the minimum value for the match limit and        varying limits in order to find the minimum value for the match limit and
3131        for the recursion limit. */        for the recursion limit. The match limits are relevant only to the normal
3132          running of pcre_exec(), so disable the JIT optimization. This makes it
3133          possible to run the same set of tests with and without JIT externally
3134          requested. */
3135    
3136        if (find_match_limit)        if (find_match_limit)
3137          {          {
# Line 2654  while (!done) Line 3140  while (!done)
3140            extra = (pcre_extra *)malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
3141            extra->flags = 0;            extra->flags = 0;
3142            }            }
3143            else extra->flags &= ~PCRE_EXTRA_EXECUTABLE_JIT;
3144    
3145          (void)check_match_limit(re, extra, bptr, len, start_offset,          (void)check_match_limit(re, extra, bptr, len, start_offset,
3146            options|g_notempty, use_offsets, use_size_offsets,            options|g_notempty, use_offsets, use_size_offsets,
# Line 2677  while (!done) Line 3164  while (!done)
3164            }            }
3165          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;
3166          extra->callout_data = &callout_data;          extra->callout_data = &callout_data;
3167          count = pcre_exec(re, extra, (char *)bptr, len, start_offset,          PCRE_EXEC(count, re, extra, bptr, len, start_offset,
3168            options | g_notempty, use_offsets, use_size_offsets);            options | g_notempty, use_offsets, use_size_offsets);
3169          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;
3170          }          }
# Line 2702  while (!done) Line 3189  while (!done)
3189    
3190        else        else
3191          {          {
3192          count = pcre_exec(re, extra, (char *)bptr, len,          PCRE_EXEC(count, re, extra, bptr, len, start_offset,
3193            start_offset, options | g_notempty, use_offsets, use_size_offsets);            options | g_notempty, use_offsets, use_size_offsets);
3194          if (count == 0)          if (count == 0)
3195            {            {
3196            fprintf(outfile, "Matched, but too many substrings\n");            fprintf(outfile, "Matched, but too many substrings\n");
# Line 2736  while (!done) Line 3223  while (!done)
3223              do_g = do_G = FALSE;        /* Break g/G loop */              do_g = do_G = FALSE;        /* Break g/G loop */
3224              }              }
3225            }            }
3226    
3227          /* do_allcaps requests showing of all captures in the pattern, to check          /* do_allcaps requests showing of all captures in the pattern, to check
3228          unset ones at the end. */          unset ones at the end. */
3229    
3230          if (do_allcaps)          if (do_allcaps)
3231            {            {
3232            new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);            new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
3233            count++;   /* Allow for full match */            count++;   /* Allow for full match */
3234            if (count * 2 > use_size_offsets) count = use_size_offsets/2;            if (count * 2 > use_size_offsets) count = use_size_offsets/2;
3235            }            }
3236    
3237          /* Output the captured substrings */          /* Output the captured substrings */
3238    
3239          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
3240            {            {
3241            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
3242              {              {
3243              if (use_offsets[i] != -1)              if (use_offsets[i] != -1)
3244                fprintf(outfile, "ERROR: bad negative value %d for offset %d\n",                fprintf(outfile, "ERROR: bad negative value %d for offset %d\n",
3245                  use_offsets[i], i);                  use_offsets[i], i);
3246              if (use_offsets[i+1] != -1)              if (use_offsets[i+1] != -1)
3247                fprintf(outfile, "ERROR: bad negative value %d for offset %d\n",                fprintf(outfile, "ERROR: bad negative value %d for offset %d\n",
3248                  use_offsets[i+1], i+1);                  use_offsets[i+1], i+1);
3249              fprintf(outfile, "%2d: <unset>\n", i/2);              fprintf(outfile, "%2d: <unset>\n", i/2);
3250              }              }
3251            else            else
3252              {              {
3253              fprintf(outfile, "%2d: ", i/2);              fprintf(outfile, "%2d: ", i/2);
3254              (void)pchars(bptr + use_offsets[i],              PCHARSV(bptr + use_offsets[i],
3255                use_offsets[i+1] - use_offsets[i], outfile);                use_offsets[i+1] - use_offsets[i], outfile);
3256              fprintf(outfile, "\n");              fprintf(outfile, "\n");
3257              if (do_showcaprest || (i == 0 && do_showrest))              if (do_showcaprest || (i == 0 && do_showrest))
3258                {                {
3259                fprintf(outfile, "%2d+ ", i/2);                fprintf(outfile, "%2d+ ", i/2);
3260                (void)pchars(bptr + use_offsets[i+1], len - use_offsets[i+1],                PCHARSV(bptr + use_offsets[i+1], len - use_offsets[i+1],
3261                  outfile);                  outfile);
3262                fprintf(outfile, "\n");                fprintf(outfile, "\n");
3263                }                }
# Line 2852  while (!done) Line 3339  while (!done)
3339                fprintf(outfile, "%2dL %s\n", i, stringlist[i]);                fprintf(outfile, "%2dL %s\n", i, stringlist[i]);
3340              if (stringlist[i] != NULL)              if (stringlist[i] != NULL)
3341                fprintf(outfile, "string list not terminated by NULL\n");                fprintf(outfile, "string list not terminated by NULL\n");
             /* free((void *)stringlist); */  
3342              pcre_free_substring_list(stringlist);              pcre_free_substring_list(stringlist);
3343              }              }
3344            }            }
# Line 2867  while (!done) Line 3353  while (!done)
3353          if (use_size_offsets > 1)          if (use_size_offsets > 1)
3354            {            {
3355            fprintf(outfile, ": ");            fprintf(outfile, ": ");
3356            pchars(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],            PCHARSV(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],
3357              outfile);              outfile);
3358            }            }
3359          fprintf(outfile, "\n");          fprintf(outfile, "\n");
# Line 2917  while (!done) Line 3403  while (!done)
3403                bptr[start_offset] == '\r' &&                bptr[start_offset] == '\r' &&
3404                bptr[start_offset+1] == '\n')                bptr[start_offset+1] == '\n')
3405              onechar++;              onechar++;
3406            else if (use_utf8)            else if (use_utf)
3407              {              {
3408              while (start_offset + onechar < len)              while (start_offset + onechar < len)
3409                {                {
# Line 2930  while (!done) Line 3416  while (!done)
3416          else          else
3417            {            {
3418            switch(count)            switch(count)
3419              {              {
3420              case PCRE_ERROR_NOMATCH:              case PCRE_ERROR_NOMATCH:
3421              if (gmatched == 0)              if (gmatched == 0)
3422                {                {
# Line 2938  while (!done) Line 3424  while (!done)
3424                  else fprintf(outfile, "No match, mark = %s\n", markptr);                  else fprintf(outfile, "No match, mark = %s\n", markptr);
3425                }                }
3426              break;              break;
3427    
3428              case PCRE_ERROR_BADUTF8:              case PCRE_ERROR_BADUTF8:
3429              case PCRE_ERROR_SHORTUTF8:              case PCRE_ERROR_SHORTUTF8:
3430              fprintf(outfile, "Error %d (%s UTF-8 string)", count,              fprintf(outfile, "Error %d (%s UTF-8 string)", count,
3431                (count == PCRE_ERROR_BADUTF8)? "bad" : "short");                (count == PCRE_ERROR_BADUTF8)? "bad" : "short");
3432              if (use_size_offsets >= 2)              if (use_size_offsets >= 2)
3433                fprintf(outfile, " offset=%d reason=%d", use_offsets[0],                fprintf(outfile, " offset=%d reason=%d", use_offsets[0],
3434                  use_offsets[1]);                  use_offsets[1]);
3435              fprintf(outfile, "\n");              fprintf(outfile, "\n");
3436              break;              break;
3437    
3438              default:              default:
3439              if (count < 0 && (-count) < sizeof(errtexts)/sizeof(const char *))              if (count < 0 && (-count) < sizeof(errtexts)/sizeof(const char *))
3440                fprintf(outfile, "Error %d (%s)\n", count, errtexts[-count]);                fprintf(outfile, "Error %d (%s)\n", count, errtexts[-count]);
3441              else              else
3442                fprintf(outfile, "Error %d (Unexpected value)\n", count);                fprintf(outfile, "Error %d (Unexpected value)\n", count);
3443              break;              break;
3444              }              }
3445    
3446            break;  /* Out of the /g loop */            break;  /* Out of the /g loop */
3447            }            }
3448          }          }
# Line 3003  while (!done) Line 3489  while (!done)
3489  #endif  #endif
3490    
3491    if (re != NULL) new_free(re);    if (re != NULL) new_free(re);
3492    if (extra != NULL) new_free(extra);    if (extra != NULL)
3493        {
3494        PCRE_FREE_STUDY(extra);
3495        }
3496    if (locale_set)    if (locale_set)
3497      {      {
3498      new_free((void *)tables);      new_free((void *)tables);
3499      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
3500      locale_set = 0;      locale_set = 0;
3501      }      }
3502      if (jit_stack != NULL)
3503        {
3504        pcre_jit_stack_free(jit_stack);
3505        jit_stack = NULL;
3506        }
3507    }    }
3508    
3509  if (infile == stdin) fprintf(outfile, "\n");  if (infile == stdin) fprintf(outfile, "\n");
# Line 3024  free(dbuffer); Line 3518  free(dbuffer);
3518  free(pbuffer);  free(pbuffer);
3519  free(offsets);  free(offsets);
3520    
3521    #ifdef SUPPORT_PCRE16
3522    if (buffer16 != NULL) free(buffer16);
3523    #endif
3524    
3525  return yield;  return yield;
3526  }  }
3527    

Legend:
Removed from v.626  
changed lines
  Added in v.811

  ViewVC Help
Powered by ViewVC 1.1.5