/[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 69 by nigel, Sat Feb 24 21:40:18 2007 UTC revision 361 by ph10, Thu Jul 10 16:03:28 2008 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    #ifdef SUPPORT_LIBREADLINE
52    #ifdef HAVE_UNISTD_H
53    #include <unistd.h>
54    #endif
55    #include <readline/readline.h>
56    #include <readline/history.h>
57    #endif
58    
59    
60  /* We need the internal info for displaying the results of pcre_study(). Also  /* A number of things vary for Windows builds. Originally, pcretest opened its
61  for getting the opcodes for showing compiled code. */  input and output without "b"; then I was told that "b" was needed in some
62    environments, so it was added for release 5.0 to both the input and output. (It
63    makes no difference on Unix-like systems.) Later I was told that it is wrong
64    for the input on Windows. I've now abstracted the modes into two macros that
65    are set here, to make it easier to fiddle with them, and removed "b" from the
66    input mode under Windows. */
67    
68    #if defined(_WIN32) || defined(WIN32)
69    #include <io.h>                /* For _setmode() */
70    #include <fcntl.h>             /* For _O_BINARY */
71    #define INPUT_MODE   "r"
72    #define OUTPUT_MODE  "wb"
73    
74    #define isatty _isatty         /* This is what Windows calls them, I'm told */
75    #define fileno _fileno
76    
77    #else
78    #include <sys/time.h>          /* These two includes are needed */
79    #include <sys/resource.h>      /* for setrlimit(). */
80    #define INPUT_MODE   "rb"
81    #define OUTPUT_MODE  "wb"
82    #endif
83    
84    
85    /* We have to include pcre_internal.h because we need the internal info for
86    displaying the results of pcre_study() and we also need to know about the
87    internal macros, structures, and other internal data values; pcretest has
88    "inside information" compared to a program that strictly follows the PCRE API.
89    
90    Although pcre_internal.h does itself include pcre.h, we explicitly include it
91    here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
92    appropriately for an application, not for building PCRE. */
93    
94    #include "pcre.h"
95    #include "pcre_internal.h"
96    
97    /* We need access to some of the data tables that PCRE uses. So as not to have
98    to keep two copies, we include the source file here, changing the names of the
99    external symbols to prevent clashes. */
100    
101    #define _pcre_ucp_gentype      ucp_gentype
102    #define _pcre_utf8_table1      utf8_table1
103    #define _pcre_utf8_table1_size utf8_table1_size
104    #define _pcre_utf8_table2      utf8_table2
105    #define _pcre_utf8_table3      utf8_table3
106    #define _pcre_utf8_table4      utf8_table4
107    #define _pcre_utt              utt
108    #define _pcre_utt_size         utt_size
109    #define _pcre_utt_names        utt_names
110    #define _pcre_OP_lengths       OP_lengths
111    
112    #include "pcre_tables.c"
113    
114    /* We also need the pcre_printint() function for printing out compiled
115    patterns. This function is in a separate file so that it can be included in
116    pcre_compile.c when that module is compiled with debugging enabled.
117    
118    The definition of the macro PRINTABLE, which determines whether to print an
119    output character as-is or as a hex value when showing compiled patterns, is
120    contained in this file. We uses it here also, in cases when the locale has not
121    been explicitly changed, so as to get consistent output from systems that
122    differ in their output from isprint() even in the "C" locale. */
123    
124    #include "pcre_printint.src"
125    
126    #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
127    
 #define PCRE_SPY        /* For Win32 build, import data, not export */  
 #include "internal.h"  
128    
129  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
130  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 134  Makefile. */
134  #include "pcreposix.h"  #include "pcreposix.h"
135  #endif  #endif
136    
137    /* It is also possible, for the benefit of the version currently imported into
138    Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
139    interface to the DFA matcher (NODFA), and without the doublecheck of the old
140    "info" function (define NOINFOCHECK). In fact, we automatically cut out the
141    UTF8 support if PCRE is built without it. */
142    
143    #ifndef SUPPORT_UTF8
144    #ifndef NOUTF8
145    #define NOUTF8
146    #endif
147    #endif
148    
149    
150    /* Other parameters */
151    
152  #ifndef CLOCKS_PER_SEC  #ifndef CLOCKS_PER_SEC
153  #ifdef CLK_TCK  #ifdef CLK_TCK
154  #define CLOCKS_PER_SEC CLK_TCK  #define CLOCKS_PER_SEC CLK_TCK
# Line 35  Makefile. */ Line 157  Makefile. */
157  #endif  #endif
158  #endif  #endif
159    
160  #define LOOPREPEAT 50000  /* This is the default loop count for timing. */
161    
162  #define BUFFER_SIZE 30000  #define LOOPREPEAT 500000
 #define DBUFFER_SIZE 1024  
163    
164    /* Static variables */
165    
166  static FILE *outfile;  static FILE *outfile;
167  static int log_store = 0;  static int log_store = 0;
# Line 47  static int callout_count; Line 169  static int callout_count;
169  static int callout_extra;  static int callout_extra;
170  static int callout_fail_count;  static int callout_fail_count;
171  static int callout_fail_id;  static int callout_fail_id;
172    static int debug_lengths;
173  static int first_callout;  static int first_callout;
174    static int locale_set = 0;
175    static int show_malloc;
176  static int use_utf8;  static int use_utf8;
177  static size_t gotten_store;  static size_t gotten_store;
178    
179    /* The buffers grow automatically if very long input lines are encountered. */
180    
181    static int buffer_size = 50000;
182    static uschar *buffer = NULL;
183    static uschar *dbuffer = NULL;
184    static uschar *pbuffer = NULL;
185    
 static const int utf8_table1[] = {  
   0x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff};  
186    
 static const int utf8_table2[] = {  
   0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc};  
187    
188  static const int utf8_table3[] = {  /*************************************************
189    0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};  *        Read or extend an input line            *
190    *************************************************/
191    
192    /* Input lines are read into buffer, but both patterns and data lines can be
193    continued over multiple input lines. In addition, if the buffer fills up, we
194    want to automatically expand it so as to be able to handle extremely large
195    lines that are needed for certain stress tests. When the input buffer is
196    expanded, the other two buffers must also be expanded likewise, and the
197    contents of pbuffer, which are a copy of the input for callouts, must be
198    preserved (for when expansion happens for a data line). This is not the most
199    optimal way of handling this, but hey, this is just a test program!
200    
201    Arguments:
202      f            the file to read
203      start        where in buffer to start (this *must* be within buffer)
204      prompt       for stdin or readline()
205    
206    Returns:       pointer to the start of new data
207                   could be a copy of start, or could be moved
208                   NULL if no data read and EOF reached
209    */
210    
211    static uschar *
212    extend_inputline(FILE *f, uschar *start, const char *prompt)
213    {
214    uschar *here = start;
215    
216    for (;;)
217      {
218      int rlen = buffer_size - (here - buffer);
219    
220      if (rlen > 1000)
221        {
222        int dlen;
223    
224        /* If libreadline support is required, use readline() to read a line if the
225        input is a terminal. Note that readline() removes the trailing newline, so
226        we must put it back again, to be compatible with fgets(). */
227    
228    #ifdef SUPPORT_LIBREADLINE
229        if (isatty(fileno(f)))
230          {
231          size_t len;
232          char *s = readline(prompt);
233          if (s == NULL) return (here == start)? NULL : start;
234          len = strlen(s);
235          if (len > 0) add_history(s);
236          if (len > rlen - 1) len = rlen - 1;
237          memcpy(here, s, len);
238          here[len] = '\n';
239          here[len+1] = 0;
240          free(s);
241          }
242        else
243    #endif
244    
245        /* Read the next line by normal means, prompting if the file is stdin. */
246    
247          {
248          if (f == stdin) printf(prompt);
249          if (fgets((char *)here, rlen,  f) == NULL)
250            return (here == start)? NULL : start;
251          }
252    
253        dlen = (int)strlen((char *)here);
254        if (dlen > 0 && here[dlen - 1] == '\n') return start;
255        here += dlen;
256        }
257    
258      else
259        {
260        int new_buffer_size = 2*buffer_size;
261        uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);
262        uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);
263        uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);
264    
265        if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
266          {
267          fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
268          exit(1);
269          }
270    
271        memcpy(new_buffer, buffer, buffer_size);
272        memcpy(new_pbuffer, pbuffer, buffer_size);
273    
274        buffer_size = new_buffer_size;
275    
276        start = new_buffer + (start - buffer);
277        here = new_buffer + (here - buffer);
278    
279        free(buffer);
280        free(dbuffer);
281        free(pbuffer);
282    
283        buffer = new_buffer;
284        dbuffer = new_dbuffer;
285        pbuffer = new_pbuffer;
286        }
287      }
288    
289    return NULL;  /* Control never gets here */
290    }
291    
 /*************************************************  
 *         Print compiled regex                   *  
 *************************************************/  
292    
 /* 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. */  
293    
 static uschar OP_lengths[] = { OP_LENGTHS };  
294    
 #include "printint.c"  
