/[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 77 by nigel, Sat Feb 24 21:40:45 2007 UTC revision 231 by ph10, Tue Sep 11 11:15:33 2007 UTC
# Line 36  POSSIBILITY OF SUCH DAMAGE. Line 36  POSSIBILITY OF SUCH DAMAGE.
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>
45  #include <string.h>  #include <string.h>
# Line 44  POSSIBILITY OF SUCH DAMAGE. Line 48  POSSIBILITY OF SUCH DAMAGE.
48  #include <locale.h>  #include <locale.h>
49  #include <errno.h>  #include <errno.h>
50    
 #define PCRE_SPY        /* For Win32 build, import data, not export */  
51    
52  /* We need the internal info for displaying the results of pcre_study() and  /* A number of things vary for Windows builds. Originally, pcretest opened its
53  other internal data; pcretest also uses some of the fixed tables, and generally  input and output without "b"; then I was told that "b" was needed in some
54  has "inside information" compared to a program that strictly follows the PCRE  environments, so it was added for release 5.0 to both the input and output. (It
55  API. */  makes no difference on Unix-like systems.) Later I was told that it is wrong
56    for the input on Windows. I've now abstracted the modes into two macros that
57    are set here, to make it easier to fiddle with them, and removed "b" from the
58    input mode under Windows. */
59    
60    #if defined(_WIN32) || defined(WIN32)
61    #include <io.h>                /* For _setmode() */
62    #include <fcntl.h>             /* For _O_BINARY */
63    #define INPUT_MODE   "r"
64    #define OUTPUT_MODE  "wb"
65    
66    #else
67    #include <sys/time.h>          /* These two includes are needed */
68    #include <sys/resource.h>      /* for setrlimit(). */
69    #define INPUT_MODE   "rb"
70    #define OUTPUT_MODE  "wb"
71    #endif
72    
73    
74    /* We have to include pcre_internal.h because we need the internal info for
75    displaying the results of pcre_study() and we also need to know about the
76    internal macros, structures, and other internal data values; pcretest has
77    "inside information" compared to a program that strictly follows the PCRE API.
78    
79    Although pcre_internal.h does itself include pcre.h, we explicitly include it
80    here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
81    appropriately for an application, not for building PCRE. */
82    
83    #include "pcre.h"
84  #include "pcre_internal.h"  #include "pcre_internal.h"
85    
86    /* We need access to the data tables that PCRE uses. So as not to have to keep
87    two copies, we include the source file here, changing the names of the external
88    symbols to prevent clashes. */
89    
90    #define _pcre_utf8_table1      utf8_table1
91    #define _pcre_utf8_table1_size utf8_table1_size
92    #define _pcre_utf8_table2      utf8_table2
93    #define _pcre_utf8_table3      utf8_table3
94    #define _pcre_utf8_table4      utf8_table4
95    #define _pcre_utt              utt
96    #define _pcre_utt_size         utt_size
97    #define _pcre_OP_lengths       OP_lengths
98    
99    #include "pcre_tables.c"
100    
101    /* We also need the pcre_printint() function for printing out compiled
102    patterns. This function is in a separate file so that it can be included in
103    pcre_compile.c when that module is compiled with debugging enabled.
104    
105    The definition of the macro PRINTABLE, which determines whether to print an
106    output character as-is or as a hex value when showing compiled patterns, is
107    contained in this file. We uses it here also, in cases when the locale has not
108    been explicitly changed, so as to get consistent output from systems that
109    differ in their output from isprint() even in the "C" locale. */
110    
111    #include "pcre_printint.src"
112    
113    #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
114    
115    
116  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
117  testing the POSIX interface, though this is not available via the standard  testing the POSIX interface, though this is not available via the standard
# Line 62  Makefile. */ Line 121  Makefile. */
121  #include "pcreposix.h"  #include "pcreposix.h"
122  #endif  #endif
123    
124    /* It is also possible, for the benefit of the version currently imported into
125    Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
126    interface to the DFA matcher (NODFA), and without the doublecheck of the old
127    "info" function (define NOINFOCHECK). In fact, we automatically cut out the
128    UTF8 support if PCRE is built without it. */
129    
130    #ifndef SUPPORT_UTF8
131    #ifndef NOUTF8
132    #define NOUTF8
133    #endif
134    #endif
135    
136    
137    /* Other parameters */
138    
139  #ifndef CLOCKS_PER_SEC  #ifndef CLOCKS_PER_SEC
140  #ifdef CLK_TCK  #ifdef CLK_TCK
141  #define CLOCKS_PER_SEC CLK_TCK  #define CLOCKS_PER_SEC CLK_TCK
# Line 70  Makefile. */ Line 144  Makefile. */
144  #endif  #endif
145  #endif  #endif
146    
147  #define LOOPREPEAT 500000  /* This is the default loop count for timing. */
148    
149  #define BUFFER_SIZE 30000  #define LOOPREPEAT 500000
 #define PBUFFER_SIZE BUFFER_SIZE  
 #define DBUFFER_SIZE BUFFER_SIZE  
