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

Diff of /code/trunk/pcretest.c

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

revision 65 by nigel, Sat Feb 24 21:40:08 2007 UTC revision 210 by ph10, Wed Aug 8 14:24:50 2007 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 untidy in places. */  been extended and consequently is now rather, er, *very* untidy in places.
8    
9    -----------------------------------------------------------------------------
10    Redistribution and use in source and binary forms, with or without
11    modification, are permitted provided that the following conditions are met:
12    
13        * Redistributions of source code must retain the above copyright notice,
14          this list of conditions and the following disclaimer.
15    
16        * Redistributions in binary form must reproduce the above copyright
17          notice, this list of conditions and the following disclaimer in the
18          documentation and/or other materials provided with the distribution.
19    
20        * Neither the name of the University of Cambridge nor the names of its
21          contributors may be used to endorse or promote products derived from
22          this software without specific prior written permission.
23    
24    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
28    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
30    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34    POSSIBILITY OF SUCH DAMAGE.
35    -----------------------------------------------------------------------------
36    */
37    
38    
39    #ifdef HAVE_CONFIG_H
40    #include <config.h>
41    #endif
42    
43  #include <ctype.h>  #include <ctype.h>
44  #include <stdio.h>  #include <stdio.h>
# Line 12  been extended and consequently is now ra Line 46  been extended and consequently is now ra
46  #include <stdlib.h>  #include <stdlib.h>
47  #include <time.h>  #include <time.h>
48  #include <locale.h>  #include <locale.h>
49    #include <errno.h>
50    
51    
52    /* A number of things vary for Windows builds. Originally, pcretest opened its
53    input and output without "b"; then I was told that "b" was needed in some
54    environments, so it was added for release 5.0 to both the input and output. (It
55    makes no difference on Unix-like systems.) Later I was told that it is wrong
56    for the input on Windows. I've now abstracted the modes into two macros that
57    are set here, to make it easier to fiddle with them, and removed "b" from the
58    input mode under Windows. */
59    
60    #if defined(_WIN32) || defined(WIN32)
61    #include <io.h>                /* For _setmode() */
62    #include <fcntl.h>             /* For _O_BINARY */
63    #define INPUT_MODE   "r"
64    #define OUTPUT_MODE  "wb"
65    
66    #else
67    #include <sys/time.h>          /* These two includes are needed */
68    #include <sys/resource.h>      /* for setrlimit(). */
69    #define INPUT_MODE   "rb"
70    #define OUTPUT_MODE  "wb"
71    #endif
72    
73    
74    /* We have to include pcre_internal.h because we need the internal info for
75    displaying the results of pcre_study() and we also need to know about the
76    internal macros, structures, and other internal data values; pcretest has
77    "inside information" compared to a program that strictly follows the PCRE API.
78    
79    Although pcre_internal.h does itself include pcre.h, we explicitly include it
80    here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
81    appropriately for an application, not for building PCRE. */
82    
83    #include "pcre.h"
84    #include "pcre_internal.h"
85    
86    /* We need access to the data tables that PCRE uses. So as not to have to keep
87    two copies, we include the source file here, changing the names of the external
88    symbols to prevent clashes. */
89    
90    #define _pcre_utf8_table1      utf8_table1
91    #define _pcre_utf8_table1_size utf8_table1_size
92    #define _pcre_utf8_table2      utf8_table2
93    #define _pcre_utf8_table3      utf8_table3
94    #define _pcre_utf8_table4      utf8_table4
95    #define _pcre_utt              utt
96    #define _pcre_utt_size         utt_size
97    #define _pcre_OP_lengths       OP_lengths
98    
99    #include "pcre_tables.c"
100    
101    /* We also need the pcre_printint() function for printing out compiled
102    patterns. This function is in a separate file so that it can be included in
103    pcre_compile.c when that module is compiled with debugging enabled.
104    
105    The definition of the macro PRINTABLE, which determines whether to print an
106    output character as-is or as a hex value when showing compiled patterns, is
107    contained in this file. We uses it here also, in cases when the locale has not
108    been explicitly changed, so as to get consistent output from systems that
109    differ in their output from isprint() even in the "C" locale. */
110    
111  /* We need the internal info for displaying the results of pcre_study(). Also  #include "pcre_printint.src"
112  for getting the opcodes for showing compiled code. */  
113    #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
114    
 #define PCRE_SPY        /* For Win32 build, import data, not export */  
 #include "internal.h"  
115    
116  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
117  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 27  Makefile. */ Line 121  Makefile. */
121  #include "pcreposix.h"  #include "pcreposix.h"
122  #endif  #endif
123    
124    /* It is also possible, for the benefit of the version currently imported into
125    Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
126    interface to the DFA matcher (NODFA), and without the doublecheck of the old
127    "info" function (define NOINFOCHECK). In fact, we automatically cut out the
128    UTF8 support if PCRE is built without it. */
129    
130    #ifndef SUPPORT_UTF8
131    #ifndef NOUTF8
132    #define NOUTF8
133    #endif
134    #endif
135    
136    
137    /* Other parameters */
138    
139  #ifndef CLOCKS_PER_SEC  #ifndef CLOCKS_PER_SEC
140  #ifdef CLK_TCK  #ifdef CLK_TCK
141  #define CLOCKS_PER_SEC CLK_TCK  #define CLOCKS_PER_SEC CLK_TCK
# Line 35  Makefile. */ Line 144  Makefile. */
144  #endif  #endif
145  #endif  #endif
146    
147  #define LOOPREPEAT 50000  /* This is the default loop count for timing. */
148    
149    #define LOOPREPEAT 500000
150    
151    /* Static variables */
152    
153  static FILE *outfile;  static FILE *outfile;
154  static int log_store = 0;  static int log_store = 0;
# Line 44  static int callout_count; Line 156  static int callout_count;
156  static int callout_extra;  static int callout_extra;
157  static int callout_fail_count;  static int callout_fail_count;
158  static int callout_fail_id;  static int callout_fail_id;
159    static int debug_lengths;
160  static int first_callout;  static int first_callout;
161  static int utf8;  static int locale_set = 0;
162    static int show_malloc;
163    static int use_utf8;
164  static size_t gotten_store;  static size_t gotten_store;
165    
166    /* The buffers grow automatically if very long input lines are encountered. */
167    
168    static int buffer_size = 50000;
169    static uschar *buffer = NULL;
170    static uschar *dbuffer = NULL;
171    static uschar *pbuffer = NULL;
172    
 static int utf8_table1[] = {  
   0x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff};  
173    
 static int utf8_table2[] = {  
   0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc};  
174    
175  static int utf8_table3[] = {  /*************************************************
176    0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};  *        Read or extend an input line            *
177    *************************************************/
178    
179    /* Input lines are read into buffer, but both patterns and data lines can be
180    continued over multiple input lines. In addition, if the buffer fills up, we
181    want to automatically expand it so as to be able to handle extremely large
182    lines that are needed for certain stress tests. When the input buffer is
183    expanded, the other two buffers must also be expanded likewise, and the
184    contents of pbuffer, which are a copy of the input for callouts, must be
185    preserved (for when expansion happens for a data line). This is not the most
186    optimal way of handling this, but hey, this is just a test program!
187    
188    Arguments:
189      f            the file to read
190      start        where in buffer to start (this *must* be within buffer)
191    
192    Returns:       pointer to the start of new data
193                   could be a copy of start, or could be moved
194                   NULL if no data read and EOF reached
195    */
196    
197    static uschar *
198    extend_inputline(FILE *f, uschar *start)
199    {
200    uschar *here = start;
201    
202    for (;;)
203      {
204      int rlen = buffer_size - (here - buffer);
205    
206      if (rlen > 1000)
207        {
208        int dlen;
209        if (fgets((char *)here, rlen,  f) == NULL)
210          return (here == start)? NULL : start;
211        dlen = (int)strlen((char *)here);
212        if (dlen > 0 && here[dlen - 1] == '\n') return start;
213        here += dlen;
214        }
215    
216      else
217        {
218        int new_buffer_size = 2*buffer_size;
219        uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);
220        uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);
221        uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);
222    
223        if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
224          {
225          fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
226          exit(1);
227          }
228    
229        memcpy(new_buffer, buffer, buffer_size);
230        memcpy(new_pbuffer, pbuffer, buffer_size);
231    
232        buffer_size = new_buffer_size;
233    
234        start = new_buffer + (start - buffer);
235        here = new_buffer + (here - buffer);
236    
237        free(buffer);
238        free(dbuffer);
239        free(pbuffer);
240    
241        buffer = new_buffer;
242        dbuffer = new_dbuffer;
243        pbuffer = new_pbuffer;
244        }
245      }
246    
247    return NULL;  /* Control never gets here */
248    }
249    
 /*************************************************  
 *         Print compiled regex                   *  
 *************************************************/  
250    
 /* The code for doing this is held in a separate file that is also included in  
 pcre.c when it is compiled with the debug switch. It defines a function called  
 print_internals(), which uses a table of opcode lengths defined by the macro  
 OP_LENGTHS, whose name must be OP_lengths. */  
251    
 static uschar OP_lengths[] = { OP_LENGTHS };  
252    
 #include "printint.c"  
253    
254    
255    
# Line 82  static uschar OP_lengths[] = { OP_LENGTH Line 259  static uschar OP_lengths[] = { OP_LENGTH
259    
260  /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess  /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess
261  around with conditional compilation, just do the job by hand. It is only used  around with conditional compilation, just do the job by hand. It is only used
262  for unpicking the -o argument, so just keep it simple.  for unpicking arguments, so just keep it simple.
263    
264  Arguments:  Arguments:
265    str           string to be converted    str           string to be converted
# Line 103  return(result); Line 280  return(result);
280    
281    
282    
 /*************************************************  
 *       Convert character value to UTF-8         *  
 *************************************************/  
   
 /* This function takes an integer value in the range 0 - 0x7fffffff  
 and encodes it as a UTF-8 character in 0 to 6 bytes.  
   
 Arguments:  
   cvalue     the character value  
   buffer     pointer to buffer for result - at least 6 bytes long  
   
 Returns:     number of characters placed in the buffer  
              -1 if input character is negative  
              0 if input character is positive but too big (only when  
              int is longer than 32 bits)  
 */  
   
 static int  
 ord2utf8(int cvalue, unsigned char *buffer)  
 {  
 register int i, j;  
 for (i = 0; i < sizeof(utf8_table1)/sizeof(int); i++)  
   if (cvalue <= utf8_table1[i]) break;  
 if (i >= sizeof(utf8_table1)/sizeof(int)) return 0;  
 if (cvalue < 0) return -1;  
   
 buffer += i;  
 for (j = i; j > 0; j--)  
  {  
  *buffer-- = 0x80 | (cvalue & 0x3f);  
  cvalue >>= 6;  
  }  
 *buffer = utf8_table2[i] | cvalue;  
 return i + 1;  
 }  
   