295    
296    
297    
# Line 85  static uschar OP_lengths[] = { OP_LENGTH Line 301  static uschar OP_lengths[] = { OP_LENGTH
301    
302  /* 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
303  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
304  for unpicking the -o argument, so just keep it simple.  for unpicking arguments, so just keep it simple.
305    
306  Arguments:  Arguments:
307    str           string to be converted    str           string to be converted
# Line 106  return(result); Line 322  return(result);
322    
323    
324    
 /*************************************************  
 *       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;  
 }  
   
325    
326  /*************************************************  /*************************************************
327  *            Convert UTF-8 string to value       *  *            Convert UTF-8 string to value       *
# Line 151  return i + 1; Line 331  return i + 1;
331  and returns the value of the character.  and returns the value of the character.
332    
333  Argument:  Argument:
334    buffer   a pointer to the byte vector    utf8bytes   a pointer to the byte vector
335    vptr     a pointer to an int to receive the value    vptr        a pointer to an int to receive the value
336    
337  Returns:   >  0 => the number of bytes consumed  Returns:      >  0 => the number of bytes consumed
338             -6 to 0 => malformed UTF-8 character at offset = (-return)                -6 to 0 => malformed UTF-8 character at offset = (-return)
339  */  */
340    
341    #if !defined NOUTF8
342    
343  static int  static int
344  utf82ord(unsigned char *buffer, int *vptr)  utf82ord(unsigned char *utf8bytes, int *vptr)
345  {  {
346  int c = *buffer++;  int c = *utf8bytes++;
347  int d = c;  int d = c;
348  int i, j, s;  int i, j, s;
349    
# Line 181  d = (c & utf8_table3[i]) << s; Line 363  d = (c & utf8_table3[i]) << s;
363    
364  for (j = 0; j < i; j++)  for (j = 0; j < i; j++)
365    {    {
366    c = *buffer++;    c = *utf8bytes++;
367    if ((c & 0xc0) != 0x80) return -(j+1);    if ((c & 0xc0) != 0x80) return -(j+1);
368    s -= 6;    s -= 6;
369    d |= (c & 0x3f) << s;    d |= (c & 0x3f) << s;
# Line 189  for (j = 0; j < i; j++) Line 371  for (j = 0; j < i; j++)
371    
372  /* Check that encoding was the correct unique one */  /* Check that encoding was the correct unique one */
373    
374  for (j = 0; j < sizeof(utf8_table1)/sizeof(int); j++)  for (j = 0; j < utf8_table1_size; j++)
375    if (d <= utf8_table1[j]) break;    if (d <= utf8_table1[j]) break;
376  if (j != i) return -(i+1);  if (j != i) return -(i+1);
377    
# Line 199  if (j != i) return -(i+1); Line 381  if (j != i) return -(i+1);
381  return i+1;  return i+1;
382  }  }
383    
384    #endif
385    
386    
387    
388    /*************************************************
389    *       Convert character value to UTF-8         *
390    *************************************************/
391    
392    /* This function takes an integer value in the range 0 - 0x7fffffff
393    and encodes it as a UTF-8 character in 0 to 6 bytes.
394    
395    Arguments:
396      cvalue     the character value
397      utf8bytes  pointer to buffer for result - at least 6 bytes long
398    
399    Returns:     number of characters placed in the buffer
400    */
401    
402    #if !defined NOUTF8
403    
404    static int
405    ord2utf8(int cvalue, uschar *utf8bytes)
406    {
407    register int i, j;
408    for (i = 0; i < utf8_table1_size; i++)
409      if (cvalue <= utf8_table1[i]) break;
410    utf8bytes += i;
411    for (j = i; j > 0; j--)
412     {
413     *utf8bytes-- = 0x80 | (cvalue & 0x3f);
414     cvalue >>= 6;
415     }
416    *utf8bytes = utf8_table2[i] | cvalue;
417    return i + 1;
418    }
419    
420    #endif
421    
422    
423    
424  /*************************************************  /*************************************************
# Line 211  chars without printing. */ Line 431  chars without printing. */
431    
432  static int pchars(unsigned char *p, int length, FILE *f)  static int pchars(unsigned char *p, int length, FILE *f)
433  {  {
434  int c;  int c = 0;
435  int yield = 0;  int yield = 0;
436    
437  while (length-- > 0)  while (length-- > 0)
438    {    {
439    #if !defined NOUTF8
440    if (use_utf8)    if (use_utf8)
441      {      {
442      int rc = utf82ord(p, &c);      int rc = utf82ord(p, &c);
# Line 224  while (length-- > 0) Line 445  while (length-- > 0)
445        {        {
446        length -= rc - 1;        length -= rc - 1;
447        p += rc;        p += rc;
448        if (c < 256 && isprint(c))        if (PRINTHEX(c))
449          {          {
450          if (f != NULL) fprintf(f, "%c", c);          if (f != NULL) fprintf(f, "%c", c);
451          yield++;          yield++;
452          }          }
453        else        else
454          {          {
455          int n;          int n = 4;
456          if (f != NULL) fprintf(f, "\\x{%02x}%n", c, &n);          if (f != NULL) fprintf(f, "\\x{%02x}", c);
457          yield += n;          yield += (n <= 0x000000ff)? 2 :
458                     (n <= 0x00000fff)? 3 :
459                     (n <= 0x0000ffff)? 4 :
460                     (n <= 0x000fffff)? 5 : 6;
461          }          }
462        continue;        continue;
463        }        }
464      }      }
465    #endif
466    
467     /* Not UTF-8, or malformed UTF-8  */     /* Not UTF-8, or malformed UTF-8  */
468    
469    if (isprint(c = *(p++)))    c = *p++;
470      if (PRINTHEX(c))
471      {      {
472      if (f != NULL) fprintf(f, "%c", c);      if (f != NULL) fprintf(f, "%c", c);
473      yield++;      yield++;
# Line 269  data is not zero. */ Line 495  data is not zero. */
495  static int callout(pcre_callout_block *cb)  static int callout(pcre_callout_block *cb)
496  {  {
497  FILE *f = (first_callout | callout_extra)? outfile : NULL;  FILE *f = (first_callout | callout_extra)? outfile : NULL;
498  int i, pre_start, post_start;  int i, pre_start, post_start, subject_length;
499    
500  if (callout_extra)  if (callout_extra)
501    {    {
# Line 300  pre_start = pchars((unsigned char *)cb-> Line 526  pre_start = pchars((unsigned char *)cb->
526  post_start = pchars((unsigned char *)(cb->subject + cb->start_match),  post_start = pchars((unsigned char *)(cb->subject + cb->start_match),
527    cb->current_position - cb->start_match, f);    cb->current_position - cb->start_match, f);
528    
529    subject_length = pchars((unsigned char *)cb->subject, cb->subject_length, NULL);
530    
531  (void)pchars((unsigned char *)(cb->subject + cb->current_position),  (void)pchars((unsigned char *)(cb->subject + cb->current_position),
532    cb->subject_length - cb->current_position, f);    cb->subject_length - cb->current_position, f);
533    
534  if (f != NULL) fprintf(f, "\n");  if (f != NULL) fprintf(f, "\n");
535    
536  /* Always print appropriate indicators, with callout number if not already  /* Always print appropriate indicators, with callout number if not already
537  shown */  shown. For automatic callouts, show the pattern offset. */
538    
539  if (callout_extra) fprintf(outfile, "    ");  if (cb->callout_number == 255)
540    else fprintf(outfile, "%3d ", cb->callout_number);    {
541      fprintf(outfile, "%+3d ", cb->pattern_position);
542      if (cb->pattern_position > 99) fprintf(outfile, "\n    ");
543      }
544    else
545      {
546      if (callout_extra) fprintf(outfile, "    ");
547        else fprintf(outfile, "%3d ", cb->callout_number);
548      }
549    
550  for (i = 0; i < pre_start; i++) fprintf(outfile, " ");  for (i = 0; i < pre_start; i++) fprintf(outfile, " ");
551  fprintf(outfile, "^");  fprintf(outfile, "^");
# Line 320  if (post_start > 0) Line 556  if (post_start > 0)
556    fprintf(outfile, "^");    fprintf(outfile, "^");
557    }    }
558    
559  fprintf(outfile, "\n");  for (i = 0; i < subject_length - pre_start - post_start + 4; i++)
560      fprintf(outfile, " ");
561    
562    fprintf(outfile, "%.*s", (cb->next_item_length == 0)? 1 : cb->next_item_length,
563      pbuffer + cb->pattern_position);
564    
565    fprintf(outfile, "\n");
566  first_callout = 0;  first_callout = 0;
567    
568  if ((int)(cb->callout_data) != 0)  if (cb->callout_data != NULL)
569    {    {
570    fprintf(outfile, "Callout data = %d\n", (int)(cb->callout_data));    int callout_data = *((int *)(cb->callout_data));
571    return (int)(cb->callout_data);    if (callout_data != 0)
572        {
573        fprintf(outfile, "Callout data = %d\n", callout_data);
574        return callout_data;
575        }
576    }    }
577    
578  return (cb->callout_number != callout_fail_id)? 0 :  return (cb->callout_number != callout_fail_id)? 0 :
# Line 336  return (cb->callout_number != callout_fa Line 581  return (cb->callout_number != callout_fa
581    
582    
583  /*************************************************  /*************************************************
584  *            Local malloc function               *  *            Local malloc functions              *
585  *************************************************/  *************************************************/
586    
587  /* 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 344  compiled re. */ Line 589  compiled re. */
589    
590  static void *new_malloc(size_t size)  static void *new_malloc(size_t size)
591  {  {
592    void *block = malloc(size);
593  gotten_store = size;  gotten_store = size;
594  return malloc(size);  if (show_malloc)
595      fprintf(outfile, "malloc       %3d %p\n", (int)size, block);
596    return block;
597  }  }
598    
599    static void new_free(void *block)
600    {
601    if (show_malloc)
602      fprintf(outfile, "free             %p\n", block);
603    free(block);
604    }
605    
606    
607    /* For recursion malloc/free, to test stacking calls */
608    
609    static void *stack_malloc(size_t size)
610    {
611    void *block = malloc(size);
612    if (show_malloc)
613      fprintf(outfile, "stack_malloc %3d %p\n", (int)size, block);
614    return block;
615    }
616    
617    static void stack_free(void *block)
618    {
619    if (show_malloc)
620      fprintf(outfile, "stack_free       %p\n", block);
621    free(block);
622    }
623    
624    
625  /*************************************************  /*************************************************
# Line 366  if ((rc = pcre_fullinfo(re, study, optio Line 638  if ((rc = pcre_fullinfo(re, study, optio
638    
639    
640  /*************************************************  /*************************************************
641    *         Byte flipping function                 *
642    *************************************************/
643    
644    static unsigned long int
645    byteflip(unsigned long int value, int n)
646    {
647    if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
648    return ((value & 0x000000ff) << 24) |
649           ((value & 0x0000ff00) <<  8) |
650           ((value & 0x00ff0000) >>  8) |
651           ((value & 0xff000000) >> 24);
652    }
653    
654    
655    
656    
657    /*************************************************
658    *        Check match or recursion limit          *
659    *************************************************/
660    
661    static int
662    check_match_limit(pcre *re, pcre_extra *extra, uschar *bptr, int len,
663      int start_offset, int options, int *use_offsets, int use_size_offsets,
664      int flag, unsigned long int *limit, int errnumber, const char *msg)
665    {
666    int count;
667    int min = 0;
668    int mid = 64;
669    int max = -1;
670    
671    extra->flags |= flag;
672    
673    for (;;)
674      {
675      *limit = mid;
676    
677      count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options,
678        use_offsets, use_size_offsets);
679    
680      if (count == errnumber)
681        {
682        /* fprintf(outfile, "Testing %s limit = %d\n", msg, mid); */
683        min = mid;
684        mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2;
685        }
686    
687      else if (count >= 0 || count == PCRE_ERROR_NOMATCH ||
688                             count == PCRE_ERROR_PARTIAL)
689        {
690        if (mid == min + 1)
691          {
692          fprintf(outfile, "Minimum %s limit = %d\n", msg, mid);
693          break;
694          }
695        /* fprintf(outfile, "Testing %s limit = %d\n", msg, mid); */
696        max = mid;
697        mid = (min + mid)/2;
698        }
699      else break;    /* Some other error */
700      }
701    
702    extra->flags &= ~flag;
703    return count;
704    }
705    
706    
707    
708    /*************************************************
709    *         Case-independent strncmp() function    *
710    *************************************************/
711    
712    /*
713    Arguments:
714      s         first string
715      t         second string
716      n         number of characters to compare
717    
718    Returns:    < 0, = 0, or > 0, according to the comparison
719    */
720    
721    static int
722    strncmpic(uschar *s, uschar *t, int n)
723    {
724    while (n--)
725      {
726      int c = tolower(*s++) - tolower(*t++);
727      if (c) return c;
728      }
729    return 0;
730    }
731    
732    
733    
734    /*************************************************
735    *         Check newline indicator                *
736    *************************************************/
737    
738    /* This is used both at compile and run-time to check for <xxx> escapes, where
739    xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
740    no match.
741    
742    Arguments:
743      p           points after the leading '<'
744      f           file for error message
745    
746    Returns:      appropriate PCRE_NEWLINE_xxx flags, or 0
747    */
748    
749    static int
750    check_newline(uschar *p, FILE *f)
751    {
752    if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
753    if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
754    if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
755    if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
756    if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
757    if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
758    if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
759    fprintf(f, "Unknown newline type at: <%s\n", p);
760    return 0;
761    }
762    
763    
764    
765    /*************************************************
766    *             Usage function                     *
767    *************************************************/
768    
769    static void
770    usage(void)
771    {
772    printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
773    printf("Input and output default to stdin and stdout.\n");
774    #ifdef SUPPORT_LIBREADLINE
775    printf("If input is a terminal, readline() is used to read from it.\n");
776    #else
777    printf("This version of pcretest is not linked with readline().\n");
778    #endif
779    printf("\nOptions:\n");
780    printf("  -b       show compiled code (bytecode)\n");
781    printf("  -C       show PCRE compile-time options and exit\n");
782    printf("  -d       debug: show compiled code and information (-b and -i)\n");
783    #if !defined NODFA
784    printf("  -dfa     force DFA matching for all subjects\n");
785    #endif
786    printf("  -help    show usage information\n");
787    printf("  -i       show information about compiled patterns\n"
788           "  -m       output memory used information\n"
789           "  -o <n>   set size of offsets vector to <n>\n");
790    #if !defined NOPOSIX
791    printf("  -p       use POSIX interface\n");
792    #endif
793    printf("  -q       quiet: do not output PCRE version number at start\n");
794    printf("  -S <n>   set stack size to <n> megabytes\n");
795    printf("  -s       output store (memory) used information\n"
796           "  -t       time compilation and execution\n");
797    printf("  -t <n>   time compilation and execution, repeating <n> times\n");
798    printf("  -tm      time execution (matching) only\n");
799    printf("  -tm <n>  time execution (matching) only, repeating <n> times\n");
800    }
801    
802    
803    
804    /*************************************************
805  *                Main Program                    *  *                Main Program                    *
806  *************************************************/  *************************************************/
807    
# Line 380  int options = 0; Line 816  int options = 0;
816  int study_options = 0;  int study_options = 0;
817  int op = 1;  int op = 1;
818  int timeit = 0;  int timeit = 0;
819    int timeitm = 0;
820  int showinfo = 0;  int showinfo = 0;
821  int showstore = 0;  int showstore = 0;
822    int quiet = 0;
823  int size_offsets = 45;  int size_offsets = 45;
824  int size_offsets_max;  int size_offsets_max;
825  int *offsets;  int *offsets = NULL;
826  #if !defined NOPOSIX  #if !defined NOPOSIX
827  int posix = 0;  int posix = 0;
828  #endif  #endif
829  int debug = 0;  int debug = 0;
830  int done = 0;  int done = 0;
831    int all_use_dfa = 0;
832    int yield = 0;
833    int stack_size;
834    
835  unsigned char *buffer;  /* These vectors store, end-to-end, a list of captured substring names. Assume
836  unsigned char *dbuffer;  that 1024 is plenty long enough for the few names we'll be testing. */
837    
838    uschar copynames[1024];
839    uschar getnames[1024];
840    
841    uschar *copynamesptr;
842    uschar *getnamesptr;
843    
844  /* Get buffers from malloc() so that Electric Fence will check their misuse  /* Get buffers from malloc() so that Electric Fence will check their misuse
845  when I am debugging. */  when I am debugging. They grow automatically when very long lines are read. */
846    
847  buffer = malloc(BUFFER_SIZE);  buffer = (unsigned char *)malloc(buffer_size);
848  dbuffer = malloc(DBUFFER_SIZE);  dbuffer = (unsigned char *)malloc(buffer_size);
849    pbuffer = (unsigned char *)malloc(buffer_size);
850    
851  /* Static so that new_malloc can use it. */  /* The outfile variable is static so that new_malloc can use it. */
852    
853  outfile = stdout;  outfile = stdout;
854    
855    /* The following  _setmode() stuff is some Windows magic that tells its runtime
856    library to translate CRLF into a single LF character. At least, that's what
857    I've been told: never having used Windows I take this all on trust. Originally
858    it set 0x8000, but then I was advised that _O_BINARY was better. */
859    
860    #if defined(_WIN32) || defined(WIN32)
861    _setmode( _fileno( stdout ), _O_BINARY );
862    #endif
863    
864  /* Scan options */  /* Scan options */
865    
866  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
# Line 412  while (argc > 1 && argv[op][0] == '-') Line 869  while (argc > 1 && argv[op][0] == '-')
869    
870    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
871      showstore = 1;      showstore = 1;
872    else if (strcmp(argv[op], "-t") == 0) timeit = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
873      else if (strcmp(argv[op], "-b") == 0) debug = 1;
874    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
875    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
876    #if !defined NODFA
877      else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
878    #endif
879    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
880        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),
881          *endptr == 0))          *endptr == 0))
# Line 422  while (argc > 1 && argv[op][0] == '-') Line 883  while (argc > 1 && argv[op][0] == '-')
883      op++;      op++;
884      argc--;      argc--;
885      }      }
886      else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
887        {
888        int both = argv[op][2] == 0;
889        int temp;
890        if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
891                         *endptr == 0))
892          {
893          timeitm = temp;
894          op++;
895          argc--;
896          }
897        else timeitm = LOOPREPEAT;
898        if (both) timeit = timeitm;
899        }
900      else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
901          ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
902            *endptr == 0))
903        {
904    #if defined(_WIN32) || defined(WIN32)
905        printf("PCRE: -S not supported on this OS\n");
906        exit(1);
907    #else
908        int rc;
909        struct rlimit rlim;
910        getrlimit(RLIMIT_STACK, &rlim);
911        rlim.rlim_cur = stack_size * 1024 * 1024;
912        rc = setrlimit(RLIMIT_STACK, &rlim);
913        if (rc != 0)
914          {
915        printf("PCRE: setrlimit() failed with error %d\n", rc);
916        exit(1);
917          }
918        op++;
919        argc--;
920    #endif
921        }
922  #if !defined NOPOSIX  #if !defined NOPOSIX
923    else if (strcmp(argv[op], "-p") == 0) posix = 1;    else if (strcmp(argv[op], "-p") == 0) posix = 1;
924  #endif  #endif
# Line 432  while (argc > 1 && argv[op][0] == '-') Line 929  while (argc > 1 && argv[op][0] == '-')
929      printf("Compiled with\n");      printf("Compiled with\n");
930      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
931      printf("  %sUTF-8 support\n", rc? "" : "No ");      printf("  %sUTF-8 support\n", rc? "" : "No ");
932        (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
933        printf("  %sUnicode properties support\n", rc? "" : "No ");
934      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
935      printf("  Newline character is %s\n", (rc == '\r')? "CR" : "LF");      printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :
936          (rc == '\n')? "LF" : (rc == ('\r'<<8 | '\n'))? "CRLF" :
937          (rc == -2)? "ANYCRLF" :
938          (rc == -1)? "ANY" : "???");
939        (void)pcre_config(PCRE_CONFIG_BSR, &rc);
940        printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
941                                         "all Unicode newlines");
942      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
943      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
944      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
945      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
946      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
947      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %d\n", rc);
948      exit(0);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);
949        printf("  Default recursion depth limit = %d\n", rc);
950        (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
951        printf("  Match recursion uses %s\n", rc? "stack" : "heap");
952        goto EXIT;
953        }
954      else if (strcmp(argv[op], "-help") == 0 ||
955               strcmp(argv[op], "--help") == 0)
956        {
957        usage();
958        goto EXIT;
959      }      }
960    else    else
961      {      {
962      printf("** Unknown or malformed option %s\n", argv[op]);      printf("** Unknown or malformed option %s\n", argv[op]);
963      printf("Usage:   pcretest [-d] [-i] [-o <n>] [-p] [-s] [-t] [<input> [<output>]]\n");      usage();
964      printf("  -C     show PCRE compile-time options and exit\n");      yield = 1;
965      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;  
966      }      }
967    op++;    op++;
968    argc--;    argc--;
# Line 464  while (argc > 1 && argv[op][0] == '-') Line 971  while (argc > 1 && argv[op][0] == '-')
971  /* Get the store for the offsets vector, and remember what it was */  /* Get the store for the offsets vector, and remember what it was */
972    
973  size_offsets_max = size_offsets;  size_offsets_max = size_offsets;
974  offsets = malloc(size_offsets_max * sizeof(int));  offsets = (int *)malloc(size_offsets_max * sizeof(int));
975  if (offsets == NULL)  if (offsets == NULL)
976    {    {
977    printf("** Failed to get %d bytes of memory for offsets vector\n",    printf("** Failed to get %d bytes of memory for offsets vector\n",
978      size_offsets_max * sizeof(int));      (int)(size_offsets_max * sizeof(int)));
979    return 1;    yield = 1;
980      goto EXIT;
981    }    }
982    
983  /* Sort out the input and output files */  /* Sort out the input and output files */
984    
985  if (argc > 1)  if (argc > 1)
986    {    {
987    infile = fopen(argv[op], "r");    infile = fopen(argv[op], INPUT_MODE);
988    if (infile == NULL)    if (infile == NULL)
989      {      {
990      printf("** Failed to open %s\n", argv[op]);      printf("** Failed to open %s\n", argv[op]);
991      return 1;      yield = 1;
992        goto EXIT;
993      }      }
994    }    }
995    
996  if (argc > 2)  if (argc > 2)
997    {    {
998    outfile = fopen(argv[op+1], "w");    outfile = fopen(argv[op+1], OUTPUT_MODE);
999    if (outfile == NULL)    if (outfile == NULL)
1000      {      {
1001      printf("** Failed to open %s\n", argv[op+1]);      printf("** Failed to open %s\n", argv[op+1]);
1002      return 1;      yield = 1;
1003        goto EXIT;
1004      }      }
1005    }    }
1006    
1007  /* Set alternative malloc function */  /* Set alternative malloc function */
1008    
1009  pcre_malloc = new_malloc;  pcre_malloc = new_malloc;
1010    pcre_free = new_free;
1011    pcre_stack_malloc = stack_malloc;
1012    pcre_stack_free = stack_free;
1013    
1014  /* Heading line, then prompt for first regex if stdin */  /* Heading line unless quiet, then prompt for first regex if stdin */
1015    
1016  fprintf(outfile, "PCRE version %s\n\n", pcre_version());  if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());
1017    
1018  /* Main loop */  /* Main loop */
1019    
# Line 516  while (!done) Line 1029  while (!done)
1029    
1030    const char *error;    const char *error;
1031    unsigned char *p, *pp, *ppp;    unsigned char *p, *pp, *ppp;
1032      unsigned char *to_file = NULL;
1033    const unsigned char *tables = NULL;    const unsigned char *tables = NULL;
1034      unsigned long int true_size, true_study_size = 0;
1035      size_t size, regex_gotten_store;
1036    int do_study = 0;    int do_study = 0;
1037    int do_debug = debug;    int do_debug = debug;
1038    int do_G = 0;    int do_G = 0;
1039    int do_g = 0;    int do_g = 0;
1040    int do_showinfo = showinfo;    int do_showinfo = showinfo;
1041    int do_showrest = 0;    int do_showrest = 0;
1042    int erroroffset, len, delimiter;    int do_flip = 0;
1043      int erroroffset, len, delimiter, poffset;
1044    
1045      use_utf8 = 0;
1046      debug_lengths = 1;
1047    
1048      if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
1049      if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1050      fflush(outfile);
1051    
1052      p = buffer;
1053      while (isspace(*p)) p++;
1054      if (*p == 0) continue;
1055    
1056      /* See if the pattern is to be loaded pre-compiled from a file. */
1057    
1058      if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
1059        {
1060        unsigned long int magic, get_options;
1061        uschar sbuf[8];
1062        FILE *f;
1063    
1064        p++;
1065        pp = p + (int)strlen((char *)p);
1066        while (isspace(pp[-1])) pp--;
1067        *pp = 0;
1068    
1069        f = fopen((char *)p, "rb");
1070        if (f == NULL)
1071          {
1072          fprintf(outfile, "Failed to open %s: %s\n", p, strerror(errno));
1073          continue;
1074          }
1075    
1076        if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ;
1077    
1078        true_size =
1079          (sbuf[0] << 24) | (sbuf[1] << 16) | (sbuf[2] << 8) | sbuf[3];
1080        true_study_size =
1081          (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];
1082    
1083        re = (real_pcre *)new_malloc(true_size);
1084        regex_gotten_store = gotten_store;
1085    
1086        if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;
1087    
1088        magic = ((real_pcre *)re)->magic_number;
1089        if (magic != MAGIC_NUMBER)
1090          {
1091          if (byteflip(magic, sizeof(magic)) == MAGIC_NUMBER)
1092            {
1093            do_flip = 1;
1094            }
1095          else
1096            {
1097            fprintf(outfile, "Data in %s is not a compiled PCRE regex\n", p);
1098            fclose(f);
1099            continue;
1100            }
1101          }
1102    
1103        fprintf(outfile, "Compiled regex%s loaded from %s\n",
1104          do_flip? " (byte-inverted)" : "", p);
1105    
1106        /* Need to know if UTF-8 for printing data strings */
1107    
1108        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1109        use_utf8 = (get_options & PCRE_UTF8) != 0;
1110    
1111        /* Now see if there is any following study data */
1112    
1113        if (true_study_size != 0)
1114          {
1115          pcre_study_data *psd;
1116    
1117    use_utf8 = 0;        extra = (pcre_extra *)new_malloc(sizeof(pcre_extra) + true_study_size);
1118          extra->flags = PCRE_EXTRA_STUDY_DATA;
1119    
1120    if (infile == stdin) printf("  re> ");        psd = (pcre_study_data *)(((char *)extra) + sizeof(pcre_extra));
1121    if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL) break;        extra->study_data = psd;
   if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);  
   fflush(outfile);  