150    
151    /* Static variables */
152    
153  static FILE *outfile;  static FILE *outfile;
154  static int log_store = 0;  static int log_store = 0;
# Line 83  static int callout_count; Line 156  static int callout_count;
156  static int callout_extra;  static int callout_extra;
157  static int callout_fail_count;  static int callout_fail_count;
158  static int callout_fail_id;  static int callout_fail_id;
159    static int debug_lengths;
160  static int first_callout;  static int first_callout;
161    static int locale_set = 0;
162  static int show_malloc;  static int show_malloc;
163  static int use_utf8;  static int use_utf8;
164  static size_t gotten_store;  static size_t gotten_store;
165    
166    /* The buffers grow automatically if very long input lines are encountered. */
167    
168    static int buffer_size = 50000;
169    static uschar *buffer = NULL;
170    static uschar *dbuffer = NULL;
171  static uschar *pbuffer = NULL;  static uschar *pbuffer = NULL;
172    
173    
174    
175  /*************************************************  /*************************************************
176    *        Read or extend an input line            *
177    *************************************************/
178    
179    /* Input lines are read into buffer, but both patterns and data lines can be
180    continued over multiple input lines. In addition, if the buffer fills up, we
181    want to automatically expand it so as to be able to handle extremely large
182    lines that are needed for certain stress tests. When the input buffer is
183    expanded, the other two buffers must also be expanded likewise, and the
184    contents of pbuffer, which are a copy of the input for callouts, must be
185    preserved (for when expansion happens for a data line). This is not the most
186    optimal way of handling this, but hey, this is just a test program!
187    
188    Arguments:
189      f            the file to read
190      start        where in buffer to start (this *must* be within buffer)
191    
192    Returns:       pointer to the start of new data
193                   could be a copy of start, or could be moved
194                   NULL if no data read and EOF reached
195    */
196    
197    static uschar *
198    extend_inputline(FILE *f, uschar *start)
199    {
200    uschar *here = start;
201    
202    for (;;)
203      {
204      int rlen = buffer_size - (here - buffer);
205    
206      if (rlen > 1000)
207        {
208        int dlen;
209        if (fgets((char *)here, rlen,  f) == NULL)
210          return (here == start)? NULL : start;
211        dlen = (int)strlen((char *)here);
212        if (dlen > 0 && here[dlen - 1] == '\n') return start;
213        here += dlen;
214        }
215    
216      else
217        {
218        int new_buffer_size = 2*buffer_size;
219        uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);
220        uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);
221        uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);
222    
223        if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
224          {
225          fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
226          exit(1);
227          }
228    
229        memcpy(new_buffer, buffer, buffer_size);
230        memcpy(new_pbuffer, pbuffer, buffer_size);
231    
232        buffer_size = new_buffer_size;
233    
234        start = new_buffer + (start - buffer);
235        here = new_buffer + (here - buffer);
236    
237        free(buffer);
238        free(dbuffer);
239        free(pbuffer);
240    
241        buffer = new_buffer;
242        dbuffer = new_dbuffer;
243        pbuffer = new_pbuffer;
244        }
245      }
246    
247    return NULL;  /* Control never gets here */
248    }
249    
250    
251    
252    
253    
254    
255    
256    /*************************************************
257  *          Read number from string               *  *          Read number from string               *
258  *************************************************/  *************************************************/
259    
260  /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess  /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess
261  around with conditional compilation, just do the job by hand. It is only used  around with conditional compilation, just do the job by hand. It is only used
262  for unpicking the -o argument, so just keep it simple.  for unpicking arguments, so just keep it simple.
263    
264  Arguments:  Arguments:
265    str           string to be converted    str           string to be converted
# Line 128  return(result); Line 289  return(result);
289  and returns the value of the character.  and returns the value of the character.
290    
291  Argument:  Argument:
292    buffer   a pointer to the byte vector    utf8bytes   a pointer to the byte vector
293    vptr     a pointer to an int to receive the value    vptr        a pointer to an int to receive the value
294    
295  Returns:   >  0 => the number of bytes consumed  Returns:      >  0 => the number of bytes consumed
296             -6 to 0 => malformed UTF-8 character at offset = (-return)                -6 to 0 => malformed UTF-8 character at offset = (-return)
297  */  */
298    
299    #if !defined NOUTF8
300    
301  static int  static int
302  utf82ord(unsigned char *buffer, int *vptr)  utf82ord(unsigned char *utf8bytes, int *vptr)
303  {  {
304  int c = *buffer++;  int c = *utf8bytes++;
305  int d = c;  int d = c;
306  int i, j, s;  int i, j, s;
307    
# Line 154  if (i == 0 || i == 6) return 0;        / Line 317  if (i == 0 || i == 6) return 0;        /
317  /* i now has a value in the range 1-5 */  /* i now has a value in the range 1-5 */
318    
319  s = 6*i;  s = 6*i;
320  d = (c & _pcre_utf8_table3[i]) << s;  d = (c & utf8_table3[i]) << s;
321    
322  for (j = 0; j < i; j++)  for (j = 0; j < i; j++)
323    {    {
324    c = *buffer++;    c = *utf8bytes++;
325    if ((c & 0xc0) != 0x80) return -(j+1);    if ((c & 0xc0) != 0x80) return -(j+1);
326    s -= 6;    s -= 6;
327    d |= (c & 0x3f) << s;    d |= (c & 0x3f) << s;
# Line 166  for (j = 0; j < i; j++) Line 329  for (j = 0; j < i; j++)
329    
330  /* Check that encoding was the correct unique one */  /* Check that encoding was the correct unique one */
331    
332  for (j = 0; j < _pcre_utf8_table1_size; j++)  for (j = 0; j < utf8_table1_size; j++)
333    if (d <= _pcre_utf8_table1[j]) break;    if (d <= utf8_table1[j]) break;
334  if (j != i) return -(i+1);  if (j != i) return -(i+1);
335    
336  /* Valid value */  /* Valid value */
# Line 176  if (j != i) return -(i+1); Line 339  if (j != i) return -(i+1);
339  return i+1;  return i+1;
340  }  }
341    
342    #endif
343    
344    
345    
346    /*************************************************
347    *       Convert character value to UTF-8         *
348    *************************************************/
349    
350    /* This function takes an integer value in the range 0 - 0x7fffffff
351    and encodes it as a UTF-8 character in 0 to 6 bytes.
352    
353    Arguments:
354      cvalue     the character value
355      utf8bytes  pointer to buffer for result - at least 6 bytes long
356    
357    Returns:     number of characters placed in the buffer
358    */
359    
360    #if !defined NOUTF8
361    
362    static int
363    ord2utf8(int cvalue, uschar *utf8bytes)
364    {
365    register int i, j;
366    for (i = 0; i < utf8_table1_size; i++)
367      if (cvalue <= utf8_table1[i]) break;
368    utf8bytes += i;
369    for (j = i; j > 0; j--)
370     {
371     *utf8bytes-- = 0x80 | (cvalue & 0x3f);
372     cvalue >>= 6;
373     }
374    *utf8bytes = utf8_table2[i] | cvalue;
375    return i + 1;
376    }
377    
378    #endif
379    
380    
381    
382  /*************************************************  /*************************************************
# Line 188  chars without printing. */ Line 389  chars without printing. */
389    
390  static int pchars(unsigned char *p, int length, FILE *f)  static int pchars(unsigned char *p, int length, FILE *f)
391  {  {
392  int c;  int c = 0;
393  int yield = 0;  int yield = 0;
394    
395  while (length-- > 0)  while (length-- > 0)
396    {    {
397    #if !defined NOUTF8
398    if (use_utf8)    if (use_utf8)
399      {      {
400      int rc = utf82ord(p, &c);      int rc = utf82ord(p, &c);
# Line 201  while (length-- > 0) Line 403  while (length-- > 0)
403        {        {
404        length -= rc - 1;        length -= rc - 1;
405        p += rc;        p += rc;
406        if (c < 256 && isprint(c))        if (PRINTHEX(c))
407          {          {
408          if (f != NULL) fprintf(f, "%c", c);          if (f != NULL) fprintf(f, "%c", c);
409          yield++;          yield++;
410          }          }
411        else        else
412          {          {
413          int n;          int n = 4;
414          if (f != NULL) fprintf(f, "\\x{%02x}%n", c, &n);          if (f != NULL) fprintf(f, "\\x{%02x}", c);
415          yield += n;          yield += (n <= 0x000000ff)? 2 :
416                     (n <= 0x00000fff)? 3 :
417                     (n <= 0x0000ffff)? 4 :
418                     (n <= 0x000fffff)? 5 : 6;
419          }          }
420        continue;        continue;
421        }        }
422      }      }
423    #endif
424    
425     /* Not UTF-8, or malformed UTF-8  */     /* Not UTF-8, or malformed UTF-8  */
426    
427    if (isprint(c = *(p++)))    c = *p++;
428      if (PRINTHEX(c))
429      {      {
430      if (f != NULL) fprintf(f, "%c", c);      if (f != NULL) fprintf(f, "%c", c);
431      yield++;      yield++;
# Line 392  if ((rc = pcre_fullinfo(re, study, optio Line 599  if ((rc = pcre_fullinfo(re, study, optio
599  *         Byte flipping function                 *  *         Byte flipping function                 *
600  *************************************************/  *************************************************/
601    
602  static long int  static unsigned long int
603  byteflip(long int value, int n)  byteflip(unsigned long int value, int n)
604  {  {
605  if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);  if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
606  return ((value & 0x000000ff) << 24) |  return ((value & 0x000000ff) << 24) |
# Line 406  return ((value & 0x000000ff) << 24) | Line 613  return ((value & 0x000000ff) << 24) |
613    
614    
615  /*************************************************  /*************************************************
616    *        Check match or recursion limit          *
617    *************************************************/
618    
619    static int
620    check_match_limit(pcre *re, pcre_extra *extra, uschar *bptr, int len,
621      int start_offset, int options, int *use_offsets, int use_size_offsets,
622      int flag, unsigned long int *limit, int errnumber, const char *msg)
623    {
624    int count;
625    int min = 0;
626    int mid = 64;
627    int max = -1;
628    
629    extra->flags |= flag;
630    
631    for (;;)
632      {
633      *limit = mid;
634    
635      count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options,
636        use_offsets, use_size_offsets);
637    
638      if (count == errnumber)
639        {
640        /* fprintf(outfile, "Testing %s limit = %d\n", msg, mid); */
641        min = mid;
642        mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2;
643        }
644    
645      else if (count >= 0 || count == PCRE_ERROR_NOMATCH ||
646                             count == PCRE_ERROR_PARTIAL)
647        {
648        if (mid == min + 1)
649          {
650          fprintf(outfile, "Minimum %s limit = %d\n", msg, mid);
651          break;
652          }
653        /* fprintf(outfile, "Testing %s limit = %d\n", msg, mid); */
654        max = mid;
655        mid = (min + mid)/2;
656        }
657      else break;    /* Some other error */
658      }
659    
660    extra->flags &= ~flag;
661    return count;
662    }
663    
664    
665    
666    /*************************************************
667    *         Case-independent strncmp() function    *
668    *************************************************/
669    
670    /*
671    Arguments:
672      s         first string
673      t         second string
674      n         number of characters to compare
675    
676    Returns:    < 0, = 0, or > 0, according to the comparison
677    */
678    
679    static int
680    strncmpic(uschar *s, uschar *t, int n)
681    {
682    while (n--)
683      {
684      int c = tolower(*s++) - tolower(*t++);
685      if (c) return c;
686      }
687    return 0;
688    }
689    
690    
691    
692    /*************************************************
693    *         Check newline indicator                *
694    *************************************************/
695    
696    /* This is used both at compile and run-time to check for <xxx> escapes, where
697    xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
698    no match.
699    
700    Arguments:
701      p           points after the leading '<'
702      f           file for error message
703    
704    Returns:      appropriate PCRE_NEWLINE_xxx flags, or 0
705    */
706    
707    static int
708    check_newline(uschar *p, FILE *f)
709    {
710    if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
711    if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
712    if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
713    if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
714    if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
715    if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
716    if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
717    fprintf(f, "Unknown newline type at: <%s\n", p);
718    return 0;
719    }
720    
721    
722    
723    /*************************************************
724    *             Usage function                     *
725    *************************************************/
726    
727    static void
728    usage(void)
729    {
730    printf("Usage:     pcretest [options] [<input> [<output>]]\n");
731    printf("  -b       show compiled code (bytecode)\n");
732    printf("  -C       show PCRE compile-time options and exit\n");
733    printf("  -d       debug: show compiled code and information (-b and -i)\n");
734    #if !defined NODFA
735    printf("  -dfa     force DFA matching for all subjects\n");
736    #endif
737    printf("  -help    show usage information\n");
738    printf("  -i       show information about compiled patterns\n"
739           "  -m       output memory used information\n"
740           "  -o <n>   set size of offsets vector to <n>\n");
741    #if !defined NOPOSIX
742    printf("  -p       use POSIX interface\n");
743    #endif
744    printf("  -q       quiet: do not output PCRE version number at start\n");
745    printf("  -S <n>   set stack size to <n> megabytes\n");
746    printf("  -s       output store (memory) used information\n"
747           "  -t       time compilation and execution\n");
748    printf("  -t <n>   time compilation and execution, repeating <n> times\n");
749    printf("  -tm      time execution (matching) only\n");
750    printf("  -tm <n>  time execution (matching) only, repeating <n> times\n");
751    }
752    
753    
754    
755    /*************************************************
756  *                Main Program                    *  *                Main Program                    *
757  *************************************************/  *************************************************/
758    
# Line 420  int options = 0; Line 767  int options = 0;
767  int study_options = 0;  int study_options = 0;
768  int op = 1;  int op = 1;
769  int timeit = 0;  int timeit = 0;
770    int timeitm = 0;
771  int showinfo = 0;  int showinfo = 0;
772  int showstore = 0;  int showstore = 0;
773    int quiet = 0;
774  int size_offsets = 45;  int size_offsets = 45;
775  int size_offsets_max;  int size_offsets_max;
776  int *offsets = NULL;  int *offsets = NULL;
# Line 432  int debug = 0; Line 781  int debug = 0;
781  int done = 0;  int done = 0;
782  int all_use_dfa = 0;  int all_use_dfa = 0;
783  int yield = 0;  int yield = 0;
784    int stack_size;
785    
786    /* These vectors store, end-to-end, a list of captured substring names. Assume
787    that 1024 is plenty long enough for the few names we'll be testing. */
788    
789    uschar copynames[1024];
790    uschar getnames[1024];
791    
792  unsigned char *buffer;  uschar *copynamesptr;
793  unsigned char *dbuffer;  uschar *getnamesptr;
794    
795  /* Get buffers from malloc() so that Electric Fence will check their misuse  /* Get buffers from malloc() so that Electric Fence will check their misuse
796  when I am debugging. */  when I am debugging. They grow automatically when very long lines are read. */
797    
798  buffer = (unsigned char *)malloc(BUFFER_SIZE);  buffer = (unsigned char *)malloc(buffer_size);
799  dbuffer = (unsigned char *)malloc(DBUFFER_SIZE);  dbuffer = (unsigned char *)malloc(buffer_size);
800  pbuffer = (unsigned char *)malloc(PBUFFER_SIZE);  pbuffer = (unsigned char *)malloc(buffer_size);
   
 /* The outfile variable is static so that new_malloc can use it. The _setmode()  
 stuff is some magic that I don't understand, but which apparently does good  
 things in Windows. It's related to line terminations.  */  
801    
802  #if defined(_WIN32) || defined(WIN32)  /* The outfile variable is static so that new_malloc can use it. */
 _setmode( _fileno( stdout ), 0x8000 );  
 #endif  /* defined(_WIN32) || defined(WIN32) */  
803    
804  outfile = stdout;  outfile = stdout;
805    
806    /* The following  _setmode() stuff is some Windows magic that tells its runtime
807    library to translate CRLF into a single LF character. At least, that's what
808    I've been told: never having used Windows I take this all on trust. Originally
809    it set 0x8000, but then I was advised that _O_BINARY was better. */
810    
811    #if defined(_WIN32) || defined(WIN32)
812    _setmode( _fileno( stdout ), _O_BINARY );
813    #endif
814    
815  /* Scan options */  /* Scan options */
816    
817  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
# Line 461  while (argc > 1 && argv[op][0] == '-') Line 820  while (argc > 1 && argv[op][0] == '-')
820    
821    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
822      showstore = 1;      showstore = 1;
823    else if (strcmp(argv[op], "-t") == 0) timeit = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
824      else if (strcmp(argv[op], "-b") == 0) debug = 1;
825    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
826    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
827    #if !defined NODFA
828    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
829    #endif
830    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
831        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),
832          *endptr == 0))          *endptr == 0))
# Line 472  while (argc > 1 && argv[op][0] == '-') Line 834  while (argc > 1 && argv[op][0] == '-')
834      op++;      op++;
835      argc--;      argc--;
836      }      }
837      else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
838        {
839        int both = argv[op][2] == 0;
840        int temp;
841        if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
842                         *endptr == 0))
843          {
844          timeitm = temp;
845          op++;
846          argc--;
847          }
848        else timeitm = LOOPREPEAT;
849        if (both) timeit = timeitm;
850        }
851      else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
852          ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
853            *endptr == 0))
854        {
855    #if defined(_WIN32) || defined(WIN32)
856        printf("PCRE: -S not supported on this OS\n");
857        exit(1);
858    #else
859        int rc;
860        struct rlimit rlim;
861        getrlimit(RLIMIT_STACK, &rlim);
862        rlim.rlim_cur = stack_size * 1024 * 1024;
863        rc = setrlimit(RLIMIT_STACK, &rlim);
864        if (rc != 0)
865          {
866        printf("PCRE: setrlimit() failed with error %d\n", rc);
867        exit(1);
868          }
869        op++;
870        argc--;
871    #endif
872        }
873  #if !defined NOPOSIX  #if !defined NOPOSIX
874    else if (strcmp(argv[op], "-p") == 0) posix = 1;    else if (strcmp(argv[op], "-p") == 0) posix = 1;
875  #endif  #endif
# Line 485  while (argc > 1 && argv[op][0] == '-') Line 883  while (argc > 1 && argv[op][0] == '-')
883      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
884      printf("  %sUnicode properties support\n", rc? "" : "No ");      printf("  %sUnicode properties support\n", rc? "" : "No ");
885      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
886      printf("  Newline character is %s\n", (rc == '\r')? "CR" : "LF");      printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :
887          (rc == '\n')? "LF" : (rc == ('\r'<<8 | '\n'))? "CRLF" :
888          (rc == -2)? "ANYCRLF" :
889          (rc == -1)? "ANY" : "???");
890        (void)pcre_config(PCRE_CONFIG_BSR, &rc);
891        printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
892                                         "all Unicode newlines");
893      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
894      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
895      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
896      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
897      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
898      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %d\n", rc);
899        (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);
900        printf("  Default recursion depth limit = %d\n", rc);
901      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
902      printf("  Match recursion uses %s\n", rc? "stack" : "heap");      printf("  Match recursion uses %s\n", rc? "stack" : "heap");
903      exit(0);      goto EXIT;
904        }
905      else if (strcmp(argv[op], "-help") == 0 ||
906               strcmp(argv[op], "--help") == 0)
907        {
908        usage();
909        goto EXIT;
910      }      }
911    else    else
912      {      {
913      printf("** Unknown or malformed option %s\n", argv[op]);      printf("** Unknown or malformed option %s\n", argv[op]);
914      printf("Usage:   pcretest [-d] [-i] [-o <n>] [-p] [-s] [-t] [<input> [<output>]]\n");      usage();
     printf("  -C     show PCRE compile-time options and exit\n");  
     printf("  -d     debug: show compiled code; implies -i\n");  
     printf("  -dfa   force DFA matching for all subjects\n");  
     printf("  -i     show information about compiled pattern\n"  
            "  -m     output memory used information\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 (memory) used information\n"  
            "  -t     time compilation and execution\n");  
915      yield = 1;      yield = 1;
916      goto EXIT;      goto EXIT;
917      }      }
# Line 525  offsets = (int *)malloc(size_offsets_max Line 926  offsets = (int *)malloc(size_offsets_max
926  if (offsets == NULL)  if (offsets == NULL)
927    {    {
928    printf("** Failed to get %d bytes of memory for offsets vector\n",    printf("** Failed to get %d bytes of memory for offsets vector\n",
929      size_offsets_max * sizeof(int));      (int)(size_offsets_max * sizeof(int)));
930    yield = 1;    yield = 1;
931    goto EXIT;    goto EXIT;
932    }    }
# Line 534  if (offsets == NULL) Line 935  if (offsets == NULL)
935    
936  if (argc > 1)  if (argc > 1)
937    {    {
938    infile = fopen(argv[op], "rb");    infile = fopen(argv[op], INPUT_MODE);
939    if (infile == NULL)    if (infile == NULL)
940      {      {
941      printf("** Failed to open %s\n", argv[op]);      printf("** Failed to open %s\n", argv[op]);
# Line 545  if (argc > 1) Line 946  if (argc > 1)
946    
947  if (argc > 2)  if (argc > 2)
948    {    {
949    outfile = fopen(argv[op+1], "wb");    outfile = fopen(argv[op+1], OUTPUT_MODE);
950    if (outfile == NULL)    if (outfile == NULL)
951      {      {
952      printf("** Failed to open %s\n", argv[op+1]);      printf("** Failed to open %s\n", argv[op+1]);
# Line 561  pcre_free = new_free; Line 962  pcre_free = new_free;
962  pcre_stack_malloc = stack_malloc;  pcre_stack_malloc = stack_malloc;
963  pcre_stack_free = stack_free;  pcre_stack_free = stack_free;
964    
965  /* Heading line, then prompt for first regex if stdin */  /* Heading line unless quiet, then prompt for first regex if stdin */
966    
967  fprintf(outfile, "PCRE version %s\n\n", pcre_version());  if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());
968    
969  /* Main loop */  /* Main loop */
970    
# Line 590  while (!done) Line 991  while (!done)
991    int do_showinfo = showinfo;    int do_showinfo = showinfo;
992    int do_showrest = 0;    int do_showrest = 0;
993    int do_flip = 0;    int do_flip = 0;
994    int erroroffset, len, delimiter;    int erroroffset, len, delimiter, poffset;
995    
996    use_utf8 = 0;    use_utf8 = 0;
997      debug_lengths = 1;
998    
999    if (infile == stdin) printf("  re> ");    if (infile == stdin) printf("  re> ");
1000    if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL) break;    if (extend_inputline(infile, buffer) == NULL) break;
1001    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1002    fflush(outfile);    fflush(outfile);
1003    
# Line 607  while (!done) Line 1009  while (!done)
1009    
1010    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
1011      {      {
1012      unsigned long int magic;      unsigned long int magic, get_options;
1013      uschar sbuf[8];      uschar sbuf[8];
1014      FILE *f;      FILE *f;
1015    
# Line 655  while (!done) Line 1057  while (!done)
1057    
1058      /* Need to know if UTF-8 for printing data strings */      /* Need to know if UTF-8 for printing data strings */
1059    
1060      new_info(re, NULL, PCRE_INFO_OPTIONS, &options);      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1061      use_utf8 = (options & PCRE_UTF8) != 0;      use_utf8 = (get_options & PCRE_UTF8) != 0;
1062    
1063      /* Now see if there is any following study data */      /* Now see if there is any following study data */
1064    
# Line 700  while (!done) Line 1102  while (!done)
1102      }      }
1103    
1104    pp = p;    pp = p;
1105      poffset = p - buffer;
1106    
1107    for(;;)    for(;;)
1108      {      {
# Line 710  while (!done) Line 1113  while (!done)
1113        pp++;        pp++;
1114        }        }
1115      if (*pp != 0) break;      if (*pp != 0) break;
   
     len = BUFFER_SIZE - (pp - buffer);  
     if (len < 256)  
       {  
       fprintf(outfile, "** Expression too long - missing delimiter?\n");  
       goto SKIP_DATA;  
       }  
   
1116      if (infile == stdin) printf("    > ");      if (infile == stdin) printf("    > ");
1117      if (fgets((char *)pp, len, infile) == NULL)      if ((pp = extend_inputline(infile, pp)) == NULL)
1118        {        {
1119        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1120        done = 1;        done = 1;
# Line 728  while (!done) Line 1123  while (!done)
1123      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
1124      }      }
1125    
1126      /* The buffer may have moved while being extended; reset the start of data
1127      pointer to the correct relative point in the buffer. */
1128    
1129      p = buffer + poffset;
1130    
1131    /* If the first character after the delimiter is backslash, make    /* If the first character after the delimiter is backslash, make
1132    the pattern end with backslash. This is purely to provide a way    the pattern end with backslash. This is purely to provide a way
1133    of testing for the error message when a pattern ends with backslash. */    of testing for the error message when a pattern ends with backslash. */
# Line 759  while (!done) Line 1159  while (!done)
1159    
1160        case '+': do_showrest = 1; break;        case '+': do_showrest = 1; break;
1161        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1162          case 'B': do_debug = 1; break;
1163        case 'C': options |= PCRE_AUTO_CALLOUT; break;        case 'C': options |= PCRE_AUTO_CALLOUT; break;
1164        case 'D': do_debug = do_showinfo = 1; break;        case 'D': do_debug = do_showinfo = 1; break;
1165        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
1166        case 'F': do_flip = 1; break;        case 'F': do_flip = 1; break;
1167        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1168        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1169          case 'J': options |= PCRE_DUPNAMES; break;
1170        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1171        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1172    
# Line 775  while (!done) Line 1177  while (!done)
1177        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1178        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1179        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1180          case 'Z': debug_lengths = 0; break;
1181        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1182        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
1183    
1184        case 'L':        case 'L':
1185        ppp = pp;        ppp = pp;
1186        /* The '\r' test here is so that it works on Windows */        /* The '\r' test here is so that it works on Windows. */
1187        while (*ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;        /* The '0' test is just in case this is an unterminated line. */
1188          while (*ppp != 0 && *ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
1189        *ppp = 0;        *ppp = 0;
1190        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
1191          {          {
1192          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);
1193          goto SKIP_DATA;          goto SKIP_DATA;
1194          }          }
1195          locale_set = 1;
1196        tables = pcre_maketables();        tables = pcre_maketables();
1197        pp = ppp;        pp = ppp;
1198        break;        break;
# Line 799  while (!done) Line 1204  while (!done)
1204        *pp = 0;        *pp = 0;
1205        break;        break;
1206    
1207          case '<':
1208            {
1209            int x = check_newline(pp, outfile);
1210            if (x == 0) goto SKIP_DATA;
1211            options |= x;
1212            while (*pp++ != '>');
1213            }
1214          break;
1215    
1216        case '\r':                      /* So that it works in Windows */        case '\r':                      /* So that it works in Windows */
1217        case '\n':        case '\n':
1218        case ' ':        case ' ':
# Line 823  while (!done) Line 1237  while (!done)
1237      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;
1238      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;
1239      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1240        if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1241        if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1242    
1243      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1244    
1245      /* Compilation failed; go back for another re, skipping to blank line      /* Compilation failed; go back for another re, skipping to blank line
# Line 830  while (!done) Line 1247  while (!done)
1247    
1248      if (rc != 0)      if (rc != 0)
1249        {        {
1250        (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);        (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1251        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);
1252        goto SKIP_DATA;        goto SKIP_DATA;
1253        }        }
# Line 842  while (!done) Line 1259  while (!done)
1259  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1260    
1261      {      {
1262      if (timeit)      if (timeit > 0)
1263        {        {
1264        register int i;        register int i;
1265        clock_t time_taken;        clock_t time_taken;
1266        clock_t start_time = clock();        clock_t start_time = clock();
1267        for (i = 0; i < LOOPREPEAT; i++)        for (i = 0; i < timeit; i++)
1268          {          {
1269          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
1270          if (re != NULL) free(re);          if (re != NULL) free(re);
1271          }          }
1272        time_taken = clock() - start_time;        time_taken = clock() - start_time;
1273        fprintf(outfile, "Compile time %.3f milliseconds\n",        fprintf(outfile, "Compile time %.4f milliseconds\n",
1274          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /          (((double)time_taken * 1000.0) / (double)timeit) /
1275            (double)CLOCKS_PER_SEC);            (double)CLOCKS_PER_SEC);
1276        }        }
1277    
# Line 871  while (!done) Line 1288  while (!done)
1288          {          {
1289          for (;;)          for (;;)
1290            {            {
1291            if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)            if (extend_inputline(infile, buffer) == NULL)
1292              {              {
1293              done = 1;              done = 1;
1294              goto CONTINUE;              goto CONTINUE;
# Line 906  while (!done) Line 1323  while (!done)
1323    
1324      if (do_study)      if (do_study)
1325        {        {
1326        if (timeit)        if (timeit > 0)
1327          {          {
1328          register int i;          register int i;
1329          clock_t time_taken;          clock_t time_taken;
1330          clock_t start_time = clock();          clock_t start_time = clock();
1331          for (i = 0; i < LOOPREPEAT; i++)          for (i = 0; i < timeit; i++)
1332            extra = pcre_study(re, study_options, &error);            extra = pcre_study(re, study_options, &error);
1333          time_taken = clock() - start_time;          time_taken = clock() - start_time;
1334          if (extra != NULL) free(extra);          if (extra != NULL) free(extra);
1335          fprintf(outfile, "  Study time %.3f milliseconds\n",          fprintf(outfile, "  Study time %.4f milliseconds\n",
1336            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeit) /
1337              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
1338          }          }
1339        extra = pcre_study(re, study_options, &error);        extra = pcre_study(re, study_options, &error);
# Line 937  while (!done) Line 1354  while (!done)
1354        rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));        rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));
1355        rre->size = byteflip(rre->size, sizeof(rre->size));        rre->size = byteflip(rre->size, sizeof(rre->size));
1356        rre->options = byteflip(rre->options, sizeof(rre->options));        rre->options = byteflip(rre->options, sizeof(rre->options));
1357          rre->flags = byteflip(rre->flags, sizeof(rre->flags));
1358        rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));        rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));
1359        rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));        rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));
1360        rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));        rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));
# Line 959  while (!done) Line 1377  while (!done)
1377    
1378      SHOW_INFO:      SHOW_INFO:
1379    
1380        if (do_debug)
1381          {
1382          fprintf(outfile, "------------------------------------------------------------------\n");
1383          pcre_printint(re, outfile, debug_lengths);
1384          }
1385    
1386      if (do_showinfo)      if (do_showinfo)
1387        {        {
1388        unsigned long int get_options, all_options;        unsigned long int get_options, all_options;
1389    #if !defined NOINFOCHECK
1390        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1391        int count, backrefmax, first_char, need_char;  #endif
1392          int count, backrefmax, first_char, need_char, okpartial, jchanged,
1393            hascrorlf;
1394        int nameentrysize, namecount;        int nameentrysize, namecount;
1395        const uschar *nametable;        const uschar *nametable;
1396    
       if (do_debug)  
         {  
         fprintf(outfile, "------------------------------------------------------------------\n");  
         _pcre_printint(re, outfile);  
         }  
   
1397        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1398        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
1399        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
# Line 982  while (!done) Line 1403  while (!done)
1403        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1404        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1405        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1406          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1407          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1408          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
1409    
1410    #if !defined NOINFOCHECK
1411        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
1412        if (count < 0) fprintf(outfile,        if (count < 0) fprintf(outfile,
1413          "Error %d from pcre_info()\n", count);          "Error %d from pcre_info()\n", count);
# Line 1000  while (!done) Line 1425  while (!done)
1425            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
1426              get_options, old_options);              get_options, old_options);
1427          }          }
1428    #endif
1429    
1430        if (size != regex_gotten_store) fprintf(outfile,        if (size != regex_gotten_store) fprintf(outfile,
1431          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
# Line 1021  while (!done) Line 1447  while (!done)
1447            }            }
1448          }          }
1449    
1450        /* The NOPARTIAL bit is a private bit in the options, so we have        if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1451        to fish it out via out back door */        if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
1452    
1453        all_options = ((real_pcre *)re)->options;        all_options = ((real_pcre *)re)->options;
1454        if (do_flip)        if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
         {  
         all_options = byteflip(all_options, sizeof(all_options));  
         }  
   
       if ((all_options & PCRE_NOPARTIAL) != 0)  
         fprintf(outfile, "Partial matching not supported\n");  
1455    
1456        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1457          else fprintf(outfile, "Options:%s%s%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",
1458            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1459            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1460            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
1461            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
1462            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
1463            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
1464              ((get_options & PCRE_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
1465              ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
1466            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1467            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1468            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1469              ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1470            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1471            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "");            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1472              ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1473    
1474          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1475    
1476          switch (get_options & PCRE_NEWLINE_BITS)
1477            {
1478            case PCRE_NEWLINE_CR:
1479            fprintf(outfile, "Forced newline sequence: CR\n");
1480            break;
1481    
1482        if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)          case PCRE_NEWLINE_LF:
1483          fprintf(outfile, "Case state changes\n");          fprintf(outfile, "Forced newline sequence: LF\n");
1484            break;
1485    
1486            case PCRE_NEWLINE_CRLF:
1487            fprintf(outfile, "Forced newline sequence: CRLF\n");
1488            break;
1489    
1490            case PCRE_NEWLINE_ANYCRLF:
1491            fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1492            break;
1493    
1494            case PCRE_NEWLINE_ANY:
1495            fprintf(outfile, "Forced newline sequence: ANY\n");
1496            break;
1497    
1498            default:
1499            break;
1500            }
1501    
1502        if (first_char == -1)        if (first_char == -1)
1503          {          {
1504          fprintf(outfile, "First char at start or follows \\n\n");          fprintf(outfile, "First char at start or follows newline\n");
1505          }          }
1506        else if (first_char < 0)        else if (first_char < 0)
1507          {          {
# Line 1063  while (!done) Line 1512  while (!done)
1512          int ch = first_char & 255;          int ch = first_char & 255;
1513          const char *caseless = ((first_char & REQ_CASELESS) == 0)?          const char *caseless = ((first_char & REQ_CASELESS) == 0)?
1514            "" : " (caseless)";            "" : " (caseless)";
1515          if (isprint(ch))          if (PRINTHEX(ch))
1516            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
1517          else          else
1518            fprintf(outfile, "First char = %d%s\n", ch, caseless);            fprintf(outfile, "First char = %d%s\n", ch, caseless);
# Line 1078  while (!done) Line 1527  while (!done)
1527          int ch = need_char & 255;          int ch = need_char & 255;
1528          const char *caseless = ((need_char & REQ_CASELESS) == 0)?          const char *caseless = ((need_char & REQ_CASELESS) == 0)?
1529            "" : " (caseless)";            "" : " (caseless)";
1530          if (isprint(ch))          if (PRINTHEX(ch))
1531            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
1532          else          else
1533            fprintf(outfile, "Need char = %d%s\n", ch, caseless);            fprintf(outfile, "Need char = %d%s\n", ch, caseless);
# Line 1114  while (!done) Line 1563  while (!done)
1563                    fprintf(outfile, "\n  ");                    fprintf(outfile, "\n  ");
1564                    c = 2;                    c = 2;
1565                    }                    }
1566                  if (isprint(i) && i != ' ')                  if (PRINTHEX(i) && i != ' ')
1567                    {                    {
1568                    fprintf(outfile, "%c ", i);                    fprintf(outfile, "%c ", i);
1569                    c += 2;                    c += 2;
# Line 1173  while (!done) Line 1622  while (!done)
1622                  strerror(errno));                  strerror(errno));
1623                }                }
1624              else fprintf(outfile, "Study data written to %s\n", to_file);              else fprintf(outfile, "Study data written to %s\n", to_file);
1625    
1626              }              }
1627            }            }
1628          fclose(f);          fclose(f);
# Line 1189  while (!done) Line 1639  while (!done)
1639    
1640    for (;;)    for (;;)
1641      {      {
1642      unsigned char *q;      uschar *q;
1643      unsigned char *bptr = dbuffer;      uschar *bptr;
1644      int *use_offsets = offsets;      int *use_offsets = offsets;
1645      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1646      int callout_data = 0;      int callout_data = 0;
# Line 1207  while (!done) Line 1657  while (!done)
1657    
1658      options = 0;      options = 0;
1659    
1660        *copynames = 0;
1661        *getnames = 0;
1662    
1663        copynamesptr = copynames;
1664        getnamesptr = getnames;
1665    
1666      pcre_callout = callout;      pcre_callout = callout;
1667      first_callout = 1;      first_callout = 1;
1668      callout_extra = 0;      callout_extra = 0;
# Line 1215  while (!done) Line 1671  while (!done)
1671      callout_fail_id = -1;      callout_fail_id = -1;
1672      show_malloc = 0;      show_malloc = 0;
1673    
1674      if (infile == stdin) printf("data> ");      if (extra != NULL) extra->flags &=
1675      if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)        ~(PCRE_EXTRA_MATCH_LIMIT|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
1676    
1677        len = 0;
1678        for (;;)
1679        {        {
1680        done = 1;        if (infile == stdin) printf("data> ");
1681        goto CONTINUE;        if (extend_inputline(infile, buffer + len) == NULL)
1682            {
1683            if (len > 0) break;
1684            done = 1;
1685            goto CONTINUE;
1686            }
1687          if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1688          len = (int)strlen((char *)buffer);
1689          if (buffer[len-1] == '\n') break;
1690        }        }
     if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);  
1691    
     len = (int)strlen((char *)buffer);  
1692      while (len > 0 && isspace(buffer[len-1])) len--;      while (len > 0 && isspace(buffer[len-1])) len--;
1693      buffer[len] = 0;      buffer[len] = 0;
1694      if (len == 0) break;      if (len == 0) break;
# Line 1231  while (!done) Line 1696  while (!done)
1696      p = buffer;      p = buffer;
1697      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1698    
1699      q = dbuffer;      bptr = q = dbuffer;
1700      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1701        {        {
1702        int i = 0;        int i = 0;
# Line 1253  while (!done) Line 1718  while (!done)
1718          c -= '0';          c -= '0';
1719          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
1720            c = c * 8 + *p++ - '0';            c = c * 8 + *p++ - '0';
1721    
1722    #if !defined NOUTF8
1723            if (use_utf8 && c > 255)
1724              {
1725              unsigned char buff8[8];
1726              int ii, utn;
1727              utn = ord2utf8(c, buff8);
1728              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1729              c = buff8[ii];   /* Last byte */
1730              }
1731    #endif
1732          break;          break;
1733    
1734          case 'x':          case 'x':
1735    
1736          /* Handle \x{..} specially - new Perl thing for utf8 */          /* Handle \x{..} specially - new Perl thing for utf8 */
1737    
1738    #if !defined NOUTF8
1739          if (*p == '{')          if (*p == '{')
1740            {            {
1741            unsigned char *pt = p;            unsigned char *pt = p;
# Line 1269  while (!done) Line 1746  while (!done)
1746              {              {
1747              unsigned char buff8[8];              unsigned char buff8[8];
1748              int ii, utn;              int ii, utn;
1749              utn = _pcre_ord2utf8(c, buff8);              utn = ord2utf8(c, buff8);
1750              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1751              c = buff8[ii];   /* Last byte */              c = buff8[ii];   /* Last byte */
1752              p = pt + 1;              p = pt + 1;
# Line 1277  while (!done) Line 1754  while (!done)
1754              }              }
1755            /* Not correct form; fall through */            /* Not correct form; fall through */
1756            }            }
1757    #endif
1758    
1759          /* Ordinary \x */          /* Ordinary \x */
1760    
# Line 1312  while (!done) Line 1790  while (!done)
1790            }            }
1791          else if (isalnum(*p))          else if (isalnum(*p))
1792            {            {
1793            uschar name[256];            uschar *npp = copynamesptr;
           uschar *npp = name;  
1794            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1795              *npp++ = 0;
1796            *npp = 0;            *npp = 0;
1797            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)copynamesptr);
1798            if (n < 0)            if (n < 0)
1799              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
1800            else copystrings |= 1 << n;            copynamesptr = npp;
1801            }            }
1802          else if (*p == '+')          else if (*p == '+')
1803            {            {
# Line 1357  while (!done) Line 1835  while (!done)
1835            }            }
1836          continue;          continue;
1837    
1838    #if !defined NODFA
1839          case 'D':          case 'D':
1840    #if !defined NOPOSIX
1841          if (posix || do_posix)          if (posix || do_posix)
1842            printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");            printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");
1843          else          else
1844    #endif
1845            use_dfa = 1;            use_dfa = 1;
1846          continue;          continue;
1847    
1848          case 'F':          case 'F':
1849          options |= PCRE_DFA_SHORTEST;          options |= PCRE_DFA_SHORTEST;
1850          continue;          continue;
1851    #endif
1852    
1853          case 'G':          case 'G':
1854          if (isdigit(*p))          if (isdigit(*p))
# Line 1376  while (!done) Line 1858  while (!done)
1858            }            }
1859          else if (isalnum(*p))          else if (isalnum(*p))
1860            {            {
1861            uschar name[256];            uschar *npp = getnamesptr;
           uschar *npp = name;  
1862            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1863              *npp++ = 0;
1864            *npp = 0;            *npp = 0;
1865            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)getnamesptr);
1866            if (n < 0)            if (n < 0)
1867              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
1868            else getstrings |= 1 << n;            getnamesptr = npp;
1869            }            }
1870          continue;          continue;
1871    
# Line 1409  while (!done) Line 1891  while (!done)
1891            if (offsets == NULL)            if (offsets == NULL)
1892              {              {
1893              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
1894                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
1895              yield = 1;              yield = 1;
1896              goto EXIT;              goto EXIT;
1897              }              }
# Line 1422  while (!done) Line 1904  while (!done)
1904          options |= PCRE_PARTIAL;          options |= PCRE_PARTIAL;
1905          continue;          continue;
1906    
1907            case 'Q':
1908            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1909            if (extra == NULL)
1910              {
1911              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1912              extra->flags = 0;
1913              }
1914            extra->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
1915            extra->match_limit_recursion = n;
1916            continue;
1917    
1918            case 'q':
1919            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1920            if (extra == NULL)
1921              {
1922              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1923              extra->flags = 0;
1924              }
1925            extra->flags |= PCRE_EXTRA_MATCH_LIMIT;
1926            extra->match_limit = n;
1927            continue;
1928    
1929    #if !defined NODFA
1930          case 'R':          case 'R':
1931          options |= PCRE_DFA_RESTART;          options |= PCRE_DFA_RESTART;
1932          continue;          continue;
1933    #endif
1934    
1935          case 'S':          case 'S':
1936          show_malloc = 1;          show_malloc = 1;
# Line 1437  while (!done) Line 1943  while (!done)
1943          case '?':          case '?':
1944          options |= PCRE_NO_UTF8_CHECK;          options |= PCRE_NO_UTF8_CHECK;
1945          continue;          continue;
1946    
1947            case '<':
1948              {
1949              int x = check_newline(p, outfile);
1950              if (x == 0) goto NEXT_DATA;
1951              options |= x;
1952              while (*p++ != '>');
1953              }
1954            continue;
1955          }          }
1956        *q++ = c;        *q++ = c;
1957        }        }
# Line 1467  while (!done) Line 1982  while (!done)
1982    
1983        if (rc != 0)        if (rc != 0)
1984          {          {
1985          (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);          (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1986          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
1987          }          }
1988          else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)
1989                  != 0)
1990            {
1991            fprintf(outfile, "Matched with REG_NOSUB\n");
1992            }
1993        else        else
1994          {          {
1995          size_t i;          size_t i;
# Line 1501  while (!done) Line 2021  while (!done)
2021    
2022      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
2023        {        {
2024        if (timeit)        if (timeitm > 0)
2025          {          {
2026          register int i;          register int i;
2027          clock_t time_taken;          clock_t time_taken;
2028          clock_t start_time = clock();          clock_t start_time = clock();
2029    
2030    #if !defined NODFA
2031          if (all_use_dfa || use_dfa)          if (all_use_dfa || use_dfa)
2032            {            {
2033            int workspace[1000];            int workspace[1000];
2034            for (i = 0; i < LOOPREPEAT; i++)            for (i = 0; i < timeitm; i++)
2035              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
2036                options | g_notempty, use_offsets, use_size_offsets, workspace,                options | g_notempty, use_offsets, use_size_offsets, workspace,
2037                sizeof(workspace)/sizeof(int));                sizeof(workspace)/sizeof(int));
2038            }            }
2039          else          else
2040    #endif
2041    
2042          for (i = 0; i < LOOPREPEAT; i++)          for (i = 0; i < timeitm; i++)
2043            count = pcre_exec(re, extra, (char *)bptr, len,            count = pcre_exec(re, extra, (char *)bptr, len,
2044              start_offset, options | g_notempty, use_offsets, use_size_offsets);              start_offset, options | g_notempty, use_offsets, use_size_offsets);
2045    
2046          time_taken = clock() - start_time;          time_taken = clock() - start_time;
2047          fprintf(outfile, "Execute time %.3f milliseconds\n",          fprintf(outfile, "Execute time %.4f milliseconds\n",
2048            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeitm) /
2049              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
2050          }          }
2051    
2052        /* 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
2053        varying limits in order to find the minimum value. */        varying limits in order to find the minimum value for the match limit and
2054          for the recursion limit. */
2055    
2056        if (find_match_limit)        if (find_match_limit)
2057          {          {
         int min = 0;  
         int mid = 64;  
         int max = -1;  
   
2058          if (extra == NULL)          if (extra == NULL)
2059            {            {
2060            extra = (pcre_extra *)malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2061            extra->flags = 0;            extra->flags = 0;
2062            }            }
         extra->flags |= PCRE_EXTRA_MATCH_LIMIT;  
2063    
2064          for (;;)          (void)check_match_limit(re, extra, bptr, len, start_offset,
2065            {            options|g_notempty, use_offsets, use_size_offsets,
2066            extra->match_limit = mid;            PCRE_EXTRA_MATCH_LIMIT, &(extra->match_limit),
2067            count = pcre_exec(re, extra, (char *)bptr, len, start_offset,            PCRE_ERROR_MATCHLIMIT, "match()");
2068              options | g_notempty, use_offsets, use_size_offsets);  
2069            if (count == PCRE_ERROR_MATCHLIMIT)          count = check_match_limit(re, extra, bptr, len, start_offset,
2070              {            options|g_notempty, use_offsets, use_size_offsets,
2071              /* fprintf(outfile, "Testing match limit = %d\n", mid); */            PCRE_EXTRA_MATCH_LIMIT_RECURSION, &(extra->match_limit_recursion),
2072              min = mid;            PCRE_ERROR_RECURSIONLIMIT, "match() recursion");
             mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2;  
             }  
           else if (count >= 0 || count == PCRE_ERROR_NOMATCH ||  
                                  count == PCRE_ERROR_PARTIAL)  
             {  
             if (mid == min + 1)  
               {  
               fprintf(outfile, "Minimum match limit = %d\n", mid);  
               break;  
               }  
             /* fprintf(outfile, "Testing match limit = %d\n", mid); */  
             max = mid;  
             mid = (min + mid)/2;  
             }  
           else break;    /* Some other error */  
           }  
   
         extra->flags &= ~PCRE_EXTRA_MATCH_LIMIT;  
2073          }          }
2074    
2075        /* If callout_data is set, use the interface with additional data */        /* If callout_data is set, use the interface with additional data */
# Line 1591  while (!done) Line 2091  while (!done)
2091        /* 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
2092        value of match_limit. */        value of match_limit. */
2093    
2094    #if !defined NODFA
2095        else if (all_use_dfa || use_dfa)        else if (all_use_dfa || use_dfa)
2096          {          {
2097          int workspace[1000];          int workspace[1000];
# Line 1603  while (!done) Line 2104  while (!done)
2104            count = use_size_offsets/2;            count = use_size_offsets/2;
2105            }            }
2106          }          }
2107    #endif
2108    
2109        else        else
2110          {          {
# Line 1619  while (!done) Line 2121  while (!done)
2121    
2122        if (count >= 0)        if (count >= 0)
2123          {          {
2124          int i;          int i, maxcount;
2125    
2126    #if !defined NODFA
2127            if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
2128    #endif
2129              maxcount = use_size_offsets/3;
2130    
2131            /* This is a check against a lunatic return value. */
2132    
2133            if (count > maxcount)
2134              {
2135              fprintf(outfile,
2136                "** PCRE error: returned count %d is too big for offset size %d\n",
2137                count, use_size_offsets);
2138              count = use_size_offsets/3;
2139              if (do_g || do_G)
2140                {
2141                fprintf(outfile, "** /%c loop abandoned\n", do_g? 'g' : 'G');
2142                do_g = do_G = FALSE;        /* Break g/G loop */
2143                }
2144              }
2145    
2146          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
2147            {            {
2148            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
# Line 1647  while (!done) Line 2170  while (!done)
2170            {            {
2171            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
2172              {              {
2173              char copybuffer[16];              char copybuffer[256];
2174              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,
2175                i, copybuffer, sizeof(copybuffer));                i, copybuffer, sizeof(copybuffer));
2176              if (rc < 0)              if (rc < 0)
# Line 1657  while (!done) Line 2180  while (!done)
2180              }              }
2181            }            }
2182    
2183            for (copynamesptr = copynames;
2184                 *copynamesptr != 0;
2185                 copynamesptr += (int)strlen((char*)copynamesptr) + 1)
2186              {
2187              char copybuffer[256];
2188              int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
2189                count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));
2190              if (rc < 0)
2191                fprintf(outfile, "copy substring %s failed %d\n", copynamesptr, rc);
2192              else
2193                fprintf(outfile, "  C %s (%d) %s\n", copybuffer, rc, copynamesptr);
2194              }
2195    
2196          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2197            {            {
2198            if ((getstrings & (1 << i)) != 0)            if ((getstrings & (1 << i)) != 0)
# Line 1669  while (!done) Line 2205  while (!done)
2205              else              else
2206                {                {
2207                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
               /* free((void *)substring); */  
2208                pcre_free_substring(substring);                pcre_free_substring(substring);
2209                }                }
2210              }              }
2211            }            }
2212    
2213            for (getnamesptr = getnames;
2214                 *getnamesptr != 0;
2215                 getnamesptr += (int)strlen((char*)getnamesptr) + 1)
2216              {
2217              const char *substring;
2218              int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
2219                count, (char *)getnamesptr, &substring);
2220              if (rc < 0)
2221                fprintf(outfile, "copy substring %s failed %d\n", getnamesptr, rc);
2222              else
2223                {
2224                fprintf(outfile, "  G %s (%d) %s\n", substring, rc, getnamesptr);
2225                pcre_free_substring(substring);
2226                }
2227              }
2228    
2229          if (getlist)          if (getlist)
2230            {            {
2231            const char **stringlist;            const char **stringlist;
# Line 1699  while (!done) Line 2250  while (!done)
2250        else if (count == PCRE_ERROR_PARTIAL)        else if (count == PCRE_ERROR_PARTIAL)
2251          {          {
2252          fprintf(outfile, "Partial match");          fprintf(outfile, "Partial match");
2253    #if !defined NODFA
2254          if ((all_use_dfa || use_dfa) && use_size_offsets > 2)          if ((all_use_dfa || use_dfa) && use_size_offsets > 2)
2255            fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],            fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],
2256              bptr + use_offsets[0]);              bptr + use_offsets[0]);
2257    #endif
2258          fprintf(outfile, "\n");          fprintf(outfile, "\n");
2259          break;  /* Out of the /g loop */          break;  /* Out of the /g loop */
2260          }          }
2261    
2262        /* 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
2263        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
2264        We want to advance the start offset, and continue. In the case of UTF-8        to advance the start offset, and continue. We won't be at the end of the
2265        matching, the advance must be one character, not one byte. Fudge the        string - that was checked before setting g_notempty.
2266        offset values to achieve this. We won't be at the end of the string -  
2267        that was checked before setting g_notempty. */        Complication arises in the case when the newline option is "any" or
2268          "anycrlf". If the previous match was at the end of a line terminated by
2269          CRLF, an advance of one character just passes the \r, whereas we should
2270          prefer the longer newline sequence, as does the code in pcre_exec().
2271          Fudge the offset value to achieve this.
2272    
2273          Otherwise, in the case of UTF-8 matching, the advance must be one
2274          character, not one byte. */
2275    
2276        else        else
2277          {          {
2278          if (g_notempty != 0)          if (g_notempty != 0)
2279            {            {
2280            int onechar = 1;            int onechar = 1;
2281              unsigned int obits = ((real_pcre *)re)->options;
2282            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2283            if (use_utf8)            if ((obits & PCRE_NEWLINE_BITS) == 0)
2284                {
2285                int d;
2286                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2287                obits = (d == '\r')? PCRE_NEWLINE_CR :
2288                        (d == '\n')? PCRE_NEWLINE_LF :
2289                        (d == ('\r'<<8 | '\n'))? PCRE_NEWLINE_CRLF :
2290                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2291                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2292                }
2293              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2294                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2295                  &&
2296                  start_offset < len - 1 &&
2297                  bptr[start_offset] == '\r' &&
2298                  bptr[start_offset+1] == '\n')
2299                onechar++;
2300              else if (use_utf8)
2301              {              {
2302              while (start_offset + onechar < len)              while (start_offset + onechar < len)
2303                {                {
# Line 1754  while (!done) Line 2332  while (!done)
2332        character. */        character. */
2333    
2334        g_notempty = 0;        g_notempty = 0;
2335    
2336        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2337          {          {
2338          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
# Line 1772  while (!done) Line 2351  while (!done)
2351          len -= use_offsets[1];          len -= use_offsets[1];
2352          }          }
2353        }  /* End of loop for /g and /G */        }  /* End of loop for /g and /G */
2354    
2355        NEXT_DATA: continue;
2356      }    /* End of loop for data lines */      }    /* End of loop for data lines */
2357    
2358    CONTINUE:    CONTINUE:
# Line 1786  while (!done) Line 2367  while (!done)
2367      {      {
2368      new_free((void *)tables);      new_free((void *)tables);
2369      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
2370        locale_set = 0;
2371      }      }
2372    }    }
2373    

Legend:
Removed from v.77  
changed lines
  Added in v.231

  ViewVC Help
Powered by ViewVC 1.1.5