283    
284  /*************************************************  /*************************************************
285  *            Convert UTF-8 string to value       *  *            Convert UTF-8 string to value       *
# Line 148  return i + 1; Line 289  return i + 1;
289  and returns the value of the character.  and returns the value of the character.
290    
291  Argument:  Argument:
292    buffer   a pointer to the byte vector    utf8bytes   a pointer to the byte vector
293    vptr     a pointer to an int to receive the value    vptr        a pointer to an int to receive the value
294    
295  Returns:   >  0 => the number of bytes consumed  Returns:      >  0 => the number of bytes consumed
296             -6 to 0 => malformed UTF-8 character at offset = (-return)                -6 to 0 => malformed UTF-8 character at offset = (-return)
297  */  */
298    
299  int  #if !defined NOUTF8
300  utf82ord(unsigned char *buffer, int *vptr)  
301    static int
302    utf82ord(unsigned char *utf8bytes, int *vptr)
303  {  {
304  int c = *buffer++;  int c = *utf8bytes++;
305  int d = c;  int d = c;
306  int i, j, s;  int i, j, s;
307    
# Line 178  d = (c & utf8_table3[i]) << s; Line 321  d = (c & utf8_table3[i]) << s;
321    
322  for (j = 0; j < i; j++)  for (j = 0; j < i; j++)
323    {    {
324    c = *buffer++;    c = *utf8bytes++;
325    if ((c & 0xc0) != 0x80) return -(j+1);    if ((c & 0xc0) != 0x80) return -(j+1);
326    s -= 6;    s -= 6;
327    d |= (c & 0x3f) << s;    d |= (c & 0x3f) << s;
# Line 186  for (j = 0; j < i; j++) Line 329  for (j = 0; j < i; j++)
329    
330  /* Check that encoding was the correct unique one */  /* Check that encoding was the correct unique one */
331    
332  for (j = 0; j < sizeof(utf8_table1)/sizeof(int); j++)  for (j = 0; j < utf8_table1_size; j++)
333    if (d <= utf8_table1[j]) break;    if (d <= utf8_table1[j]) break;
334  if (j != i) return -(i+1);  if (j != i) return -(i+1);
335    
# Line 196  if (j != i) return -(i+1); Line 339  if (j != i) return -(i+1);
339  return i+1;  return i+1;
340  }  }
341    
342    #endif
343    
344    
345    
346    /*************************************************
347    *       Convert character value to UTF-8         *
348    *************************************************/
349    
350    /* This function takes an integer value in the range 0 - 0x7fffffff
351    and encodes it as a UTF-8 character in 0 to 6 bytes.
352    
353    Arguments:
354      cvalue     the character value
355      utf8bytes  pointer to buffer for result - at least 6 bytes long
356    
357    Returns:     number of characters placed in the buffer
358    */
359    
360    #if !defined NOUTF8
361    
362    static int
363    ord2utf8(int cvalue, uschar *utf8bytes)
364    {
365    register int i, j;
366    for (i = 0; i < utf8_table1_size; i++)
367      if (cvalue <= utf8_table1[i]) break;
368    utf8bytes += i;
369    for (j = i; j > 0; j--)
370     {
371     *utf8bytes-- = 0x80 | (cvalue & 0x3f);
372     cvalue >>= 6;
373     }
374    *utf8bytes = utf8_table2[i] | cvalue;
375    return i + 1;
376    }
377    
378    #endif
379    
380    
381    
382  /*************************************************  /*************************************************
# Line 208  chars without printing. */ Line 389  chars without printing. */
389    
390  static int pchars(unsigned char *p, int length, FILE *f)  static int pchars(unsigned char *p, int length, FILE *f)
391  {  {
392  int c;  int c = 0;
393  int yield = 0;  int yield = 0;
394    
395  while (length-- > 0)  while (length-- > 0)
396    {    {
397    if (utf8)  #if !defined NOUTF8
398      if (use_utf8)
399      {      {
400      int rc = utf82ord(p, &c);      int rc = utf82ord(p, &c);
401    
# Line 221  while (length-- > 0) Line 403  while (length-- > 0)
403        {        {
404        length -= rc - 1;        length -= rc - 1;
405        p += rc;        p += rc;
406        if (c < 256 && isprint(c))        if (PRINTHEX(c))
407          {          {
408          if (f != NULL) fprintf(f, "%c", c);          if (f != NULL) fprintf(f, "%c", c);
409          yield++;          yield++;
410          }          }
411        else        else
412          {          {
413          int n;          int n = 4;
414          if (f != NULL) fprintf(f, "\\x{%02x}%n", c, &n);          if (f != NULL) fprintf(f, "\\x{%02x}", c);
415          yield += n;          yield += (n <= 0x000000ff)? 2 :
416                     (n <= 0x00000fff)? 3 :
417                     (n <= 0x0000ffff)? 4 :
418                     (n <= 0x000fffff)? 5 : 6;
419          }          }
420        continue;        continue;
421        }        }
422      }      }
423    #endif
424    
425     /* Not UTF-8, or malformed UTF-8  */     /* Not UTF-8, or malformed UTF-8  */
426    
427    if (isprint(c = *(p++)))    c = *p++;
428      if (PRINTHEX(c))
429      {      {
430      if (f != NULL) fprintf(f, "%c", c);      if (f != NULL) fprintf(f, "%c", c);
431      yield++;      yield++;
# Line 266  data is not zero. */ Line 453  data is not zero. */
453  static int callout(pcre_callout_block *cb)  static int callout(pcre_callout_block *cb)
454  {  {
455  FILE *f = (first_callout | callout_extra)? outfile : NULL;  FILE *f = (first_callout | callout_extra)? outfile : NULL;
456  int i, pre_start, post_start;  int i, pre_start, post_start, subject_length;
457    
458  if (callout_extra)  if (callout_extra)
459    {    {
   int i;  
460    fprintf(f, "Callout %d: last capture = %d\n",    fprintf(f, "Callout %d: last capture = %d\n",
461      cb->callout_number, cb->capture_last);      cb->callout_number, cb->capture_last);
462    
# Line 298  pre_start = pchars((unsigned char *)cb-> Line 484  pre_start = pchars((unsigned char *)cb->
484  post_start = pchars((unsigned char *)(cb->subject + cb->start_match),  post_start = pchars((unsigned char *)(cb->subject + cb->start_match),
485    cb->current_position - cb->start_match, f);    cb->current_position - cb->start_match, f);
486    
487    subject_length = pchars((unsigned char *)cb->subject, cb->subject_length, NULL);
488    
489  (void)pchars((unsigned char *)(cb->subject + cb->current_position),  (void)pchars((unsigned char *)(cb->subject + cb->current_position),
490    cb->subject_length - cb->current_position, f);    cb->subject_length - cb->current_position, f);
491    
492  if (f != NULL) fprintf(f, "\n");  if (f != NULL) fprintf(f, "\n");
493    
494  /* Always print appropriate indicators, with callout number if not already  /* Always print appropriate indicators, with callout number if not already
495  shown */  shown. For automatic callouts, show the pattern offset. */
496    
497  if (callout_extra) fprintf(outfile, "    ");  if (cb->callout_number == 255)
498    else fprintf(outfile, "%3d ", cb->callout_number);    {
499      fprintf(outfile, "%+3d ", cb->pattern_position);
500      if (cb->pattern_position > 99) fprintf(outfile, "\n    ");
501      }
502    else
503      {
504      if (callout_extra) fprintf(outfile, "    ");
505        else fprintf(outfile, "%3d ", cb->callout_number);
506      }
507    
508  for (i = 0; i < pre_start; i++) fprintf(outfile, " ");  for (i = 0; i < pre_start; i++) fprintf(outfile, " ");
509  fprintf(outfile, "^");  fprintf(outfile, "^");
# Line 318  if (post_start > 0) Line 514  if (post_start > 0)
514    fprintf(outfile, "^");    fprintf(outfile, "^");
515    }    }
516    
517  fprintf(outfile, "\n");  for (i = 0; i < subject_length - pre_start - post_start + 4; i++)
518      fprintf(outfile, " ");
519    
520    fprintf(outfile, "%.*s", (cb->next_item_length == 0)? 1 : cb->next_item_length,
521      pbuffer + cb->pattern_position);
522    
523    fprintf(outfile, "\n");
524  first_callout = 0;  first_callout = 0;
525    
526  if ((int)(cb->callout_data) != 0)  if (cb->callout_data != NULL)
527    {    {
528    fprintf(outfile, "Callout data = %d\n", (int)(cb->callout_data));    int callout_data = *((int *)(cb->callout_data));
529    return (int)(cb->callout_data);    if (callout_data != 0)
530        {
531        fprintf(outfile, "Callout data = %d\n", callout_data);
532        return callout_data;
533        }
534    }    }
535    
536  return (cb->callout_number != callout_fail_id)? 0 :  return (cb->callout_number != callout_fail_id)? 0 :
# Line 334  return (cb->callout_number != callout_fa Line 539  return (cb->callout_number != callout_fa
539    
540    
541  /*************************************************  /*************************************************
542  *            Local malloc function               *  *            Local malloc functions              *
543  *************************************************/  *************************************************/
544    
545  /* Alternative malloc function, to test functionality and show the size of the  /* Alternative malloc function, to test functionality and show the size of the
# Line 342  compiled re. */ Line 547  compiled re. */
547    
548  static void *new_malloc(size_t size)  static void *new_malloc(size_t size)
549  {  {
550    void *block = malloc(size);
551  gotten_store = size;  gotten_store = size;
552  return malloc(size);  if (show_malloc)
553      fprintf(outfile, "malloc       %3d %p\n", (int)size, block);
554    return block;
555  }  }
556    
557    static void new_free(void *block)
558    {
559    if (show_malloc)
560      fprintf(outfile, "free             %p\n", block);
561    free(block);
562    }
563    
564    
565    /* For recursion malloc/free, to test stacking calls */
566    
567    static void *stack_malloc(size_t size)
568    {
569    void *block = malloc(size);
570    if (show_malloc)
571      fprintf(outfile, "stack_malloc %3d %p\n", (int)size, block);
572    return block;
573    }
574    
575    static void stack_free(void *block)
576    {
577    if (show_malloc)
578      fprintf(outfile, "stack_free       %p\n", block);
579    free(block);
580    }
581    
582    
583  /*************************************************  /*************************************************
# Line 364  if ((rc = pcre_fullinfo(re, study, optio Line 596  if ((rc = pcre_fullinfo(re, study, optio
596    
597    
598  /*************************************************  /*************************************************
599    *         Byte flipping function                 *
600    *************************************************/
601    
602    static unsigned long int
603    byteflip(unsigned long int value, int n)
604    {
605    if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
606    return ((value & 0x000000ff) << 24) |
607           ((value & 0x0000ff00) <<  8) |
608           ((value & 0x00ff0000) >>  8) |
609           ((value & 0xff000000) >> 24);
610    }
611    
612    
613    
614    
615    /*************************************************
616    *        Check match or recursion limit          *
617    *************************************************/
618    
619    static int
620    check_match_limit(pcre *re, pcre_extra *extra, uschar *bptr, int len,
621      int start_offset, int options, int *use_offsets, int use_size_offsets,
622      int flag, unsigned long int *limit, int errnumber, const char *msg)
623    {
624    int count;
625    int min = 0;
626    int mid = 64;
627    int max = -1;
628    
629    extra->flags |= flag;
630    
631    for (;;)
632      {
633      *limit = mid;
634    
635      count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options,
636        use_offsets, use_size_offsets);
637    
638      if (count == errnumber)
639        {
640        /* fprintf(outfile, "Testing %s limit = %d\n", msg, mid); */
641        min = mid;
642        mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2;
643        }
644    
645      else if (count >= 0 || count == PCRE_ERROR_NOMATCH ||
646                             count == PCRE_ERROR_PARTIAL)
647        {
648        if (mid == min + 1)
649          {
650          fprintf(outfile, "Minimum %s limit = %d\n", msg, mid);
651          break;
652          }
653        /* fprintf(outfile, "Testing %s limit = %d\n", msg, mid); */
654        max = mid;
655        mid = (min + mid)/2;
656        }
657      else break;    /* Some other error */
658      }
659    
660    extra->flags &= ~flag;
661    return count;
662    }
663    
664    
665    
666    /*************************************************
667    *         Check newline indicator                *
668    *************************************************/
669    
670    /* This is used both at compile and run-time to check for <xxx> escapes, where
671    xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
672    no match.
673    
674    Arguments:
675      p           points after the leading '<'
676      f           file for error message
677    
678    Returns:      appropriate PCRE_NEWLINE_xxx flags, or 0
679    */
680    
681    static int
682    check_newline(uschar *p, FILE *f)
683    {
684    if (strncmp((char *)p, "cr>", 3) == 0) return PCRE_NEWLINE_CR;
685    if (strncmp((char *)p, "lf>", 3) == 0) return PCRE_NEWLINE_LF;
686    if (strncmp((char *)p, "crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
687    if (strncmp((char *)p, "anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
688    if (strncmp((char *)p, "any>", 4) == 0) return PCRE_NEWLINE_ANY;
689    fprintf(f, "Unknown newline type at: <%s\n", p);
690    return 0;
691    }
692    
693    
694    
695    /*************************************************
696    *             Usage function                     *
697    *************************************************/
698    
699    static void
700    usage(void)
701    {
702    printf("Usage:     pcretest [options] [<input> [<output>]]\n");
703    printf("  -b       show compiled code (bytecode)\n");
704    printf("  -C       show PCRE compile-time options and exit\n");
705    printf("  -d       debug: show compiled code and information (-b and -i)\n");
706    #if !defined NODFA
707    printf("  -dfa     force DFA matching for all subjects\n");
708    #endif
709    printf("  -help    show usage information\n");
710    printf("  -i       show information about compiled patterns\n"
711           "  -m       output memory used information\n"
712           "  -o <n>   set size of offsets vector to <n>\n");
713    #if !defined NOPOSIX
714    printf("  -p       use POSIX interface\n");
715    #endif
716    printf("  -q       quiet: do not output PCRE version number at start\n");
717    printf("  -S <n>   set stack size to <n> megabytes\n");
718    printf("  -s       output store (memory) used information\n"
719           "  -t       time compilation and execution\n");
720    printf("  -t <n>   time compilation and execution, repeating <n> times\n");
721    printf("  -tm      time execution (matching) only\n");
722    printf("  -tm <n>  time execution (matching) only, repeating <n> times\n");
723    }
724    
725    
726    
727    /*************************************************
728  *                Main Program                    *  *                Main Program                    *
729  *************************************************/  *************************************************/
730    
# Line 378  int options = 0; Line 739  int options = 0;
739  int study_options = 0;  int study_options = 0;
740  int op = 1;  int op = 1;
741  int timeit = 0;  int timeit = 0;
742    int timeitm = 0;
743  int showinfo = 0;  int showinfo = 0;
744  int showstore = 0;  int showstore = 0;
745    int quiet = 0;
746  int size_offsets = 45;  int size_offsets = 45;
747  int size_offsets_max;  int size_offsets_max;
748  int *offsets;  int *offsets = NULL;
749  #if !defined NOPOSIX  #if !defined NOPOSIX
750  int posix = 0;  int posix = 0;
751  #endif  #endif
752  int debug = 0;  int debug = 0;
753  int done = 0;  int done = 0;
754  unsigned char buffer[30000];  int all_use_dfa = 0;
755  unsigned char dbuffer[1024];  int yield = 0;
756    int stack_size;
757    
758    /* These vectors store, end-to-end, a list of captured substring names. Assume
759    that 1024 is plenty long enough for the few names we'll be testing. */
760    
761    uschar copynames[1024];
762    uschar getnames[1024];
763    
764    uschar *copynamesptr;
765    uschar *getnamesptr;
766    
767    /* Get buffers from malloc() so that Electric Fence will check their misuse
768    when I am debugging. They grow automatically when very long lines are read. */
769    
770  /* Static so that new_malloc can use it. */  buffer = (unsigned char *)malloc(buffer_size);
771    dbuffer = (unsigned char *)malloc(buffer_size);
772    pbuffer = (unsigned char *)malloc(buffer_size);
773    
774    /* The outfile variable is static so that new_malloc can use it. */
775    
776  outfile = stdout;  outfile = stdout;
777    
778    /* The following  _setmode() stuff is some Windows magic that tells its runtime
779    library to translate CRLF into a single LF character. At least, that's what
780    I've been told: never having used Windows I take this all on trust. Originally
781    it set 0x8000, but then I was advised that _O_BINARY was better. */
782    
783    #if defined(_WIN32) || defined(WIN32)
784    _setmode( _fileno( stdout ), _O_BINARY );
785    #endif
786    
787  /* Scan options */  /* Scan options */
788    
789  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
# Line 403  while (argc > 1 && argv[op][0] == '-') Line 792  while (argc > 1 && argv[op][0] == '-')
792    
793    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
794      showstore = 1;      showstore = 1;
795    else if (strcmp(argv[op], "-t") == 0) timeit = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
796      else if (strcmp(argv[op], "-b") == 0) debug = 1;
797    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
798    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
799    #if !defined NODFA
800      else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
801    #endif
802    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
803        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),
804          *endptr == 0))          *endptr == 0))
# Line 413  while (argc > 1 && argv[op][0] == '-') Line 806  while (argc > 1 && argv[op][0] == '-')
806      op++;      op++;
807      argc--;      argc--;
808      }      }
809      else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
810        {
811        int both = argv[op][2] == 0;
812        int temp;
813        if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
814                         *endptr == 0))
815          {
816          timeitm = temp;
817          op++;
818          argc--;
819          }
820        else timeitm = LOOPREPEAT;
821        if (both) timeit = timeitm;
822        }
823      else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
824          ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
825            *endptr == 0))
826        {
827    #if defined(_WIN32) || defined(WIN32)
828        printf("PCRE: -S not supported on this OS\n");
829        exit(1);
830    #else
831        int rc;
832        struct rlimit rlim;
833        getrlimit(RLIMIT_STACK, &rlim);
834        rlim.rlim_cur = stack_size * 1024 * 1024;
835        rc = setrlimit(RLIMIT_STACK, &rlim);
836        if (rc != 0)
837          {
838        printf("PCRE: setrlimit() failed with error %d\n", rc);
839        exit(1);
840          }
841        op++;
842        argc--;
843    #endif
844        }
845  #if !defined NOPOSIX  #if !defined NOPOSIX
846    else if (strcmp(argv[op], "-p") == 0) posix = 1;    else if (strcmp(argv[op], "-p") == 0) posix = 1;
847  #endif  #endif
# Line 423  while (argc > 1 && argv[op][0] == '-') Line 852  while (argc > 1 && argv[op][0] == '-')
852      printf("Compiled with\n");      printf("Compiled with\n");
853      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
854      printf("  %sUTF-8 support\n", rc? "" : "No ");      printf("  %sUTF-8 support\n", rc? "" : "No ");
855        (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
856        printf("  %sUnicode properties support\n", rc? "" : "No ");
857      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
858      printf("  Newline character is %s\n", (rc == '\r')? "CR" : "LF");      printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :
859          (rc == '\n')? "LF" : (rc == ('\r'<<8 | '\n'))? "CRLF" :
860          (rc == -2)? "ANYCRLF" :
861          (rc == -1)? "ANY" : "???");
862      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
863      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
864      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
865      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
866      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
867      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %d\n", rc);
868      exit(0);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);
869        printf("  Default recursion depth limit = %d\n", rc);
870        (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
871        printf("  Match recursion uses %s\n", rc? "stack" : "heap");
872        goto EXIT;
873        }
874      else if (strcmp(argv[op], "-help") == 0 ||
875               strcmp(argv[op], "--help") == 0)
876        {
877        usage();
878        goto EXIT;
879      }      }
880    else    else
881      {      {
882      printf("** Unknown or malformed option %s\n", argv[op]);      printf("** Unknown or malformed option %s\n", argv[op]);
883      printf("Usage:   pcretest [-d] [-i] [-o <n>] [-p] [-s] [-t] [<input> [<output>]]\n");      usage();
884      printf("  -C     show PCRE compile-time options and exit\n");      yield = 1;
885      printf("  -d     debug: show compiled code; implies -i\n"      goto EXIT;
            "  -i     show information about compiled pattern\n"  
            "  -o <n> set size of offsets vector to <n>\n");  
 #if !defined NOPOSIX  
     printf("  -p     use POSIX interface\n");  
 #endif  
     printf("  -s     output store information\n"  
            "  -t     time compilation and execution\n");  
     return 1;  
886      }      }
887    op++;    op++;
888    argc--;    argc--;
# Line 455  while (argc > 1 && argv[op][0] == '-') Line 891  while (argc > 1 && argv[op][0] == '-')
891  /* Get the store for the offsets vector, and remember what it was */  /* Get the store for the offsets vector, and remember what it was */
892    
893  size_offsets_max = size_offsets;  size_offsets_max = size_offsets;
894  offsets = malloc(size_offsets_max * sizeof(int));  offsets = (int *)malloc(size_offsets_max * sizeof(int));
895  if (offsets == NULL)  if (offsets == NULL)
896    {    {
897    printf("** Failed to get %d bytes of memory for offsets vector\n",    printf("** Failed to get %d bytes of memory for offsets vector\n",
898      size_offsets_max * sizeof(int));      (int)(size_offsets_max * sizeof(int)));
899    return 1;    yield = 1;
900      goto EXIT;
901    }    }
902    
903  /* Sort out the input and output files */  /* Sort out the input and output files */
904    
905  if (argc > 1)  if (argc > 1)
906    {    {
907    infile = fopen(argv[op], "r");    infile = fopen(argv[op], INPUT_MODE);
908    if (infile == NULL)    if (infile == NULL)
909      {      {
910      printf("** Failed to open %s\n", argv[op]);      printf("** Failed to open %s\n", argv[op]);
911      return 1;      yield = 1;
912        goto EXIT;
913      }      }
914    }    }
915    
916  if (argc > 2)  if (argc > 2)
917    {    {
918    outfile = fopen(argv[op+1], "w");    outfile = fopen(argv[op+1], OUTPUT_MODE);
919    if (outfile == NULL)    if (outfile == NULL)
920      {      {
921      printf("** Failed to open %s\n", argv[op+1]);      printf("** Failed to open %s\n", argv[op+1]);
922      return 1;      yield = 1;
923        goto EXIT;
924      }      }
925    }    }
926    
927  /* Set alternative malloc function */  /* Set alternative malloc function */
928    
929  pcre_malloc = new_malloc;  pcre_malloc = new_malloc;
930    pcre_free = new_free;
931    pcre_stack_malloc = stack_malloc;
932    pcre_stack_free = stack_free;
933    
934  /* Heading line, then prompt for first regex if stdin */  /* Heading line unless quiet, then prompt for first regex if stdin */
935    
936  fprintf(outfile, "PCRE version %s\n\n", pcre_version());  if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());
937    
938  /* Main loop */  /* Main loop */
939    
# Line 507  while (!done) Line 949  while (!done)
949    
950    const char *error;    const char *error;
951    unsigned char *p, *pp, *ppp;    unsigned char *p, *pp, *ppp;
952      unsigned char *to_file = NULL;
953    const unsigned char *tables = NULL;    const unsigned char *tables = NULL;
954      unsigned long int true_size, true_study_size = 0;
955      size_t size, regex_gotten_store;
956    int do_study = 0;    int do_study = 0;
957    int do_debug = debug;    int do_debug = debug;
958    int do_G = 0;    int do_G = 0;
959    int do_g = 0;    int do_g = 0;
960    int do_showinfo = showinfo;    int do_showinfo = showinfo;
961    int do_showrest = 0;    int do_showrest = 0;
962    int erroroffset, len, delimiter;    int do_flip = 0;
963      int erroroffset, len, delimiter, poffset;
964    
965    utf8 = 0;    use_utf8 = 0;
966      debug_lengths = 1;
967    
968    if (infile == stdin) printf("  re> ");    if (infile == stdin) printf("  re> ");
969    if (fgets((char *)buffer, sizeof(buffer), infile) == NULL) break;    if (extend_inputline(infile, buffer) == NULL) break;
970    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
971    fflush(outfile);    fflush(outfile);
972    
# Line 527  while (!done) Line 974  while (!done)
974    while (isspace(*p)) p++;    while (isspace(*p)) p++;
975    if (*p == 0) continue;    if (*p == 0) continue;
976    
977    /* Get the delimiter and seek the end of the pattern; if is isn't    /* See if the pattern is to be loaded pre-compiled from a file. */
978    complete, read more. */  
979      if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
980        {
981        unsigned long int magic, get_options;
982        uschar sbuf[8];
983        FILE *f;
984    
985        p++;
986        pp = p + (int)strlen((char *)p);
987        while (isspace(pp[-1])) pp--;
988        *pp = 0;
989    
990        f = fopen((char *)p, "rb");
991        if (f == NULL)
992          {
993          fprintf(outfile, "Failed to open %s: %s\n", p, strerror(errno));
994          continue;
995          }
996    
997        if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ;
998    
999        true_size =
1000          (sbuf[0] << 24) | (sbuf[1] << 16) | (sbuf[2] << 8) | sbuf[3];
1001        true_study_size =
1002          (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];
1003    
1004        re = (real_pcre *)new_malloc(true_size);
1005        regex_gotten_store = gotten_store;
1006    
1007        if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;
1008    
1009        magic = ((real_pcre *)re)->magic_number;
1010        if (magic != MAGIC_NUMBER)
1011          {
1012          if (byteflip(magic, sizeof(magic)) == MAGIC_NUMBER)
1013            {
1014            do_flip = 1;
1015            }
1016          else
1017            {
1018            fprintf(outfile, "Data in %s is not a compiled PCRE regex\n", p);
1019            fclose(f);
1020            continue;
1021            }
1022          }
1023    
1024        fprintf(outfile, "Compiled regex%s loaded from %s\n",
1025          do_flip? " (byte-inverted)" : "", p);
1026    
1027        /* Need to know if UTF-8 for printing data strings */
1028    
1029        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1030        use_utf8 = (get_options & PCRE_UTF8) != 0;
1031    
1032        /* Now see if there is any following study data */
1033    
1034        if (true_study_size != 0)
1035          {
1036          pcre_study_data *psd;
1037    
1038          extra = (pcre_extra *)new_malloc(sizeof(pcre_extra) + true_study_size);
1039          extra->flags = PCRE_EXTRA_STUDY_DATA;
1040    
1041          psd = (pcre_study_data *)(((char *)extra) + sizeof(pcre_extra));
1042          extra->study_data = psd;
1043    
1044          if (fread(psd, 1, true_study_size, f) != true_study_size)
1045            {
1046            FAIL_READ:
1047            fprintf(outfile, "Failed to read data from %s\n", p);
1048            if (extra != NULL) new_free(extra);
1049            if (re != NULL) new_free(re);
1050            fclose(f);
1051            continue;
1052            }
1053          fprintf(outfile, "Study data loaded from %s\n", p);
1054          do_study = 1;     /* To get the data output if requested */
1055          }
1056        else fprintf(outfile, "No study data\n");
1057    
1058        fclose(f);
1059        goto SHOW_INFO;
1060        }
1061    
1062      /* In-line pattern (the usual case). Get the delimiter and seek the end of
1063      the pattern; if is isn't complete, read more. */
1064    
1065    delimiter = *p++;    delimiter = *p++;
1066    
# Line 539  while (!done) Line 1071  while (!done)
1071      }      }
1072    
1073    pp = p;    pp = p;
1074      poffset = p - buffer;
1075    
1076    for(;;)    for(;;)
1077      {      {
# Line 549  while (!done) Line 1082  while (!done)
1082        pp++;        pp++;
1083        }        }
1084      if (*pp != 0) break;      if (*pp != 0) break;
   
     len = sizeof(buffer) - (pp - buffer);  
     if (len < 256)  
       {  
       fprintf(outfile, "** Expression too long - missing delimiter?\n");  
       goto SKIP_DATA;  
       }  
   