1122    
1123    p = buffer;        if (fread(psd, 1, true_study_size, f) != true_study_size)
1124    while (isspace(*p)) p++;          {
1125    if (*p == 0) continue;          FAIL_READ:
1126            fprintf(outfile, "Failed to read data from %s\n", p);
1127            if (extra != NULL) new_free(extra);
1128            if (re != NULL) new_free(re);
1129            fclose(f);
1130            continue;
1131            }
1132          fprintf(outfile, "Study data loaded from %s\n", p);
1133          do_study = 1;     /* To get the data output if requested */
1134          }
1135        else fprintf(outfile, "No study data\n");
1136    
1137        fclose(f);
1138        goto SHOW_INFO;
1139        }
1140    
1141    /* Get the delimiter and seek the end of the pattern; if is isn't    /* In-line pattern (the usual case). Get the delimiter and seek the end of
1142    complete, read more. */    the pattern; if is isn't complete, read more. */
1143    
1144    delimiter = *p++;    delimiter = *p++;
1145    
1146    if (isalnum(delimiter) || delimiter == '\\')    if (isalnum(delimiter) || delimiter == '\\')
1147      {      {
1148      fprintf(outfile, "** Delimiter must not be alphameric or \\\n");      fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
1149      goto SKIP_DATA;      goto SKIP_DATA;
1150      }      }
1151    
1152    pp = p;    pp = p;
1153      poffset = p - buffer;
1154    
1155    for(;;)    for(;;)
1156      {      {
# Line 558  while (!done) Line 1161  while (!done)
1161        pp++;        pp++;
1162        }        }
1163      if (*pp != 0) break;      if (*pp != 0) break;
1164        if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
     len = BUFFER_SIZE - (pp - buffer);  
     if (len < 256)  
       {  
       fprintf(outfile, "** Expression too long - missing delimiter?\n");  
       goto SKIP_DATA;  
       }  
   
     if (infile == stdin) printf("    > ");  
     if (fgets((char *)pp, len, infile) == NULL)  
1165        {        {
1166        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1167        done = 1;        done = 1;
# Line 576  while (!done) Line 1170  while (!done)
1170      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
1171      }      }
1172    
1173      /* The buffer may have moved while being extended; reset the start of data
1174      pointer to the correct relative point in the buffer. */
1175    
1176      p = buffer + poffset;
1177    
1178    /* If the first character after the delimiter is backslash, make    /* If the first character after the delimiter is backslash, make
1179    the pattern end with backslash. This is purely to provide a way    the pattern end with backslash. This is purely to provide a way
1180    of testing for the error message when a pattern ends with backslash. */    of testing for the error message when a pattern ends with backslash. */
1181    
1182    if (pp[1] == '\\') *pp++ = '\\';    if (pp[1] == '\\') *pp++ = '\\';
1183    
1184    /* Terminate the pattern at the delimiter */    /* Terminate the pattern at the delimiter, and save a copy of the pattern
1185      for callouts. */
1186    
1187    *pp++ = 0;    *pp++ = 0;
1188      strcpy((char *)pbuffer, (char *)p);
1189    
1190    /* Look for options after final delimiter */    /* Look for options after final delimiter */
1191    
# Line 596  while (!done) Line 1197  while (!done)
1197      {      {
1198      switch (*pp++)      switch (*pp++)
1199        {        {
1200          case 'f': options |= PCRE_FIRSTLINE; break;
1201        case 'g': do_g = 1; break;        case 'g': do_g = 1; break;
1202        case 'i': options |= PCRE_CASELESS; break;        case 'i': options |= PCRE_CASELESS; break;
1203        case 'm': options |= PCRE_MULTILINE; break;        case 'm': options |= PCRE_MULTILINE; break;
# Line 604  while (!done) Line 1206  while (!done)
1206    
1207        case '+': do_showrest = 1; break;        case '+': do_showrest = 1; break;
1208        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1209          case 'B': do_debug = 1; break;
1210          case 'C': options |= PCRE_AUTO_CALLOUT; break;
1211        case 'D': do_debug = do_showinfo = 1; break;        case 'D': do_debug = do_showinfo = 1; break;
1212        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
1213          case 'F': do_flip = 1; break;
1214        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1215        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1216          case 'J': options |= PCRE_DUPNAMES; break;
1217        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1218        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1219    
# Line 618  while (!done) Line 1224  while (!done)
1224        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1225        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1226        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1227          case 'Z': debug_lengths = 0; break;
1228        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1229          case '?': options |= PCRE_NO_UTF8_CHECK; break;
1230    
1231        case 'L':        case 'L':
1232        ppp = pp;        ppp = pp;
1233        while (*ppp != '\n' && *ppp != ' ') ppp++;        /* The '\r' test here is so that it works on Windows. */
1234          /* The '0' test is just in case this is an unterminated line. */
1235          while (*ppp != 0 && *ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
1236        *ppp = 0;        *ppp = 0;
1237        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
1238          {          {
1239          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);
1240          goto SKIP_DATA;          goto SKIP_DATA;
1241          }          }
1242          locale_set = 1;
1243        tables = pcre_maketables();        tables = pcre_maketables();
1244        pp = ppp;        pp = ppp;
1245        break;        break;
1246    
1247        case '\n': case ' ': break;        case '>':
1248          to_file = pp;
1249          while (*pp != 0) pp++;
1250          while (isspace(pp[-1])) pp--;
1251          *pp = 0;
1252          break;
1253    
1254          case '<':
1255            {
1256            if (strncmp((char *)pp, "JS>", 3) == 0)
1257              {
1258              options |= PCRE_JAVASCRIPT_COMPAT;
1259              pp += 3;
1260              }
1261            else
1262              {
1263              int x = check_newline(pp, outfile);
1264              if (x == 0) goto SKIP_DATA;
1265              options |= x;
1266              while (*pp++ != '>');
1267              }
1268            }
1269          break;
1270    
1271          case '\r':                      /* So that it works in Windows */
1272          case '\n':
1273          case ' ':
1274          break;
1275    
1276        default:        default:
1277        fprintf(outfile, "** Unknown option '%c'\n", pp[-1]);        fprintf(outfile, "** Unknown option '%c'\n", pp[-1]);
1278        goto SKIP_DATA;        goto SKIP_DATA;
# Line 649  while (!done) Line 1288  while (!done)
1288      {      {
1289      int rc;      int rc;
1290      int cflags = 0;      int cflags = 0;
1291    
1292      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;
1293      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;
1294        if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1295        if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1296        if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1297    
1298      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1299    
1300      /* Compilation failed; go back for another re, skipping to blank line      /* Compilation failed; go back for another re, skipping to blank line
# Line 658  while (!done) Line 1302  while (!done)
1302    
1303      if (rc != 0)      if (rc != 0)
1304        {        {
1305        (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);        (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1306        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);
1307        goto SKIP_DATA;        goto SKIP_DATA;
1308        }        }
# Line 670  while (!done) Line 1314  while (!done)
1314  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1315    
1316      {      {
1317      if (timeit)      if (timeit > 0)
1318        {        {
1319        register int i;        register int i;
1320        clock_t time_taken;        clock_t time_taken;
1321        clock_t start_time = clock();        clock_t start_time = clock();
1322        for (i = 0; i < LOOPREPEAT; i++)        for (i = 0; i < timeit; i++)
1323          {          {
1324          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
1325          if (re != NULL) free(re);          if (re != NULL) free(re);
1326          }          }
1327        time_taken = clock() - start_time;        time_taken = clock() - start_time;
1328        fprintf(outfile, "Compile time %.3f milliseconds\n",        fprintf(outfile, "Compile time %.4f milliseconds\n",
1329          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /          (((double)time_taken * 1000.0) / (double)timeit) /
1330            (double)CLOCKS_PER_SEC);            (double)CLOCKS_PER_SEC);
1331        }        }
1332    
# Line 699  while (!done) Line 1343  while (!done)
1343          {          {
1344          for (;;)          for (;;)
1345            {            {
1346            if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)            if (extend_inputline(infile, buffer, NULL) == NULL)
1347              {              {
1348              done = 1;              done = 1;
1349              goto CONTINUE;              goto CONTINUE;
# Line 723  while (!done) Line 1367  while (!done)
1367                sizeof(real_pcre) -                sizeof(real_pcre) -
1368                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));
1369    
1370        /* Extract the size for possible writing before possibly flipping it,
1371        and remember the store that was got. */
1372    
1373        true_size = ((real_pcre *)re)->size;
1374        regex_gotten_store = gotten_store;
1375    
1376        /* If /S was present, study the regexp to generate additional info to
1377        help with the matching. */
1378    
1379        if (do_study)
1380          {
1381          if (timeit > 0)
1382            {
1383            register int i;
1384            clock_t time_taken;
1385            clock_t start_time = clock();
1386            for (i = 0; i < timeit; i++)
1387              extra = pcre_study(re, study_options, &error);
1388            time_taken = clock() - start_time;
1389            if (extra != NULL) free(extra);
1390            fprintf(outfile, "  Study time %.4f milliseconds\n",
1391              (((double)time_taken * 1000.0) / (double)timeit) /
1392                (double)CLOCKS_PER_SEC);
1393            }
1394          extra = pcre_study(re, study_options, &error);
1395          if (error != NULL)
1396            fprintf(outfile, "Failed to study: %s\n", error);
1397          else if (extra != NULL)
1398            true_study_size = ((pcre_study_data *)(extra->study_data))->size;
1399          }
1400    
1401        /* If the 'F' option was present, we flip the bytes of all the integer
1402        fields in the regex data block and the study block. This is to make it
1403        possible to test PCRE's handling of byte-flipped patterns, e.g. those
1404        compiled on a different architecture. */
1405    
1406        if (do_flip)
1407          {
1408          real_pcre *rre = (real_pcre *)re;
1409          rre->magic_number =
1410            byteflip(rre->magic_number, sizeof(rre->magic_number));
1411          rre->size = byteflip(rre->size, sizeof(rre->size));
1412          rre->options = byteflip(rre->options, sizeof(rre->options));
1413          rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
1414          rre->top_bracket =
1415            (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
1416          rre->top_backref =
1417            (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
1418          rre->first_byte =
1419            (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));
1420          rre->req_byte =
1421            (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));
1422          rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
1423            sizeof(rre->name_table_offset));
1424          rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
1425            sizeof(rre->name_entry_size));
1426          rre->name_count = (pcre_uint16)byteflip(rre->name_count,
1427            sizeof(rre->name_count));
1428    
1429          if (extra != NULL)
1430            {
1431            pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
1432            rsd->size = byteflip(rsd->size, sizeof(rsd->size));
1433            rsd->options = byteflip(rsd->options, sizeof(rsd->options));
1434            }
1435          }
1436    
1437        /* Extract information from the compiled data if required */
1438    
1439        SHOW_INFO:
1440    
1441        if (do_debug)
1442          {
1443          fprintf(outfile, "------------------------------------------------------------------\n");
1444          pcre_printint(re, outfile, debug_lengths);
1445          }
1446    
1447      if (do_showinfo)      if (do_showinfo)
1448        {        {
1449        unsigned long int get_options;        unsigned long int get_options, all_options;
1450    #if !defined NOINFOCHECK
1451        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1452        int count, backrefmax, first_char, need_char;  #endif
1453          int count, backrefmax, first_char, need_char, okpartial, jchanged,
1454            hascrorlf;
1455        int nameentrysize, namecount;        int nameentrysize, namecount;
1456        const uschar *nametable;        const uschar *nametable;
       size_t size;  
   
       if (do_debug)  
         {  
         fprintf(outfile, "------------------------------------------------------------------\n");  
         print_internals(re, outfile);  
         }  
1457    
1458        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1459        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
# Line 747  while (!done) Line 1464  while (!done)
1464        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1465        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1466        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1467          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1468          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1469          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
1470    
1471    #if !defined NOINFOCHECK
1472        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
1473        if (count < 0) fprintf(outfile,        if (count < 0) fprintf(outfile,
1474          "Error %d from pcre_info()\n", count);          "Error %d from pcre_info()\n", count);
# Line 765  while (!done) Line 1486  while (!done)
1486            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
1487              get_options, old_options);              get_options, old_options);
1488          }          }
1489    #endif
1490    
1491        if (size != gotten_store) fprintf(outfile,        if (size != regex_gotten_store) fprintf(outfile,
1492          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
1493          size, gotten_store);          (int)size, (int)regex_gotten_store);
1494    
1495        fprintf(outfile, "Capturing subpattern count = %d\n", count);        fprintf(outfile, "Capturing subpattern count = %d\n", count);
1496        if (backrefmax > 0)        if (backrefmax > 0)
# Line 786  while (!done) Line 1508  while (!done)
1508            }            }
1509          }          }
1510    
1511          if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1512          if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
1513    
1514          all_options = ((real_pcre *)re)->options;
1515          if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
1516    
1517        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1518          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%s%s\n",
1519            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1520            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1521            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
1522            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
1523              ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
1524            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
1525              ((get_options & PCRE_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
1526              ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
1527            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1528            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1529            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1530            ((get_options & PCRE_UTF8) != 0)? " utf8" : "");            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1531              ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1532              ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1533              ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1534    
1535          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1536    
1537          switch (get_options & PCRE_NEWLINE_BITS)
1538            {
1539            case PCRE_NEWLINE_CR:
1540            fprintf(outfile, "Forced newline sequence: CR\n");
1541            break;
1542    
1543            case PCRE_NEWLINE_LF:
1544            fprintf(outfile, "Forced newline sequence: LF\n");
1545            break;
1546    
1547            case PCRE_NEWLINE_CRLF:
1548            fprintf(outfile, "Forced newline sequence: CRLF\n");
1549            break;
1550    
1551        if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)          case PCRE_NEWLINE_ANYCRLF:
1552          fprintf(outfile, "Case state changes\n");          fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1553            break;
1554    
1555            case PCRE_NEWLINE_ANY:
1556            fprintf(outfile, "Forced newline sequence: ANY\n");
1557            break;
1558    
1559            default:
1560            break;
1561            }
1562    
1563        if (first_char == -1)        if (first_char == -1)
1564          {          {
1565          fprintf(outfile, "First char at start or follows \\n\n");          fprintf(outfile, "First char at start or follows newline\n");
1566          }          }
1567        else if (first_char < 0)        else if (first_char < 0)
1568          {          {
# Line 814  while (!done) Line 1573  while (!done)
1573          int ch = first_char & 255;          int ch = first_char & 255;
1574          const char *caseless = ((first_char & REQ_CASELESS) == 0)?          const char *caseless = ((first_char & REQ_CASELESS) == 0)?
1575            "" : " (caseless)";            "" : " (caseless)";
1576          if (isprint(ch))          if (PRINTHEX(ch))
1577            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
1578          else          else
1579            fprintf(outfile, "First char = %d%s\n", ch, caseless);            fprintf(outfile, "First char = %d%s\n", ch, caseless);
# Line 829  while (!done) Line 1588  while (!done)
1588          int ch = need_char & 255;          int ch = need_char & 255;
1589          const char *caseless = ((need_char & REQ_CASELESS) == 0)?          const char *caseless = ((need_char & REQ_CASELESS) == 0)?
1590            "" : " (caseless)";            "" : " (caseless)";
1591          if (isprint(ch))          if (PRINTHEX(ch))
1592            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
1593          else          else
1594            fprintf(outfile, "Need char = %d%s\n", ch, caseless);            fprintf(outfile, "Need char = %d%s\n", ch, caseless);
1595          }          }
       }  