1085      if (infile == stdin) printf("    > ");      if (infile == stdin) printf("    > ");
1086      if (fgets((char *)pp, len, infile) == NULL)      if ((pp = extend_inputline(infile, pp)) == NULL)
1087        {        {
1088        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1089        done = 1;        done = 1;
# Line 567  while (!done) Line 1092  while (!done)
1092      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
1093      }      }
1094    
1095      /* The buffer may have moved while being extended; reset the start of data
1096      pointer to the correct relative point in the buffer. */
1097    
1098      p = buffer + poffset;
1099    
1100    /* If the first character after the delimiter is backslash, make    /* If the first character after the delimiter is backslash, make
1101    the pattern end with backslash. This is purely to provide a way    the pattern end with backslash. This is purely to provide a way
1102    of testing for the error message when a pattern ends with backslash. */    of testing for the error message when a pattern ends with backslash. */
1103    
1104    if (pp[1] == '\\') *pp++ = '\\';    if (pp[1] == '\\') *pp++ = '\\';
1105    
1106    /* Terminate the pattern at the delimiter */    /* Terminate the pattern at the delimiter, and save a copy of the pattern
1107      for callouts. */
1108    
1109    *pp++ = 0;    *pp++ = 0;
1110      strcpy((char *)pbuffer, (char *)p);
1111    
1112    /* Look for options after final delimiter */    /* Look for options after final delimiter */
1113    
# Line 587  while (!done) Line 1119  while (!done)
1119      {      {
1120      switch (*pp++)      switch (*pp++)
1121        {        {
1122          case 'f': options |= PCRE_FIRSTLINE; break;
1123        case 'g': do_g = 1; break;        case 'g': do_g = 1; break;
1124        case 'i': options |= PCRE_CASELESS; break;        case 'i': options |= PCRE_CASELESS; break;
1125        case 'm': options |= PCRE_MULTILINE; break;        case 'm': options |= PCRE_MULTILINE; break;
# Line 595  while (!done) Line 1128  while (!done)
1128    
1129        case '+': do_showrest = 1; break;        case '+': do_showrest = 1; break;
1130        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1131          case 'B': do_debug = 1; break;
1132          case 'C': options |= PCRE_AUTO_CALLOUT; break;
1133        case 'D': do_debug = do_showinfo = 1; break;        case 'D': do_debug = do_showinfo = 1; break;
1134        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
1135          case 'F': do_flip = 1; break;
1136        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1137        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1138          case 'J': options |= PCRE_DUPNAMES; break;
1139        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1140        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1141    
# Line 609  while (!done) Line 1146  while (!done)
1146        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1147        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1148        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1149        case '8': options |= PCRE_UTF8; utf8 = 1; break;        case 'Z': debug_lengths = 0; break;
1150          case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1151          case '?': options |= PCRE_NO_UTF8_CHECK; break;
1152    
1153        case 'L':        case 'L':
1154        ppp = pp;        ppp = pp;
1155        while (*ppp != '\n' && *ppp != ' ') ppp++;        /* The '\r' test here is so that it works on Windows. */
1156          /* The '0' test is just in case this is an unterminated line. */
1157          while (*ppp != 0 && *ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
1158        *ppp = 0;        *ppp = 0;
1159        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
1160          {          {
1161          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);
1162          goto SKIP_DATA;          goto SKIP_DATA;
1163          }          }
1164          locale_set = 1;
1165        tables = pcre_maketables();        tables = pcre_maketables();
1166        pp = ppp;        pp = ppp;
1167        break;        break;
1168    
1169        case '\n': case ' ': break;        case '>':
1170          to_file = pp;
1171          while (*pp != 0) pp++;
1172          while (isspace(pp[-1])) pp--;
1173          *pp = 0;
1174          break;
1175    
1176          case '<':
1177            {
1178            int x = check_newline(pp, outfile);
1179            if (x == 0) goto SKIP_DATA;
1180            options |= x;
1181            while (*pp++ != '>');
1182            }
1183          break;
1184    
1185          case '\r':                      /* So that it works in Windows */
1186          case '\n':
1187          case ' ':
1188          break;
1189    
1190        default:        default:
1191        fprintf(outfile, "** Unknown option '%c'\n", pp[-1]);        fprintf(outfile, "** Unknown option '%c'\n", pp[-1]);
1192        goto SKIP_DATA;        goto SKIP_DATA;
# Line 640  while (!done) Line 1202  while (!done)
1202      {      {
1203      int rc;      int rc;
1204      int cflags = 0;      int cflags = 0;
1205    
1206      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;
1207      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;
1208        if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1209        if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1210        if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1211    
1212      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1213    
1214      /* Compilation failed; go back for another re, skipping to blank line      /* Compilation failed; go back for another re, skipping to blank line
# Line 649  while (!done) Line 1216  while (!done)
1216    
1217      if (rc != 0)      if (rc != 0)
1218        {        {
1219        (void)regerror(rc, &preg, (char *)buffer, sizeof(buffer));        (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1220        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);
1221        goto SKIP_DATA;        goto SKIP_DATA;
1222        }        }
# Line 661  while (!done) Line 1228  while (!done)
1228  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1229    
1230      {      {
1231      if (timeit)      if (timeit > 0)
1232        {        {
1233        register int i;        register int i;
1234        clock_t time_taken;        clock_t time_taken;
1235        clock_t start_time = clock();        clock_t start_time = clock();
1236        for (i = 0; i < LOOPREPEAT; i++)        for (i = 0; i < timeit; i++)
1237          {          {
1238          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
1239          if (re != NULL) free(re);          if (re != NULL) free(re);
1240          }          }
1241        time_taken = clock() - start_time;        time_taken = clock() - start_time;
1242        fprintf(outfile, "Compile time %.3f milliseconds\n",        fprintf(outfile, "Compile time %.4f milliseconds\n",
1243          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /          (((double)time_taken * 1000.0) / (double)timeit) /
1244            (double)CLOCKS_PER_SEC);            (double)CLOCKS_PER_SEC);
1245        }        }
1246    
# Line 690  while (!done) Line 1257  while (!done)
1257          {          {
1258          for (;;)          for (;;)
1259            {            {
1260            if (fgets((char *)buffer, sizeof(buffer), infile) == NULL)            if (extend_inputline(infile, buffer) == NULL)
1261              {              {
1262              done = 1;              done = 1;
1263              goto CONTINUE;              goto CONTINUE;
# Line 714  while (!done) Line 1281  while (!done)
1281                sizeof(real_pcre) -                sizeof(real_pcre) -
1282                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));
1283    
1284        /* Extract the size for possible writing before possibly flipping it,
1285        and remember the store that was got. */
1286    
1287        true_size = ((real_pcre *)re)->size;
1288        regex_gotten_store = gotten_store;
1289    
1290        /* If /S was present, study the regexp to generate additional info to
1291        help with the matching. */
1292    
1293        if (do_study)
1294          {
1295          if (timeit > 0)
1296            {
1297            register int i;
1298            clock_t time_taken;
1299            clock_t start_time = clock();
1300            for (i = 0; i < timeit; i++)
1301              extra = pcre_study(re, study_options, &error);
1302            time_taken = clock() - start_time;
1303            if (extra != NULL) free(extra);
1304            fprintf(outfile, "  Study time %.4f milliseconds\n",
1305              (((double)time_taken * 1000.0) / (double)timeit) /
1306                (double)CLOCKS_PER_SEC);
1307            }
1308          extra = pcre_study(re, study_options, &error);
1309          if (error != NULL)
1310            fprintf(outfile, "Failed to study: %s\n", error);
1311          else if (extra != NULL)
1312            true_study_size = ((pcre_study_data *)(extra->study_data))->size;
1313          }
1314    
1315        /* If the 'F' option was present, we flip the bytes of all the integer
1316        fields in the regex data block and the study block. This is to make it
1317        possible to test PCRE's handling of byte-flipped patterns, e.g. those
1318        compiled on a different architecture. */
1319    
1320        if (do_flip)
1321          {
1322          real_pcre *rre = (real_pcre *)re;
1323          rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));
1324          rre->size = byteflip(rre->size, sizeof(rre->size));
1325          rre->options = byteflip(rre->options, sizeof(rre->options));
1326          rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));
1327          rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));
1328          rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));
1329          rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte));
1330          rre->name_table_offset = byteflip(rre->name_table_offset,
1331            sizeof(rre->name_table_offset));
1332          rre->name_entry_size = byteflip(rre->name_entry_size,
1333            sizeof(rre->name_entry_size));
1334          rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count));
1335    
1336          if (extra != NULL)
1337            {
1338            pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
1339            rsd->size = byteflip(rsd->size, sizeof(rsd->size));
1340            rsd->options = byteflip(rsd->options, sizeof(rsd->options));
1341            }
1342          }
1343    
1344        /* Extract information from the compiled data if required */
1345    
1346        SHOW_INFO:
1347    
1348        if (do_debug)
1349          {
1350          fprintf(outfile, "------------------------------------------------------------------\n");
1351          pcre_printint(re, outfile, debug_lengths);
1352          }
1353    
1354      if (do_showinfo)      if (do_showinfo)
1355        {        {
1356        unsigned long int get_options;        unsigned long int get_options, all_options;
1357    #if !defined NOINFOCHECK
1358        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1359        int count, backrefmax, first_char, need_char;  #endif
1360          int count, backrefmax, first_char, need_char, okpartial, jchanged;
1361        int nameentrysize, namecount;        int nameentrysize, namecount;
1362        const uschar *nametable;        const uschar *nametable;
       size_t size;  
   
       if (do_debug)  
         {  
         fprintf(outfile, "------------------------------------------------------------------\n");  
         print_internals(re, outfile);  
         }  
1363    
1364        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1365        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
# Line 737  while (!done) Line 1369  while (!done)
1369        new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);        new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);
1370        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1371        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1372        new_info(re, NULL, PCRE_INFO_NAMETABLE, &nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1373          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1374          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1375    
1376    #if !defined NOINFOCHECK
1377        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
1378        if (count < 0) fprintf(outfile,        if (count < 0) fprintf(outfile,
1379          "Error %d from pcre_info()\n", count);          "Error %d from pcre_info()\n", count);
# Line 756  while (!done) Line 1391  while (!done)
1391            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
1392              get_options, old_options);              get_options, old_options);
1393          }          }
1394    #endif
1395    
1396        if (size != gotten_store) fprintf(outfile,        if (size != regex_gotten_store) fprintf(outfile,
1397          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
1398          size, gotten_store);          (int)size, (int)regex_gotten_store);
1399    
1400        fprintf(outfile, "Capturing subpattern count = %d\n", count);        fprintf(outfile, "Capturing subpattern count = %d\n", count);
1401        if (backrefmax > 0)        if (backrefmax > 0)
# Line 777  while (!done) Line 1413  while (!done)
1413            }            }
1414          }          }
1415    
1416          if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1417    
1418          all_options = ((real_pcre *)re)->options;
1419          if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
1420    
1421        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1422          else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s\n",          else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
1423            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1424            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1425            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
1426            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
1427              ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
1428            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
1429            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1430            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1431            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1432            ((get_options & PCRE_UTF8) != 0)? " utf8" : "");            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1433              ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1434              ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1435              ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1436    
1437          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1438    
1439          switch (get_options & PCRE_NEWLINE_BITS)
1440            {
1441            case PCRE_NEWLINE_CR:
1442            fprintf(outfile, "Forced newline sequence: CR\n");
1443            break;
1444    
1445            case PCRE_NEWLINE_LF:
1446            fprintf(outfile, "Forced newline sequence: LF\n");
1447            break;
1448    
1449            case PCRE_NEWLINE_CRLF:
1450            fprintf(outfile, "Forced newline sequence: CRLF\n");
1451            break;
1452    
1453            case PCRE_NEWLINE_ANYCRLF:
1454            fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1455            break;
1456    
1457            case PCRE_NEWLINE_ANY:
1458            fprintf(outfile, "Forced newline sequence: ANY\n");
1459            break;
1460    
1461        if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)          default:
1462          fprintf(outfile, "Case state changes\n");          break;
1463            }
1464    
1465        if (first_char == -1)        if (first_char == -1)
1466          {          {
1467          fprintf(outfile, "First char at start or follows \\n\n");          fprintf(outfile, "First char at start or follows newline\n");
1468          }          }
1469        else if (first_char < 0)        else if (first_char < 0)
1470          {          {
# Line 803  while (!done) Line 1473  while (!done)
1473        else        else
1474          {          {
1475          int ch = first_char & 255;          int ch = first_char & 255;
1476          char *caseless = ((first_char & REQ_CASELESS) == 0)?          const char *caseless = ((first_char & REQ_CASELESS) == 0)?
1477            "" : " (caseless)";            "" : " (caseless)";
1478          if (isprint(ch))          if (PRINTHEX(ch))
1479            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
1480          else          else
1481            fprintf(outfile, "First char = %d%s\n", ch, caseless);            fprintf(outfile, "First char = %d%s\n", ch, caseless);
# Line 818  while (!done) Line 1488  while (!done)
1488        else        else
1489          {          {
1490          int ch = need_char & 255;          int ch = need_char & 255;
1491          char *caseless = ((need_char & REQ_CASELESS) == 0)?          const char *caseless = ((need_char & REQ_CASELESS) == 0)?
1492            "" : " (caseless)";            "" : " (caseless)";
1493          if (isprint(ch))          if (PRINTHEX(ch))
1494            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
1495          else          else
1496            fprintf(outfile, "Need char = %d%s\n", ch, caseless);            fprintf(outfile, "Need char = %d%s\n", ch, caseless);
1497          }          }
       }  
1498    
1499      /* If /S was present, study the regexp to generate additional info to        /* Don't output study size; at present it is in any case a fixed
1500      help with the matching. */        value, but it varies, depending on the computer architecture, and
1501          so messes up the test suite. (And with the /F option, it might be
1502          flipped.) */
1503    
1504      if (do_study)        if (do_study)
       {  
       if (timeit)  
1505          {          {
1506          register int i;          if (extra == NULL)
1507          clock_t time_taken;            fprintf(outfile, "Study returned NULL\n");
1508          clock_t start_time = clock();          else
1509          for (i = 0; i < LOOPREPEAT; i++)            {
1510            extra = pcre_study(re, study_options, &error);            uschar *start_bits = NULL;
1511          time_taken = clock() - start_time;            new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
1512          if (extra != NULL) free(extra);  
1513          fprintf(outfile, "  Study time %.3f milliseconds\n",            if (start_bits == NULL)
1514            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /              fprintf(outfile, "No starting byte set\n");
1515              (double)CLOCKS_PER_SEC);            else
1516                {
1517                int i;
1518                int c = 24;
1519                fprintf(outfile, "Starting byte set: ");
1520                for (i = 0; i < 256; i++)
1521                  {
1522                  if ((start_bits[i/8] & (1<<(i&7))) != 0)
1523                    {
1524                    if (c > 75)
1525                      {
1526                      fprintf(outfile, "\n  ");
1527                      c = 2;
1528                      }
1529                    if (PRINTHEX(i) && i != ' ')
1530                      {
1531                      fprintf(outfile, "%c ", i);
1532                      c += 2;
1533                      }
1534                    else
1535                      {
1536                      fprintf(outfile, "\\x%02x ", i);
1537                      c += 5;
1538                      }
1539                    }
1540                  }
1541                fprintf(outfile, "\n");
1542                }
1543              }
1544          }          }
1545          }
1546    
1547        extra = pcre_study(re, study_options, &error);      /* If the '>' option was present, we write out the regex to a file, and
1548        if (error != NULL)      that is all. The first 8 bytes of the file are the regex length and then
1549          fprintf(outfile, "Failed to study: %s\n", error);      the study length, in big-endian order. */
       else if (extra == NULL)  
         fprintf(outfile, "Study returned NULL\n");  
1550    
1551        else if (do_showinfo)      if (to_file != NULL)
1552          {
1553          FILE *f = fopen((char *)to_file, "wb");
1554          if (f == NULL)
1555            {
1556            fprintf(outfile, "Unable to open %s: %s\n", to_file, strerror(errno));
1557            }
1558          else
1559          {          {
1560          size_t size;          uschar sbuf[8];
1561          uschar *start_bits = NULL;          sbuf[0] = (true_size >> 24)  & 255;
1562          new_info(re, extra, PCRE_INFO_STUDYSIZE, &size);          sbuf[1] = (true_size >> 16)  & 255;
1563          new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);          sbuf[2] = (true_size >>  8)  & 255;
1564          fprintf(outfile, "Study size = %d\n", size);          sbuf[3] = (true_size)  & 255;
1565          if (start_bits == NULL)  
1566            fprintf(outfile, "No starting character set\n");          sbuf[4] = (true_study_size >> 24)  & 255;
1567            sbuf[5] = (true_study_size >> 16)  & 255;
1568            sbuf[6] = (true_study_size >>  8)  & 255;
1569            sbuf[7] = (true_study_size)  & 255;
1570    
1571            if (fwrite(sbuf, 1, 8, f) < 8 ||
1572                fwrite(re, 1, true_size, f) < true_size)
1573              {
1574              fprintf(outfile, "Write error on %s: %s\n", to_file, strerror(errno));
1575              }
1576          else          else
1577            {            {
1578            int i;            fprintf(outfile, "Compiled regex written to %s\n", to_file);
1579            int c = 24;            if (extra != NULL)
           fprintf(outfile, "Starting character set: ");  
           for (i = 0; i < 256; i++)  
1580              {              {
1581              if ((start_bits[i/8] & (1<<(i%8))) != 0)              if (fwrite(extra->study_data, 1, true_study_size, f) <
1582                    true_study_size)
1583                {                {
1584                if (c > 75)                fprintf(outfile, "Write error on %s: %s\n", to_file,
1585                  {                  strerror(errno));
                 fprintf(outfile, "\n  ");  
                 c = 2;  
                 }  
               if (isprint(i) && i != ' ')  
                 {  
                 fprintf(outfile, "%c ", i);  
                 c += 2;  
                 }  
               else  
                 {  
                 fprintf(outfile, "\\x%02x ", i);  
                 c += 5;  
                 }  
1586                }                }
1587                else fprintf(outfile, "Study data written to %s\n", to_file);
1588    
1589              }              }
           fprintf(outfile, "\n");  
1590            }            }
1591            fclose(f);
1592          }          }
1593    
1594          new_free(re);
1595          if (extra != NULL) new_free(extra);
1596          if (tables != NULL) new_free((void *)tables);
1597          continue;  /* With next regex */
1598        }        }
1599      }      }        /* End of non-POSIX compile */
1600    
1601    /* Read data lines and test them */    /* Read data lines and test them */
1602    
1603    for (;;)    for (;;)
1604      {      {
1605      unsigned char *q;      uschar *q;
1606      unsigned char *bptr = dbuffer;      uschar *bptr;
1607      int *use_offsets = offsets;      int *use_offsets = offsets;
1608      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1609      int callout_data = 0;      int callout_data = 0;
# Line 911  while (!done) Line 1616  while (!done)
1616      int gmatched = 0;      int gmatched = 0;
1617      int start_offset = 0;      int start_offset = 0;
1618      int g_notempty = 0;      int g_notempty = 0;
1619        int use_dfa = 0;
1620    
1621      options = 0;      options = 0;
1622    
1623        *copynames = 0;
1624        *getnames = 0;
1625    
1626        copynamesptr = copynames;
1627        getnamesptr = getnames;
1628    
1629      pcre_callout = callout;      pcre_callout = callout;
1630      first_callout = 1;      first_callout = 1;
1631      callout_extra = 0;      callout_extra = 0;
1632      callout_count = 0;      callout_count = 0;
1633      callout_fail_count = 999999;      callout_fail_count = 999999;
1634      callout_fail_id = -1;      callout_fail_id = -1;
1635        show_malloc = 0;
1636    
1637        if (extra != NULL) extra->flags &=
1638          ~(PCRE_EXTRA_MATCH_LIMIT|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
1639    
1640      if (infile == stdin) printf("data> ");      len = 0;
1641      if (fgets((char *)buffer, sizeof(buffer), infile) == NULL)      for (;;)
1642        {        {
1643        done = 1;        if (infile == stdin) printf("data> ");
1644        goto CONTINUE;        if (extend_inputline(infile, buffer + len) == NULL)
1645            {
1646            if (len > 0) break;
1647            done = 1;
1648            goto CONTINUE;
1649            }
1650          if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1651          len = (int)strlen((char *)buffer);
1652          if (buffer[len-1] == '\n') break;
1653        }        }
     if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);  
1654    
     len = (int)strlen((char *)buffer);  
1655      while (len > 0 && isspace(buffer[len-1])) len--;      while (len > 0 && isspace(buffer[len-1])) len--;
1656      buffer[len] = 0;      buffer[len] = 0;
1657      if (len == 0) break;      if (len == 0) break;
# Line 937  while (!done) Line 1659  while (!done)
1659      p = buffer;      p = buffer;
1660      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1661    
1662      q = dbuffer;      bptr = q = dbuffer;
1663      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1664        {        {
1665        int i = 0;        int i = 0;
# Line 959  while (!done) Line 1681  while (!done)
1681          c -= '0';          c -= '0';
1682          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
1683            c = c * 8 + *p++ - '0';            c = c * 8 + *p++ - '0';
1684    
1685    #if !defined NOUTF8
1686            if (use_utf8 && c > 255)
1687              {
1688              unsigned char buff8[8];
1689              int ii, utn;
1690              utn = ord2utf8(c, buff8);
1691              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1692              c = buff8[ii];   /* Last byte */
1693              }
1694    #endif
1695          break;          break;
1696    
1697          case 'x':          case 'x':
1698    
1699          /* Handle \x{..} specially - new Perl thing for utf8 */          /* Handle \x{..} specially - new Perl thing for utf8 */
1700    
1701    #if !defined NOUTF8
1702          if (*p == '{')          if (*p == '{')
1703            {            {
1704            unsigned char *pt = p;            unsigned char *pt = p;
# Line 973  while (!done) Line 1707  while (!done)
1707              c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'W');              c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'W');
1708            if (*pt == '}')            if (*pt == '}')
1709              {              {
1710              unsigned char buffer[8];              unsigned char buff8[8];
1711              int ii, utn;              int ii, utn;
1712              utn = ord2utf8(c, buffer);              utn = ord2utf8(c, buff8);
1713              for (ii = 0; ii < utn - 1; ii++) *q++ = buffer[ii];              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1714              c = buffer[ii];   /* Last byte */              c = buff8[ii];   /* Last byte */
1715              p = pt + 1;              p = pt + 1;
1716              break;              break;
1717              }              }
1718            /* Not correct form; fall through */            /* Not correct form; fall through */
1719            }            }
1720    #endif
1721    
1722          /* Ordinary \x */          /* Ordinary \x */
1723    
# Line 994  while (!done) Line 1729  while (!done)
1729            }            }
1730          break;          break;
1731    
1732          case 0:   /* Allows for an empty line */          case 0:   /* \ followed by EOF allows for an empty line */
1733          p--;          p--;
1734          continue;          continue;
1735    
1736            case '>':
1737            while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0';
1738            continue;
1739    
1740          case 'A':  /* Option setting */          case 'A':  /* Option setting */
1741          options |= PCRE_ANCHORED;          options |= PCRE_ANCHORED;
1742          continue;          continue;
# Line 1014  while (!done) Line 1753  while (!done)
1753            }            }
1754          else if (isalnum(*p))          else if (isalnum(*p))
1755            {            {
1756            uschar name[256];            uschar *npp = copynamesptr;
1757            uschar *pp = name;            while (isalnum(*p)) *npp++ = *p++;
1758            while (isalnum(*p)) *pp++ = *p++;            *npp++ = 0;
1759            *pp = 0;            *npp = 0;
1760            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)copynamesptr);
1761            if (n < 0)            if (n < 0)
1762              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
1763            else copystrings |= 1 << n;            copynamesptr = npp;
1764            }            }
1765          else if (*p == '+')          else if (*p == '+')
1766            {            {
# Line 1059  while (!done) Line 1798  while (!done)
1798            }            }
1799          continue;          continue;
1800    
1801    #if !defined NODFA
1802            case 'D':
1803    #if !defined NOPOSIX
1804            if (posix || do_posix)
1805              printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");
1806            else
1807    #endif
1808              use_dfa = 1;
1809            continue;
1810    
1811            case 'F':
1812            options |= PCRE_DFA_SHORTEST;
1813            continue;
1814    #endif
1815    
1816          case 'G':          case 'G':
1817          if (isdigit(*p))          if (isdigit(*p))
1818            {            {
# Line 1067  while (!done) Line 1821  while (!done)
1821            }            }
1822          else if (isalnum(*p))          else if (isalnum(*p))
1823            {            {
1824            uschar name[256];            uschar *npp = getnamesptr;
1825            uschar *pp = name;            while (isalnum(*p)) *npp++ = *p++;
1826            while (isalnum(*p)) *pp++ = *p++;            *npp++ = 0;
1827            *pp = 0;            *npp = 0;
1828            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)getnamesptr);
1829            if (n < 0)            if (n < 0)
1830              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
1831            else getstrings |= 1 << n;            getnamesptr = npp;
1832            }            }
1833          continue;          continue;
1834    
# Line 1096  while (!done) Line 1850  while (!done)
1850            {            {
1851            size_offsets_max = n;            size_offsets_max = n;
1852            free(offsets);            free(offsets);
1853            use_offsets = offsets = malloc(size_offsets_max * sizeof(int));            use_offsets = offsets = (int *)malloc(size_offsets_max * sizeof(int));
1854            if (offsets == NULL)            if (offsets == NULL)
1855              {              {
1856              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
1857                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
1858              return 1;              yield = 1;
1859                goto EXIT;
1860              }              }
1861            }            }
1862          use_size_offsets = n;          use_size_offsets = n;
1863          if (n == 0) use_offsets = NULL;   /* Ensures it can't write to it */          if (n == 0) use_offsets = NULL;   /* Ensures it can't write to it */
1864          continue;          continue;
1865    
1866            case 'P':
1867            options |= PCRE_PARTIAL;
1868            continue;
1869    
1870            case 'Q':
1871            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1872            if (extra == NULL)
1873              {
1874              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1875              extra->flags = 0;
1876              }
1877            extra->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
1878            extra->match_limit_recursion = n;
1879            continue;
1880    
1881            case 'q':
1882            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1883            if (extra == NULL)
1884              {
1885              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1886              extra->flags = 0;
1887              }
1888            extra->flags |= PCRE_EXTRA_MATCH_LIMIT;
1889            extra->match_limit = n;
1890            continue;
1891    
1892    #if !defined NODFA
1893            case 'R':
1894            options |= PCRE_DFA_RESTART;
1895            continue;
1896    #endif
1897    
1898            case 'S':
1899            show_malloc = 1;
1900            continue;
1901    
1902          case 'Z':          case 'Z':
1903          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
1904          continue;          continue;
1905    
1906            case '?':
1907            options |= PCRE_NO_UTF8_CHECK;
1908            continue;
1909    
1910            case '<':
1911              {
1912              int x = check_newline(p, outfile);
1913              if (x == 0) goto NEXT_DATA;
1914              options |= x;
1915              while (*p++ != '>');
1916              }
1917            continue;
1918          }          }
1919        *q++ = c;        *q++ = c;
1920        }        }
1921      *q = 0;      *q = 0;
1922      len = q - dbuffer;      len = q - dbuffer;
1923    
1924        if ((all_use_dfa || use_dfa) && find_match_limit)
1925          {
1926          printf("**Match limit not relevant for DFA matching: ignored\n");
1927          find_match_limit = 0;
1928          }
1929    
1930      /* Handle matching via the POSIX interface, which does not      /* Handle matching via the POSIX interface, which does not
1931      support timing or playing with the match limit or callout data. */      support timing or playing with the match limit or callout data. */
1932    
# Line 1127  while (!done) Line 1937  while (!done)
1937        int eflags = 0;        int eflags = 0;
1938        regmatch_t *pmatch = NULL;        regmatch_t *pmatch = NULL;
1939        if (use_size_offsets > 0)        if (use_size_offsets > 0)
1940          pmatch = malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
1941        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
1942        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
1943    
# Line 1135  while (!done) Line 1945  while (!done)
1945    
1946        if (rc != 0)        if (rc != 0)
1947          {          {
1948          (void)regerror(rc, &preg, (char *)buffer, sizeof(buffer));          (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1949          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
1950          }          }
1951          else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)
1952                  != 0)
1953            {
1954            fprintf(outfile, "Matched with REG_NOSUB\n");
1955            }
1956        else        else
1957          {          {
1958          size_t i;          size_t i;
# Line 1169  while (!done) Line 1984  while (!done)
1984    
1985      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
1986        {        {
1987        if (timeit)        if (timeitm > 0)
1988          {          {
1989          register int i;          register int i;
1990          clock_t time_taken;          clock_t time_taken;
1991          clock_t start_time = clock();          clock_t start_time = clock();
1992          for (i = 0; i < LOOPREPEAT; i++)  
1993    #if !defined NODFA
1994            if (all_use_dfa || use_dfa)
1995              {
1996              int workspace[1000];
1997              for (i = 0; i < timeitm; i++)
1998                count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
1999                  options | g_notempty, use_offsets, use_size_offsets, workspace,
2000                  sizeof(workspace)/sizeof(int));
2001              }
2002            else
2003    #endif
2004    
2005            for (i = 0; i < timeitm; i++)
2006            count = pcre_exec(re, extra, (char *)bptr, len,            count = pcre_exec(re, extra, (char *)bptr, len,
2007              start_offset, options | g_notempty, use_offsets, use_size_offsets);              start_offset, options | g_notempty, use_offsets, use_size_offsets);
2008    
2009          time_taken = clock() - start_time;          time_taken = clock() - start_time;
2010          fprintf(outfile, "Execute time %.3f milliseconds\n",          fprintf(outfile, "Execute time %.4f milliseconds\n",
2011            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeitm) /
2012              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
2013          }          }
2014    
2015        /* 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
2016        varying limits in order to find the minimum value. */        varying limits in order to find the minimum value for the match limit and
2017          for the recursion limit. */
2018    
2019        if (find_match_limit)        if (find_match_limit)
2020          {          {
         int min = 0;  
         int mid = 64;  
         int max = -1;  
   
2021          if (extra == NULL)          if (extra == NULL)
2022            {            {
2023            extra = malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2024            extra->flags = 0;            extra->flags = 0;
2025            }            }
         extra->flags |= PCRE_EXTRA_MATCH_LIMIT;  
2026    
2027          for (;;)          (void)check_match_limit(re, extra, bptr, len, start_offset,
2028            {            options|g_notempty, use_offsets, use_size_offsets,
2029            extra->match_limit = mid;            PCRE_EXTRA_MATCH_LIMIT, &(extra->match_limit),
2030            count = pcre_exec(re, extra, (char *)bptr, len, start_offset,            PCRE_ERROR_MATCHLIMIT, "match()");
2031              options | g_notempty, use_offsets, use_size_offsets);  
2032            if (count == PCRE_ERROR_MATCHLIMIT)          count = check_match_limit(re, extra, bptr, len, start_offset,
2033              {            options|g_notempty, use_offsets, use_size_offsets,
2034              /* fprintf(outfile, "Testing match limit = %d\n", mid); */            PCRE_EXTRA_MATCH_LIMIT_RECURSION, &(extra->match_limit_recursion),
2035              min = mid;            PCRE_ERROR_RECURSIONLIMIT, "match() recursion");
             mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2;  
             }  
           else if (count >= 0 || count == PCRE_ERROR_NOMATCH)  
             {  
             if (mid == min + 1)  
               {  
               fprintf(outfile, "Minimum match limit = %d\n", mid);  
               break;  
               }  
             /* fprintf(outfile, "Testing match limit = %d\n", mid); */  
             max = mid;  
             mid = (min + mid)/2;  
             }  
           else break;    /* Some other error */  
           }  
   
         extra->flags &= ~PCRE_EXTRA_MATCH_LIMIT;  
2036          }          }
2037    
2038        /* If callout_data is set, use the interface with additional data */        /* If callout_data is set, use the interface with additional data */
# Line 1233  while (!done) Line 2041  while (!done)
2041          {          {
2042          if (extra == NULL)          if (extra == NULL)
2043            {            {
2044            extra = malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2045            extra->flags = 0;            extra->flags = 0;
2046            }            }
2047          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;
2048          extra->callout_data = (void *)callout_data;          extra->callout_data = &callout_data;
2049          count = pcre_exec(re, extra, (char *)bptr, len, start_offset,          count = pcre_exec(re, extra, (char *)bptr, len, start_offset,
2050            options | g_notempty, use_offsets, use_size_offsets);            options | g_notempty, use_offsets, use_size_offsets);
2051          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;
# Line 1246  while (!done) Line 2054  while (!done)
2054        /* The normal case is just to do the match once, with the default        /* The normal case is just to do the match once, with the default
2055        value of match_limit. */        value of match_limit. */
2056    
2057        else count = pcre_exec(re, extra, (char *)bptr, len,  #if !defined NODFA
2058          start_offset, options | g_notempty, use_offsets, use_size_offsets);        else if (all_use_dfa || use_dfa)
2059            {
2060            int workspace[1000];
2061            count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
2062              options | g_notempty, use_offsets, use_size_offsets, workspace,
2063              sizeof(workspace)/sizeof(int));
2064            if (count == 0)
2065              {
2066              fprintf(outfile, "Matched, but too many subsidiary matches\n");
2067              count = use_size_offsets/2;
2068              }
2069            }
2070    #endif
2071    
2072        if (count == 0)        else
2073          {          {
2074          fprintf(outfile, "Matched, but too many substrings\n");          count = pcre_exec(re, extra, (char *)bptr, len,
2075          count = use_size_offsets/3;            start_offset, options | g_notempty, use_offsets, use_size_offsets);
2076            if (count == 0)
2077              {
2078              fprintf(outfile, "Matched, but too many substrings\n");
2079              count = use_size_offsets/3;
2080              }
2081          }          }
2082    
2083        /* Matched */        /* Matched */
2084    
2085        if (count >= 0)        if (count >= 0)
2086          {          {
2087          int i;          int i, maxcount;
2088    
2089    #if !defined NODFA
2090            if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
2091    #endif
2092              maxcount = use_size_offsets/3;
2093    
2094            /* This is a check against a lunatic return value. */
2095    
2096            if (count > maxcount)
2097              {
2098              fprintf(outfile,
2099                "** PCRE error: returned count %d is too big for offset size %d\n",
2100                count, use_size_offsets);
2101              count = use_size_offsets/3;
2102              if (do_g || do_G)
2103                {
2104                fprintf(outfile, "** /%c loop abandoned\n", do_g? 'g' : 'G');
2105                do_g = do_G = FALSE;        /* Break g/G loop */
2106                }
2107              }
2108    
2109          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
2110            {            {
2111            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
# Line 1287  while (!done) Line 2133  while (!done)
2133            {            {
2134            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
2135              {              {
2136              char copybuffer[16];              char copybuffer[256];
2137              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,
2138                i, copybuffer, sizeof(copybuffer));                i, copybuffer, sizeof(copybuffer));
2139              if (rc < 0)              if (rc < 0)
# Line 1297  while (!done) Line 2143  while (!done)
2143              }              }
2144            }            }
2145    
2146            for (copynamesptr = copynames;
2147                 *copynamesptr != 0;
2148                 copynamesptr += (int)strlen((char*)copynamesptr) + 1)
2149              {
2150              char copybuffer[256];
2151              int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
2152                count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));
2153              if (rc < 0)
2154                fprintf(outfile, "copy substring %s failed %d\n", copynamesptr, rc);
2155              else
2156                fprintf(outfile, "  C %s (%d) %s\n", copybuffer, rc, copynamesptr);
2157              }
2158    
2159          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2160            {            {
2161            if ((getstrings & (1 << i)) != 0)            if ((getstrings & (1 << i)) != 0)
# Line 1309  while (!done) Line 2168  while (!done)
2168              else              else
2169                {                {
2170                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
               /* free((void *)substring); */  
2171                pcre_free_substring(substring);                pcre_free_substring(substring);
2172                }                }
2173              }              }
2174            }            }
2175    
2176            for (getnamesptr = getnames;
2177                 *getnamesptr != 0;
2178                 getnamesptr += (int)strlen((char*)getnamesptr) + 1)
2179              {
2180              const char *substring;
2181              int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
2182                count, (char *)getnamesptr, &substring);
2183              if (rc < 0)
2184                fprintf(outfile, "copy substring %s failed %d\n", getnamesptr, rc);
2185              else
2186                {
2187                fprintf(outfile, "  G %s (%d) %s\n", substring, rc, getnamesptr);
2188                pcre_free_substring(substring);
2189                }
2190              }
2191    
2192          if (getlist)          if (getlist)
2193            {            {
2194            const char **stringlist;            const char **stringlist;
# Line 1334  while (!done) Line 2208  while (!done)
2208            }            }
2209          }          }
2210    
2211          /* There was a partial match */
2212    
2213          else if (count == PCRE_ERROR_PARTIAL)
2214            {
2215            fprintf(outfile, "Partial match");
2216    #if !defined NODFA
2217            if ((all_use_dfa || use_dfa) && use_size_offsets > 2)
2218              fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],
2219                bptr + use_offsets[0]);
2220    #endif
2221            fprintf(outfile, "\n");
2222            break;  /* Out of the /g loop */
2223            }
2224    
2225        /* Failed to match. If this is a /g or /G loop and we previously set        /* Failed to match. If this is a /g or /G loop and we previously set
2226        g_notempty after a null match, this is not necessarily the end.        g_notempty after a null match, this is not necessarily the end. We want
2227        We want to advance the start offset, and continue. Fudge the offset        to advance the start offset, and continue. We won't be at the end of the
2228        values to achieve this. We won't be at the end of the string - that        string - that was checked before setting g_notempty.
2229        was checked before setting g_notempty. */  
2230          Complication arises in the case when the newline option is "any" or
2231          "anycrlf". If the previous match was at the end of a line terminated by
2232          CRLF, an advance of one character just passes the \r, whereas we should
2233          prefer the longer newline sequence, as does the code in pcre_exec().
2234          Fudge the offset value to achieve this.
2235    
2236          Otherwise, in the case of UTF-8 matching, the advance must be one
2237          character, not one byte. */
2238    
2239        else        else
2240          {          {
2241          if (g_notempty != 0)          if (g_notempty != 0)
2242            {            {
2243              int onechar = 1;
2244              unsigned int obits = ((real_pcre *)re)->options;
2245            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2246            use_offsets[1] = start_offset + 1;            if ((obits & PCRE_NEWLINE_BITS) == 0)
2247                {
2248                int d;
2249                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2250                obits = (d == '\r')? PCRE_NEWLINE_CR :
2251                        (d == '\n')? PCRE_NEWLINE_LF :
2252                        (d == ('\r'<<8 | '\n'))? PCRE_NEWLINE_CRLF :
2253                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2254                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2255                }
2256              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2257                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2258                  &&
2259                  start_offset < len - 1 &&
2260                  bptr[start_offset] == '\r' &&
2261                  bptr[start_offset+1] == '\n')
2262                onechar++;
2263              else if (use_utf8)
2264                {
2265                while (start_offset + onechar < len)
2266                  {
2267                  int tb = bptr[start_offset+onechar];
2268                  if (tb <= 127) break;
2269                  tb &= 0xc0;
2270                  if (tb != 0 && tb != 0xc0) onechar++;
2271                  }
2272                }
2273              use_offsets[1] = start_offset + onechar;
2274            }            }
2275          else          else
2276            {            {
2277            if (gmatched == 0)   /* Error if no previous matches */            if (count == PCRE_ERROR_NOMATCH)
2278              {              {
2279              if (count == -1) fprintf(outfile, "No match\n");              if (gmatched == 0) fprintf(outfile, "No match\n");
               else fprintf(outfile, "Error %d\n", count);  
2280              }              }
2281              else fprintf(outfile, "Error %d\n", count);
2282            break;  /* Out of the /g loop */            break;  /* Out of the /g loop */
2283            }            }
2284          }          }
# Line 1370  while (!done) Line 2295  while (!done)
2295        character. */        character. */
2296    
2297        g_notempty = 0;        g_notempty = 0;
2298    
2299        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2300          {          {
2301          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
# Line 1388  while (!done) Line 2314  while (!done)
2314          len -= use_offsets[1];          len -= use_offsets[1];
2315          }          }
2316        }  /* End of loop for /g and /G */        }  /* End of loop for /g and /G */
2317    
2318        NEXT_DATA: continue;
2319      }    /* End of loop for data lines */      }    /* End of loop for data lines */
2320    
2321    CONTINUE:    CONTINUE:
# Line 1396  while (!done) Line 2324  while (!done)
2324    if (posix || do_posix) regfree(&preg);    if (posix || do_posix) regfree(&preg);
2325  #endif  #endif
2326    
2327    if (re != NULL) free(re);    if (re != NULL) new_free(re);
2328    if (extra != NULL) free(extra);    if (extra != NULL) new_free(extra);
2329    if (tables != NULL)    if (tables != NULL)
2330      {      {
2331      free((void *)tables);      new_free((void *)tables);
2332      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
2333        locale_set = 0;
2334      }      }
2335    }    }
2336    
2337  fprintf(outfile, "\n");  if (infile == stdin) fprintf(outfile, "\n");
2338  return 0;  
2339    EXIT:
2340    
2341    if (infile != NULL && infile != stdin) fclose(infile);
2342    if (outfile != NULL && outfile != stdout) fclose(outfile);
2343    
2344    free(buffer);
2345    free(dbuffer);
2346    free(pbuffer);
2347    free(offsets);
2348    
2349    return yield;
2350  }  }
2351    
2352  /* End */  /* End of pcretest.c */

Legend:
Removed from v.65  
changed lines
  Added in v.210

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12