1596    
1597      /* 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
1598      help with the matching. */        value, but it varies, depending on the computer architecture, and
1599          so messes up the test suite. (And with the /F option, it might be
1600          flipped.) */
1601    
1602      if (do_study)        if (do_study)
       {  
       if (timeit)  
1603          {          {
1604          register int i;          if (extra == NULL)
1605          clock_t time_taken;            fprintf(outfile, "Study returned NULL\n");
1606          clock_t start_time = clock();          else
1607          for (i = 0; i < LOOPREPEAT; i++)            {
1608            extra = pcre_study(re, study_options, &error);            uschar *start_bits = NULL;
1609          time_taken = clock() - start_time;            new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
1610          if (extra != NULL) free(extra);  
1611          fprintf(outfile, "  Study time %.3f milliseconds\n",            if (start_bits == NULL)
1612            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /              fprintf(outfile, "No starting byte set\n");
1613              (double)CLOCKS_PER_SEC);            else
1614                {
1615                int i;
1616                int c = 24;
1617                fprintf(outfile, "Starting byte set: ");
1618                for (i = 0; i < 256; i++)
1619                  {
1620                  if ((start_bits[i/8] & (1<<(i&7))) != 0)
1621                    {
1622                    if (c > 75)
1623                      {
1624                      fprintf(outfile, "\n  ");
1625                      c = 2;
1626                      }
1627                    if (PRINTHEX(i) && i != ' ')
1628                      {
1629                      fprintf(outfile, "%c ", i);
1630                      c += 2;
1631                      }
1632                    else
1633                      {
1634                      fprintf(outfile, "\\x%02x ", i);
1635                      c += 5;
1636                      }
1637                    }
1638                  }
1639                fprintf(outfile, "\n");
1640                }
1641              }
1642          }          }
1643          }
1644    
1645        extra = pcre_study(re, study_options, &error);      /* If the '>' option was present, we write out the regex to a file, and
1646        if (error != NULL)      that is all. The first 8 bytes of the file are the regex length and then
1647          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");  
1648    
1649        else if (do_showinfo)      if (to_file != NULL)
1650          {
1651          FILE *f = fopen((char *)to_file, "wb");
1652          if (f == NULL)
1653          {          {
1654          size_t size;          fprintf(outfile, "Unable to open %s: %s\n", to_file, strerror(errno));
1655          uschar *start_bits = NULL;          }
1656          new_info(re, extra, PCRE_INFO_STUDYSIZE, &size);        else
1657          new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);          {
1658          fprintf(outfile, "Study size = %d\n", size);          uschar sbuf[8];
1659          if (start_bits == NULL)          sbuf[0] = (uschar)((true_size >> 24) & 255);
1660            fprintf(outfile, "No starting character set\n");          sbuf[1] = (uschar)((true_size >> 16) & 255);
1661            sbuf[2] = (uschar)((true_size >>  8) & 255);
1662            sbuf[3] = (uschar)((true_size) & 255);
1663    
1664            sbuf[4] = (uschar)((true_study_size >> 24) & 255);
1665            sbuf[5] = (uschar)((true_study_size >> 16) & 255);
1666            sbuf[6] = (uschar)((true_study_size >>  8) & 255);
1667            sbuf[7] = (uschar)((true_study_size) & 255);
1668    
1669            if (fwrite(sbuf, 1, 8, f) < 8 ||
1670                fwrite(re, 1, true_size, f) < true_size)
1671              {
1672              fprintf(outfile, "Write error on %s: %s\n", to_file, strerror(errno));
1673              }
1674          else          else
1675            {            {
1676            int i;            fprintf(outfile, "Compiled regex written to %s\n", to_file);
1677            int c = 24;            if (extra != NULL)
           fprintf(outfile, "Starting character set: ");  
           for (i = 0; i < 256; i++)  
1678              {              {
1679              if ((start_bits[i/8] & (1<<(i%8))) != 0)              if (fwrite(extra->study_data, 1, true_study_size, f) <
1680                    true_study_size)
1681                {                {
1682                if (c > 75)                fprintf(outfile, "Write error on %s: %s\n", to_file,
1683                  {                  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;  
                 }  
1684                }                }
1685                else fprintf(outfile, "Study data written to %s\n", to_file);
1686    
1687              }              }
           fprintf(outfile, "\n");  
1688            }            }
1689            fclose(f);
1690          }          }
1691    
1692          new_free(re);
1693          if (extra != NULL) new_free(extra);
1694          if (tables != NULL) new_free((void *)tables);
1695          continue;  /* With next regex */
1696        }        }
1697      }      }        /* End of non-POSIX compile */
1698    
1699    /* Read data lines and test them */    /* Read data lines and test them */
1700    
1701    for (;;)    for (;;)
1702      {      {
1703      unsigned char *q;      uschar *q;
1704      unsigned char *bptr = dbuffer;      uschar *bptr;
1705      int *use_offsets = offsets;      int *use_offsets = offsets;
1706      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1707      int callout_data = 0;      int callout_data = 0;
# Line 920  while (!done) Line 1714  while (!done)
1714      int gmatched = 0;      int gmatched = 0;
1715      int start_offset = 0;      int start_offset = 0;
1716      int g_notempty = 0;      int g_notempty = 0;
1717        int use_dfa = 0;
1718    
1719      options = 0;      options = 0;
1720    
1721        *copynames = 0;
1722        *getnames = 0;
1723    
1724        copynamesptr = copynames;
1725        getnamesptr = getnames;
1726    
1727      pcre_callout = callout;      pcre_callout = callout;
1728      first_callout = 1;      first_callout = 1;
1729      callout_extra = 0;      callout_extra = 0;
1730      callout_count = 0;      callout_count = 0;
1731      callout_fail_count = 999999;      callout_fail_count = 999999;
1732      callout_fail_id = -1;      callout_fail_id = -1;
1733        show_malloc = 0;
1734    
1735        if (extra != NULL) extra->flags &=
1736          ~(PCRE_EXTRA_MATCH_LIMIT|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
1737    
1738      if (infile == stdin) printf("data> ");      len = 0;
1739      if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)      for (;;)
1740        {        {
1741        done = 1;        if (extend_inputline(infile, buffer + len, "data> ") == NULL)
1742        goto CONTINUE;          {
1743            if (len > 0) break;
1744            done = 1;
1745            goto CONTINUE;
1746            }
1747          if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1748          len = (int)strlen((char *)buffer);
1749          if (buffer[len-1] == '\n') break;
1750        }        }
     if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);  
1751    
     len = (int)strlen((char *)buffer);  
1752      while (len > 0 && isspace(buffer[len-1])) len--;      while (len > 0 && isspace(buffer[len-1])) len--;
1753      buffer[len] = 0;      buffer[len] = 0;
1754      if (len == 0) break;      if (len == 0) break;
# Line 946  while (!done) Line 1756  while (!done)
1756      p = buffer;      p = buffer;
1757      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1758    
1759      q = dbuffer;      bptr = q = dbuffer;
1760      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1761        {        {
1762        int i = 0;        int i = 0;
# Line 968  while (!done) Line 1778  while (!done)
1778          c -= '0';          c -= '0';
1779          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
1780            c = c * 8 + *p++ - '0';            c = c * 8 + *p++ - '0';
1781    
1782    #if !defined NOUTF8
1783            if (use_utf8 && c > 255)
1784              {
1785              unsigned char buff8[8];
1786              int ii, utn;
1787              utn = ord2utf8(c, buff8);
1788              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1789              c = buff8[ii];   /* Last byte */
1790              }
1791    #endif
1792          break;          break;
1793    
1794          case 'x':          case 'x':
1795    
1796          /* Handle \x{..} specially - new Perl thing for utf8 */          /* Handle \x{..} specially - new Perl thing for utf8 */
1797    
1798    #if !defined NOUTF8
1799          if (*p == '{')          if (*p == '{')
1800            {            {
1801            unsigned char *pt = p;            unsigned char *pt = p;
# Line 984  while (!done) Line 1806  while (!done)
1806              {              {
1807              unsigned char buff8[8];              unsigned char buff8[8];
1808              int ii, utn;              int ii, utn;
1809              utn = ord2utf8(c, buff8);              if (use_utf8)
1810              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                {
1811              c = buff8[ii];   /* Last byte */                utn = ord2utf8(c, buff8);
1812                  for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1813                  c = buff8[ii];   /* Last byte */
1814                  }
1815                else
1816                 {
1817                 if (c > 255)
1818                   fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
1819                     "UTF-8 mode is not enabled.\n"
1820                     "** Truncation will probably give the wrong result.\n", c);
1821                 }
1822              p = pt + 1;              p = pt + 1;
1823              break;              break;
1824              }              }
1825            /* Not correct form; fall through */            /* Not correct form; fall through */
1826            }            }
1827    #endif
1828    
1829          /* Ordinary \x */          /* Ordinary \x */
1830    
# Line 1003  while (!done) Line 1836  while (!done)
1836            }            }
1837          break;          break;
1838    
1839          case 0:   /* Allows for an empty line */          case 0:   /* \ followed by EOF allows for an empty line */
1840          p--;          p--;
1841          continue;          continue;
1842    
1843            case '>':
1844            while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0';
1845            continue;
1846    
1847          case 'A':  /* Option setting */          case 'A':  /* Option setting */
1848          options |= PCRE_ANCHORED;          options |= PCRE_ANCHORED;
1849          continue;          continue;
# Line 1023  while (!done) Line 1860  while (!done)
1860            }            }
1861          else if (isalnum(*p))          else if (isalnum(*p))
1862            {            {
1863            uschar name[256];            uschar *npp = copynamesptr;
           uschar *npp = name;  
1864            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1865              *npp++ = 0;
1866            *npp = 0;            *npp = 0;
1867            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)copynamesptr);
1868            if (n < 0)            if (n < 0)
1869              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
1870            else copystrings |= 1 << n;            copynamesptr = npp;
1871            }            }
1872          else if (*p == '+')          else if (*p == '+')
1873            {            {
# Line 1068  while (!done) Line 1905  while (!done)
1905            }            }
1906          continue;          continue;
1907    
1908    #if !defined NODFA
1909            case 'D':
1910    #if !defined NOPOSIX
1911            if (posix || do_posix)
1912              printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");
1913            else
1914    #endif
1915              use_dfa = 1;
1916            continue;
1917    
1918            case 'F':
1919            options |= PCRE_DFA_SHORTEST;
1920            continue;
1921    #endif
1922    
1923          case 'G':          case 'G':
1924          if (isdigit(*p))          if (isdigit(*p))
1925            {            {
# Line 1076  while (!done) Line 1928  while (!done)
1928            }            }
1929          else if (isalnum(*p))          else if (isalnum(*p))
1930            {            {
1931            uschar name[256];            uschar *npp = getnamesptr;
           uschar *npp = name;  
1932            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1933              *npp++ = 0;
1934            *npp = 0;            *npp = 0;
1935            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)getnamesptr);
1936            if (n < 0)            if (n < 0)
1937              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
1938            else getstrings |= 1 << n;            getnamesptr = npp;
1939            }            }
1940          continue;          continue;
1941    
# Line 1105  while (!done) Line 1957  while (!done)
1957            {            {
1958            size_offsets_max = n;            size_offsets_max = n;
1959            free(offsets);            free(offsets);
1960            use_offsets = offsets = malloc(size_offsets_max * sizeof(int));            use_offsets = offsets = (int *)malloc(size_offsets_max * sizeof(int));
1961            if (offsets == NULL)            if (offsets == NULL)
1962              {              {
1963              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
1964                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
1965              return 1;              yield = 1;
1966                goto EXIT;
1967              }              }
1968            }            }
1969          use_size_offsets = n;          use_size_offsets = n;
1970          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 */
1971          continue;          continue;
1972    
1973            case 'P':
1974            options |= PCRE_PARTIAL;
1975            continue;
1976    
1977            case 'Q':
1978            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1979            if (extra == NULL)
1980              {
1981              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1982              extra->flags = 0;
1983              }
1984            extra->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
1985            extra->match_limit_recursion = n;
1986            continue;
1987    
1988            case 'q':
1989            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1990            if (extra == NULL)
1991              {
1992              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1993              extra->flags = 0;
1994              }
1995            extra->flags |= PCRE_EXTRA_MATCH_LIMIT;
1996            extra->match_limit = n;
1997            continue;
1998    
1999    #if !defined NODFA
2000            case 'R':
2001            options |= PCRE_DFA_RESTART;
2002            continue;
2003    #endif
2004    
2005            case 'S':
2006            show_malloc = 1;
2007            continue;
2008    
2009          case 'Z':          case 'Z':
2010          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
2011          continue;          continue;
2012    
2013            case '?':
2014            options |= PCRE_NO_UTF8_CHECK;
2015            continue;
2016    
2017            case '<':
2018              {
2019              int x = check_newline(p, outfile);
2020              if (x == 0) goto NEXT_DATA;
2021              options |= x;
2022              while (*p++ != '>');
2023              }
2024            continue;
2025          }          }
2026        *q++ = c;        *q++ = c;
2027        }        }
2028      *q = 0;      *q = 0;
2029      len = q - dbuffer;      len = q - dbuffer;
2030    
2031        /* Move the data to the end of the buffer so that a read over the end of
2032        the buffer will be seen by valgrind, even if it doesn't cause a crash. */
2033    
2034        memmove(bptr + buffer_size - len, bptr, len);
2035        bptr += buffer_size - len;
2036    
2037        if ((all_use_dfa || use_dfa) && find_match_limit)
2038          {
2039          printf("**Match limit not relevant for DFA matching: ignored\n");
2040          find_match_limit = 0;
2041          }
2042    
2043      /* Handle matching via the POSIX interface, which does not      /* Handle matching via the POSIX interface, which does not
2044      support timing or playing with the match limit or callout data. */      support timing or playing with the match limit or callout data. */
# Line 1136  while (!done) Line 2050  while (!done)
2050        int eflags = 0;        int eflags = 0;
2051        regmatch_t *pmatch = NULL;        regmatch_t *pmatch = NULL;
2052        if (use_size_offsets > 0)        if (use_size_offsets > 0)
2053          pmatch = malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
2054        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
2055        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
2056    
# Line 1144  while (!done) Line 2058  while (!done)
2058    
2059        if (rc != 0)        if (rc != 0)
2060          {          {
2061          (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);          (void)regerror(rc, &preg, (char *)buffer, buffer_size);
2062          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
2063          }          }
2064          else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)
2065                  != 0)
2066            {
2067            fprintf(outfile, "Matched with REG_NOSUB\n");
2068            }
2069        else        else
2070          {          {
2071          size_t i;          size_t i;
# Line 1178  while (!done) Line 2097  while (!done)
2097    
2098      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
2099        {        {
2100        if (timeit)        if (timeitm > 0)
2101          {          {
2102          register int i;          register int i;
2103          clock_t time_taken;          clock_t time_taken;
2104          clock_t start_time = clock();          clock_t start_time = clock();
2105          for (i = 0; i < LOOPREPEAT; i++)  
2106    #if !defined NODFA
2107            if (all_use_dfa || use_dfa)
2108              {
2109              int workspace[1000];
2110              for (i = 0; i < timeitm; i++)
2111                count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
2112                  options | g_notempty, use_offsets, use_size_offsets, workspace,
2113                  sizeof(workspace)/sizeof(int));
2114              }
2115            else
2116    #endif
2117    
2118            for (i = 0; i < timeitm; i++)
2119            count = pcre_exec(re, extra, (char *)bptr, len,            count = pcre_exec(re, extra, (char *)bptr, len,
2120              start_offset, options | g_notempty, use_offsets, use_size_offsets);              start_offset, options | g_notempty, use_offsets, use_size_offsets);
2121    
2122          time_taken = clock() - start_time;          time_taken = clock() - start_time;
2123          fprintf(outfile, "Execute time %.3f milliseconds\n",          fprintf(outfile, "Execute time %.4f milliseconds\n",
2124            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeitm) /
2125              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
2126          }          }
2127    
2128        /* 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
2129        varying limits in order to find the minimum value. */        varying limits in order to find the minimum value for the match limit and
2130          for the recursion limit. */
2131    
2132        if (find_match_limit)        if (find_match_limit)
2133          {          {
         int min = 0;  
         int mid = 64;  
         int max = -1;  
   
2134          if (extra == NULL)          if (extra == NULL)
2135            {            {
2136            extra = malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2137            extra->flags = 0;            extra->flags = 0;
2138            }            }
         extra->flags |= PCRE_EXTRA_MATCH_LIMIT;  
   
         for (;;)  
           {  
           extra->match_limit = mid;  
           count = pcre_exec(re, extra, (char *)bptr, len, start_offset,  
             options | g_notempty, use_offsets, use_size_offsets);  
           if (count == PCRE_ERROR_MATCHLIMIT)  
             {  
             /* fprintf(outfile, "Testing match limit = %d\n", mid); */  
             min = mid;  
             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 */  
           }  
2139    
2140          extra->flags &= ~PCRE_EXTRA_MATCH_LIMIT;          (void)check_match_limit(re, extra, bptr, len, start_offset,
2141              options|g_notempty, use_offsets, use_size_offsets,
2142              PCRE_EXTRA_MATCH_LIMIT, &(extra->match_limit),
2143              PCRE_ERROR_MATCHLIMIT, "match()");
2144    
2145            count = check_match_limit(re, extra, bptr, len, start_offset,
2146              options|g_notempty, use_offsets, use_size_offsets,
2147              PCRE_EXTRA_MATCH_LIMIT_RECURSION, &(extra->match_limit_recursion),
2148              PCRE_ERROR_RECURSIONLIMIT, "match() recursion");
2149          }          }
2150    
2151        /* If callout_data is set, use the interface with additional data */        /* If callout_data is set, use the interface with additional data */
# Line 1242  while (!done) Line 2154  while (!done)
2154          {          {
2155          if (extra == NULL)          if (extra == NULL)
2156            {            {
2157            extra = malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2158            extra->flags = 0;            extra->flags = 0;
2159            }            }
2160          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;
2161          extra->callout_data = (void *)callout_data;          extra->callout_data = &callout_data;
2162          count = pcre_exec(re, extra, (char *)bptr, len, start_offset,          count = pcre_exec(re, extra, (char *)bptr, len, start_offset,
2163            options | g_notempty, use_offsets, use_size_offsets);            options | g_notempty, use_offsets, use_size_offsets);
2164          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;
# Line 1255  while (!done) Line 2167  while (!done)
2167        /* 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
2168        value of match_limit. */        value of match_limit. */
2169    
2170        else count = pcre_exec(re, extra, (char *)bptr, len,  #if !defined NODFA
2171          start_offset, options | g_notempty, use_offsets, use_size_offsets);        else if (all_use_dfa || use_dfa)
2172            {
2173            int workspace[1000];
2174            count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
2175              options | g_notempty, use_offsets, use_size_offsets, workspace,
2176              sizeof(workspace)/sizeof(int));
2177            if (count == 0)
2178              {
2179              fprintf(outfile, "Matched, but too many subsidiary matches\n");
2180              count = use_size_offsets/2;
2181              }
2182            }
2183    #endif
2184    
2185        if (count == 0)        else
2186          {          {
2187          fprintf(outfile, "Matched, but too many substrings\n");          count = pcre_exec(re, extra, (char *)bptr, len,
2188          count = use_size_offsets/3;            start_offset, options | g_notempty, use_offsets, use_size_offsets);
2189            if (count == 0)
2190              {
2191              fprintf(outfile, "Matched, but too many substrings\n");
2192              count = use_size_offsets/3;
2193              }
2194          }          }
2195    
2196        /* Matched */        /* Matched */
2197    
2198        if (count >= 0)        if (count >= 0)
2199          {          {
2200          int i;          int i, maxcount;
2201    
2202    #if !defined NODFA
2203            if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
2204    #endif
2205              maxcount = use_size_offsets/3;
2206    
2207            /* This is a check against a lunatic return value. */
2208    
2209            if (count > maxcount)
2210              {
2211              fprintf(outfile,
2212                "** PCRE error: returned count %d is too big for offset size %d\n",
2213                count, use_size_offsets);
2214              count = use_size_offsets/3;
2215              if (do_g || do_G)
2216                {
2217                fprintf(outfile, "** /%c loop abandoned\n", do_g? 'g' : 'G');
2218                do_g = do_G = FALSE;        /* Break g/G loop */
2219                }
2220              }
2221    
2222          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
2223            {            {
2224            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
# Line 1296  while (!done) Line 2246  while (!done)
2246            {            {
2247            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
2248              {              {
2249              char copybuffer[16];              char copybuffer[256];
2250              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,
2251                i, copybuffer, sizeof(copybuffer));                i, copybuffer, sizeof(copybuffer));
2252              if (rc < 0)              if (rc < 0)
# Line 1306  while (!done) Line 2256  while (!done)
2256              }              }
2257            }            }
2258    
2259            for (copynamesptr = copynames;
2260                 *copynamesptr != 0;
2261                 copynamesptr += (int)strlen((char*)copynamesptr) + 1)
2262              {
2263              char copybuffer[256];
2264              int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
2265                count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));
2266              if (rc < 0)
2267                fprintf(outfile, "copy substring %s failed %d\n", copynamesptr, rc);
2268              else
2269                fprintf(outfile, "  C %s (%d) %s\n", copybuffer, rc, copynamesptr);
2270              }
2271    
2272          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2273            {            {
2274            if ((getstrings & (1 << i)) != 0)            if ((getstrings & (1 << i)) != 0)
# Line 1318  while (!done) Line 2281  while (!done)
2281              else              else
2282                {                {
2283                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
               /* free((void *)substring); */  
2284                pcre_free_substring(substring);                pcre_free_substring(substring);
2285                }                }
2286              }              }
2287            }            }
2288    
2289            for (getnamesptr = getnames;
2290                 *getnamesptr != 0;
2291                 getnamesptr += (int)strlen((char*)getnamesptr) + 1)
2292              {
2293              const char *substring;
2294              int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
2295                count, (char *)getnamesptr, &substring);
2296              if (rc < 0)
2297                fprintf(outfile, "copy substring %s failed %d\n", getnamesptr, rc);
2298              else
2299                {
2300                fprintf(outfile, "  G %s (%d) %s\n", substring, rc, getnamesptr);
2301                pcre_free_substring(substring);
2302                }
2303              }
2304    
2305          if (getlist)          if (getlist)
2306            {            {
2307            const char **stringlist;            const char **stringlist;
# Line 1343  while (!done) Line 2321  while (!done)
2321            }            }
2322          }          }
2323    
2324          /* There was a partial match */
2325    
2326          else if (count == PCRE_ERROR_PARTIAL)
2327            {
2328            fprintf(outfile, "Partial match");
2329    #if !defined NODFA
2330            if ((all_use_dfa || use_dfa) && use_size_offsets > 2)
2331              fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],
2332                bptr + use_offsets[0]);
2333    #endif
2334            fprintf(outfile, "\n");
2335            break;  /* Out of the /g loop */
2336            }
2337    
2338        /* 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
2339        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
2340        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
2341        values to achieve this. We won't be at the end of the string - that        string - that was checked before setting g_notempty.
2342        was checked before setting g_notempty. */  
2343          Complication arises in the case when the newline option is "any" or
2344          "anycrlf". If the previous match was at the end of a line terminated by
2345          CRLF, an advance of one character just passes the \r, whereas we should
2346          prefer the longer newline sequence, as does the code in pcre_exec().
2347          Fudge the offset value to achieve this.
2348    
2349          Otherwise, in the case of UTF-8 matching, the advance must be one
2350          character, not one byte. */
2351    
2352        else        else
2353          {          {
2354          if (g_notempty != 0)          if (g_notempty != 0)
2355            {            {
2356              int onechar = 1;
2357              unsigned int obits = ((real_pcre *)re)->options;
2358            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2359            use_offsets[1] = start_offset + 1;            if ((obits & PCRE_NEWLINE_BITS) == 0)
2360                {
2361                int d;
2362                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2363                obits = (d == '\r')? PCRE_NEWLINE_CR :
2364                        (d == '\n')? PCRE_NEWLINE_LF :
2365                        (d == ('\r'<<8 | '\n'))? PCRE_NEWLINE_CRLF :
2366                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2367                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2368                }
2369              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2370                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2371                  &&
2372                  start_offset < len - 1 &&
2373                  bptr[start_offset] == '\r' &&
2374                  bptr[start_offset+1] == '\n')
2375                onechar++;
2376              else if (use_utf8)
2377                {
2378                while (start_offset + onechar < len)
2379                  {
2380                  int tb = bptr[start_offset+onechar];
2381                  if (tb <= 127) break;
2382                  tb &= 0xc0;
2383                  if (tb != 0 && tb != 0xc0) onechar++;
2384                  }
2385                }
2386              use_offsets[1] = start_offset + onechar;
2387            }            }
2388          else          else
2389            {            {
2390            if (gmatched == 0)   /* Error if no previous matches */            if (count == PCRE_ERROR_NOMATCH)
2391              {              {
2392              if (count == -1) fprintf(outfile, "No match\n");              if (gmatched == 0) fprintf(outfile, "No match\n");
               else fprintf(outfile, "Error %d\n", count);  
2393              }              }
2394              else fprintf(outfile, "Error %d\n", count);
2395            break;  /* Out of the /g loop */            break;  /* Out of the /g loop */
2396            }            }
2397          }          }
# Line 1379  while (!done) Line 2408  while (!done)
2408        character. */        character. */
2409    
2410        g_notempty = 0;        g_notempty = 0;
2411    
2412        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2413          {          {
2414          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
# Line 1397  while (!done) Line 2427  while (!done)
2427          len -= use_offsets[1];          len -= use_offsets[1];
2428          }          }
2429        }  /* End of loop for /g and /G */        }  /* End of loop for /g and /G */
2430    
2431        NEXT_DATA: continue;
2432      }    /* End of loop for data lines */      }    /* End of loop for data lines */
2433    
2434    CONTINUE:    CONTINUE:
# Line 1405  while (!done) Line 2437  while (!done)
2437    if (posix || do_posix) regfree(&preg);    if (posix || do_posix) regfree(&preg);
2438  #endif  #endif
2439    
2440    if (re != NULL) free(re);    if (re != NULL) new_free(re);
2441    if (extra != NULL) free(extra);    if (extra != NULL) new_free(extra);
2442    if (tables != NULL)    if (tables != NULL)
2443      {      {
2444      free((void *)tables);      new_free((void *)tables);
2445      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
2446        locale_set = 0;
2447      }      }
2448    }    }
2449    
2450  fprintf(outfile, "\n");  if (infile == stdin) fprintf(outfile, "\n");
2451  return 0;  
2452    EXIT:
2453    
2454    if (infile != NULL && infile != stdin) fclose(infile);
2455    if (outfile != NULL && outfile != stdout) fclose(outfile);
2456    
2457    free(buffer);
2458    free(dbuffer);
2459    free(pbuffer);
2460    free(offsets);
2461    
2462    return yield;
2463  }  }
2464    
2465  /* End */  /* End of pcretest.c */

Legend:
Removed from v.69  
changed lines
  Added in v.361

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12