/[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 226 by ph10, Tue Aug 21 11:46:08 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    *         Check newline indicator                *
668    *************************************************/
669    
670    /* This is used both at compile and run-time to check for <xxx> escapes, where
671    xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
672    no match.
673    
674    Arguments:
675      p           points after the leading '<'
676      f           file for error message
677    
678    Returns:      appropriate PCRE_NEWLINE_xxx flags, or 0
679    */
680    
681    static int
682    check_newline(uschar *p, FILE *f)
683    {
684    if (strncmp((char *)p, "cr>", 3) == 0) return PCRE_NEWLINE_CR;
685    if (strncmp((char *)p, "lf>", 3) == 0) return PCRE_NEWLINE_LF;
686    if (strncmp((char *)p, "crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
687    if (strncmp((char *)p, "anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
688    if (strncmp((char *)p, "any>", 4) == 0) return PCRE_NEWLINE_ANY;
689    fprintf(f, "Unknown newline type at: <%s\n", p);
690    return 0;
691    }
692    
693    
694    
695    /*************************************************
696    *             Usage function                     *
697    *************************************************/
698    
699    static void
700    usage(void)
701    {
702    printf("Usage:     pcretest [options] [<input> [<output>]]\n");
703    printf("  -b       show compiled code (bytecode)\n");
704    printf("  -C       show PCRE compile-time options and exit\n");
705    printf("  -d       debug: show compiled code and information (-b and -i)\n");
706    #if !defined NODFA
707    printf("  -dfa     force DFA matching for all subjects\n");
708    #endif
709    printf("  -help    show usage information\n");
710    printf("  -i       show information about compiled patterns\n"
711           "  -m       output memory used information\n"
712           "  -o <n>   set size of offsets vector to <n>\n");
713    #if !defined NOPOSIX
714    printf("  -p       use POSIX interface\n");
715    #endif
716    printf("  -q       quiet: do not output PCRE version number at start\n");
717    printf("  -S <n>   set stack size to <n> megabytes\n");
718    printf("  -s       output store (memory) used information\n"
719           "  -t       time compilation and execution\n");
720    printf("  -t <n>   time compilation and execution, repeating <n> times\n");
721    printf("  -tm      time execution (matching) only\n");
722    printf("  -tm <n>  time execution (matching) only, repeating <n> times\n");
723    }
724    
725    
726    
727    /*************************************************
728  *                Main Program                    *  *                Main Program                    *
729  *************************************************/  *************************************************/
730    
# Line 420  int options = 0; Line 739  int options = 0;
739  int study_options = 0;  int study_options = 0;
740  int op = 1;  int op = 1;
741  int timeit = 0;  int timeit = 0;
742    int timeitm = 0;
743  int showinfo = 0;  int showinfo = 0;
744  int showstore = 0;  int showstore = 0;
745    int quiet = 0;
746  int size_offsets = 45;  int size_offsets = 45;
747  int size_offsets_max;  int size_offsets_max;
748  int *offsets = NULL;  int *offsets = NULL;
# Line 432  int debug = 0; Line 753  int debug = 0;
753  int done = 0;  int done = 0;
754  int all_use_dfa = 0;  int all_use_dfa = 0;
755  int yield = 0;  int yield = 0;
756    int stack_size;
757    
758    /* These vectors store, end-to-end, a list of captured substring names. Assume
759    that 1024 is plenty long enough for the few names we'll be testing. */
760    
761    uschar copynames[1024];
762    uschar getnames[1024];
763    
764  unsigned char *buffer;  uschar *copynamesptr;
765  unsigned char *dbuffer;  uschar *getnamesptr;
766    
767  /* Get buffers from malloc() so that Electric Fence will check their misuse  /* Get buffers from malloc() so that Electric Fence will check their misuse
768  when I am debugging. */  when I am debugging. They grow automatically when very long lines are read. */
769    
770  buffer = (unsigned char *)malloc(BUFFER_SIZE);  buffer = (unsigned char *)malloc(buffer_size);
771  dbuffer = (unsigned char *)malloc(DBUFFER_SIZE);  dbuffer = (unsigned char *)malloc(buffer_size);
772  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.  */  
773    
774  #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) */  
775    
776  outfile = stdout;  outfile = stdout;
777    
778    /* The following  _setmode() stuff is some Windows magic that tells its runtime
779    library to translate CRLF into a single LF character. At least, that's what
780    I've been told: never having used Windows I take this all on trust. Originally
781    it set 0x8000, but then I was advised that _O_BINARY was better. */
782    
783    #if defined(_WIN32) || defined(WIN32)
784    _setmode( _fileno( stdout ), _O_BINARY );
785    #endif
786    
787  /* Scan options */  /* Scan options */
788    
789  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
# Line 461  while (argc > 1 && argv[op][0] == '-') Line 792  while (argc > 1 && argv[op][0] == '-')
792    
793    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
794      showstore = 1;      showstore = 1;
795    else if (strcmp(argv[op], "-t") == 0) timeit = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
796      else if (strcmp(argv[op], "-b") == 0) debug = 1;
797    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
798    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
799    #if !defined NODFA
800    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
801    #endif
802    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
803        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),        ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),
804          *endptr == 0))          *endptr == 0))
# Line 472  while (argc > 1 && argv[op][0] == '-') Line 806  while (argc > 1 && argv[op][0] == '-')
806      op++;      op++;
807      argc--;      argc--;
808      }      }
809      else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
810        {
811        int both = argv[op][2] == 0;
812        int temp;
813        if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
814                         *endptr == 0))
815          {
816          timeitm = temp;
817          op++;
818          argc--;
819          }
820        else timeitm = LOOPREPEAT;
821        if (both) timeit = timeitm;
822        }
823      else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
824          ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
825            *endptr == 0))
826        {
827    #if defined(_WIN32) || defined(WIN32)
828        printf("PCRE: -S not supported on this OS\n");
829        exit(1);
830    #else
831        int rc;
832        struct rlimit rlim;
833        getrlimit(RLIMIT_STACK, &rlim);
834        rlim.rlim_cur = stack_size * 1024 * 1024;
835        rc = setrlimit(RLIMIT_STACK, &rlim);
836        if (rc != 0)
837          {
838        printf("PCRE: setrlimit() failed with error %d\n", rc);
839        exit(1);
840          }
841        op++;
842        argc--;
843    #endif
844        }
845  #if !defined NOPOSIX  #if !defined NOPOSIX
846    else if (strcmp(argv[op], "-p") == 0) posix = 1;    else if (strcmp(argv[op], "-p") == 0) posix = 1;
847  #endif  #endif
# Line 485  while (argc > 1 && argv[op][0] == '-') Line 855  while (argc > 1 && argv[op][0] == '-')
855      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
856      printf("  %sUnicode properties support\n", rc? "" : "No ");      printf("  %sUnicode properties support\n", rc? "" : "No ");
857      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
858      printf("  Newline character is %s\n", (rc == '\r')? "CR" : "LF");      printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :
859          (rc == '\n')? "LF" : (rc == ('\r'<<8 | '\n'))? "CRLF" :
860          (rc == -2)? "ANYCRLF" :
861          (rc == -1)? "ANY" : "???");
862      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
863      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
864      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
865      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
866      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
867      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %d\n", rc);
868        (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);
869        printf("  Default recursion depth limit = %d\n", rc);
870      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
871      printf("  Match recursion uses %s\n", rc? "stack" : "heap");      printf("  Match recursion uses %s\n", rc? "stack" : "heap");
872      exit(0);      goto EXIT;
873        }
874      else if (strcmp(argv[op], "-help") == 0 ||
875               strcmp(argv[op], "--help") == 0)
876        {
877        usage();
878        goto EXIT;
879      }      }
880    else    else
881      {      {
882      printf("** Unknown or malformed option %s\n", argv[op]);      printf("** Unknown or malformed option %s\n", argv[op]);
883      printf("Usage:   pcretest [-d] [-i] [-o <n>] [-p] [-s] [-t] [<input> [<output>]]\n");      usage();
     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");  
884      yield = 1;      yield = 1;
885      goto EXIT;      goto EXIT;
886      }      }
# Line 525  offsets = (int *)malloc(size_offsets_max Line 895  offsets = (int *)malloc(size_offsets_max
895  if (offsets == NULL)  if (offsets == NULL)
896    {    {
897    printf("** Failed to get %d bytes of memory for offsets vector\n",    printf("** Failed to get %d bytes of memory for offsets vector\n",
898      size_offsets_max * sizeof(int));      (int)(size_offsets_max * sizeof(int)));
899    yield = 1;    yield = 1;
900    goto EXIT;    goto EXIT;
901    }    }
# Line 534  if (offsets == NULL) Line 904  if (offsets == NULL)
904    
905  if (argc > 1)  if (argc > 1)
906    {    {
907    infile = fopen(argv[op], "rb");    infile = fopen(argv[op], INPUT_MODE);
908    if (infile == NULL)    if (infile == NULL)
909      {      {
910      printf("** Failed to open %s\n", argv[op]);      printf("** Failed to open %s\n", argv[op]);
# Line 545  if (argc > 1) Line 915  if (argc > 1)
915    
916  if (argc > 2)  if (argc > 2)
917    {    {
918    outfile = fopen(argv[op+1], "wb");    outfile = fopen(argv[op+1], OUTPUT_MODE);
919    if (outfile == NULL)    if (outfile == NULL)
920      {      {
921      printf("** Failed to open %s\n", argv[op+1]);      printf("** Failed to open %s\n", argv[op+1]);
# Line 561  pcre_free = new_free; Line 931  pcre_free = new_free;
931  pcre_stack_malloc = stack_malloc;  pcre_stack_malloc = stack_malloc;
932  pcre_stack_free = stack_free;  pcre_stack_free = stack_free;
933    
934  /* Heading line, then prompt for first regex if stdin */  /* Heading line unless quiet, then prompt for first regex if stdin */
935    
936  fprintf(outfile, "PCRE version %s\n\n", pcre_version());  if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());
937    
938  /* Main loop */  /* Main loop */
939    
# Line 590  while (!done) Line 960  while (!done)
960    int do_showinfo = showinfo;    int do_showinfo = showinfo;
961    int do_showrest = 0;    int do_showrest = 0;
962    int do_flip = 0;    int do_flip = 0;
963    int erroroffset, len, delimiter;    int erroroffset, len, delimiter, poffset;
964    
965    use_utf8 = 0;    use_utf8 = 0;
966      debug_lengths = 1;
967    
968    if (infile == stdin) printf("  re> ");    if (infile == stdin) printf("  re> ");
969    if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL) break;    if (extend_inputline(infile, buffer) == NULL) break;
970    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
971    fflush(outfile);    fflush(outfile);
972    
# Line 607  while (!done) Line 978  while (!done)
978    
979    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
980      {      {
981      unsigned long int magic;      unsigned long int magic, get_options;
982      uschar sbuf[8];      uschar sbuf[8];
983      FILE *f;      FILE *f;
984    
# Line 655  while (!done) Line 1026  while (!done)
1026    
1027      /* Need to know if UTF-8 for printing data strings */      /* Need to know if UTF-8 for printing data strings */
1028    
1029      new_info(re, NULL, PCRE_INFO_OPTIONS, &options);      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1030      use_utf8 = (options & PCRE_UTF8) != 0;      use_utf8 = (get_options & PCRE_UTF8) != 0;
1031    
1032      /* Now see if there is any following study data */      /* Now see if there is any following study data */
1033    
# Line 700  while (!done) Line 1071  while (!done)
1071      }      }
1072    
1073    pp = p;    pp = p;
1074      poffset = p - buffer;
1075    
1076    for(;;)    for(;;)
1077      {      {
# Line 710  while (!done) Line 1082  while (!done)
1082        pp++;        pp++;
1083        }        }
1084      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;  
       }  
   
1085      if (infile == stdin) printf("    > ");      if (infile == stdin) printf("    > ");
1086      if (fgets((char *)pp, len, infile) == NULL)      if ((pp = extend_inputline(infile, pp)) == NULL)
1087        {        {
1088        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1089        done = 1;        done = 1;
# Line 728  while (!done) Line 1092  while (!done)
1092      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
1093      }      }
1094    
1095      /* The buffer may have moved while being extended; reset the start of data
1096      pointer to the correct relative point in the buffer. */
1097    
1098      p = buffer + poffset;
1099    
1100    /* If the first character after the delimiter is backslash, make    /* If the first character after the delimiter is backslash, make
1101    the pattern end with backslash. This is purely to provide a way    the pattern end with backslash. This is purely to provide a way
1102    of testing for the error message when a pattern ends with backslash. */    of testing for the error message when a pattern ends with backslash. */
# Line 759  while (!done) Line 1128  while (!done)
1128    
1129        case '+': do_showrest = 1; break;        case '+': do_showrest = 1; break;
1130        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1131          case 'B': do_debug = 1; break;
1132        case 'C': options |= PCRE_AUTO_CALLOUT; break;        case 'C': options |= PCRE_AUTO_CALLOUT; break;
1133        case 'D': do_debug = do_showinfo = 1; break;        case 'D': do_debug = do_showinfo = 1; break;
1134        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
1135        case 'F': do_flip = 1; break;        case 'F': do_flip = 1; break;
1136        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1137        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1138          case 'J': options |= PCRE_DUPNAMES; break;
1139        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1140        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1141    
# Line 775  while (!done) Line 1146  while (!done)
1146        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1147        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1148        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1149          case 'Z': debug_lengths = 0; break;
1150        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1151        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
1152    
1153        case 'L':        case 'L':
1154        ppp = pp;        ppp = pp;
1155        /* The '\r' test here is so that it works on Windows */        /* The '\r' test here is so that it works on Windows. */
1156        while (*ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;        /* The '0' test is just in case this is an unterminated line. */
1157          while (*ppp != 0 && *ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
1158        *ppp = 0;        *ppp = 0;
1159        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
1160          {          {
1161          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);
1162          goto SKIP_DATA;          goto SKIP_DATA;
1163          }          }
1164          locale_set = 1;
1165        tables = pcre_maketables();        tables = pcre_maketables();
1166        pp = ppp;        pp = ppp;
1167        break;        break;
# Line 799  while (!done) Line 1173  while (!done)
1173        *pp = 0;        *pp = 0;
1174        break;        break;
1175    
1176          case '<':
1177            {
1178            int x = check_newline(pp, outfile);
1179            if (x == 0) goto SKIP_DATA;
1180            options |= x;
1181            while (*pp++ != '>');
1182            }
1183          break;
1184    
1185        case '\r':                      /* So that it works in Windows */        case '\r':                      /* So that it works in Windows */
1186        case '\n':        case '\n':
1187        case ' ':        case ' ':
# Line 823  while (!done) Line 1206  while (!done)
1206      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;
1207      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;
1208      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1209        if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1210        if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1211    
1212      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1213    
1214      /* Compilation failed; go back for another re, skipping to blank line      /* Compilation failed; go back for another re, skipping to blank line
# Line 830  while (!done) Line 1216  while (!done)
1216    
1217      if (rc != 0)      if (rc != 0)
1218        {        {
1219        (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);        (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1220        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);
1221        goto SKIP_DATA;        goto SKIP_DATA;
1222        }        }
# Line 842  while (!done) Line 1228  while (!done)
1228  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1229    
1230      {      {
1231      if (timeit)      if (timeit > 0)
1232        {        {
1233        register int i;        register int i;
1234        clock_t time_taken;        clock_t time_taken;
1235        clock_t start_time = clock();        clock_t start_time = clock();
1236        for (i = 0; i < LOOPREPEAT; i++)        for (i = 0; i < timeit; i++)
1237          {          {
1238          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
1239          if (re != NULL) free(re);          if (re != NULL) free(re);
1240          }          }
1241        time_taken = clock() - start_time;        time_taken = clock() - start_time;
1242        fprintf(outfile, "Compile time %.3f milliseconds\n",        fprintf(outfile, "Compile time %.4f milliseconds\n",
1243          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /          (((double)time_taken * 1000.0) / (double)timeit) /
1244            (double)CLOCKS_PER_SEC);            (double)CLOCKS_PER_SEC);
1245        }        }
1246    
# Line 871  while (!done) Line 1257  while (!done)
1257          {          {
1258          for (;;)          for (;;)
1259            {            {
1260            if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)            if (extend_inputline(infile, buffer) == NULL)
1261              {              {
1262              done = 1;              done = 1;
1263              goto CONTINUE;              goto CONTINUE;
# Line 906  while (!done) Line 1292  while (!done)
1292    
1293      if (do_study)      if (do_study)
1294        {        {
1295        if (timeit)        if (timeit > 0)
1296          {          {
1297          register int i;          register int i;
1298          clock_t time_taken;          clock_t time_taken;
1299          clock_t start_time = clock();          clock_t start_time = clock();
1300          for (i = 0; i < LOOPREPEAT; i++)          for (i = 0; i < timeit; i++)
1301            extra = pcre_study(re, study_options, &error);            extra = pcre_study(re, study_options, &error);
1302          time_taken = clock() - start_time;          time_taken = clock() - start_time;
1303          if (extra != NULL) free(extra);          if (extra != NULL) free(extra);
1304          fprintf(outfile, "  Study time %.3f milliseconds\n",          fprintf(outfile, "  Study time %.4f milliseconds\n",
1305            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeit) /
1306              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
1307          }          }
1308        extra = pcre_study(re, study_options, &error);        extra = pcre_study(re, study_options, &error);
# Line 959  while (!done) Line 1345  while (!done)
1345    
1346      SHOW_INFO:      SHOW_INFO:
1347    
1348        if (do_debug)
1349          {
1350          fprintf(outfile, "------------------------------------------------------------------\n");
1351          pcre_printint(re, outfile, debug_lengths);
1352          }
1353    
1354      if (do_showinfo)      if (do_showinfo)
1355        {        {
1356        unsigned long int get_options, all_options;        unsigned long int get_options, all_options;
1357    #if !defined NOINFOCHECK
1358        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1359        int count, backrefmax, first_char, need_char;  #endif
1360          int count, backrefmax, first_char, need_char, okpartial, jchanged,
1361            hascrorlf;
1362        int nameentrysize, namecount;        int nameentrysize, namecount;
1363        const uschar *nametable;        const uschar *nametable;
1364    
       if (do_debug)  
         {  
         fprintf(outfile, "------------------------------------------------------------------\n");  
         _pcre_printint(re, outfile);  
         }  
   
1365        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1366        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
1367        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
# Line 982  while (!done) Line 1371  while (!done)
1371        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1372        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1373        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1374          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1375          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1376          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
1377    
1378    #if !defined NOINFOCHECK
1379        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
1380        if (count < 0) fprintf(outfile,        if (count < 0) fprintf(outfile,
1381          "Error %d from pcre_info()\n", count);          "Error %d from pcre_info()\n", count);
# Line 1000  while (!done) Line 1393  while (!done)
1393            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
1394              get_options, old_options);              get_options, old_options);
1395          }          }
1396    #endif
1397    
1398        if (size != regex_gotten_store) fprintf(outfile,        if (size != regex_gotten_store) fprintf(outfile,
1399          "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 1415  while (!done)
1415            }            }
1416          }          }
1417    
1418        /* The NOPARTIAL bit is a private bit in the options, so we have        if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1419        to fish it out via out back door */        if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
1420    
1421        all_options = ((real_pcre *)re)->options;        all_options = ((real_pcre *)re)->options;
1422        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");  
1423    
1424        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1425          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\n",
1426            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1427            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1428            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
# Line 1044  while (!done) Line 1432  while (!done)
1432            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1433            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1434            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1435              ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1436            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1437            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "");            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1438              ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1439    
1440          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1441    
1442          switch (get_options & PCRE_NEWLINE_BITS)
1443            {
1444            case PCRE_NEWLINE_CR:
1445            fprintf(outfile, "Forced newline sequence: CR\n");
1446            break;
1447    
1448            case PCRE_NEWLINE_LF:
1449            fprintf(outfile, "Forced newline sequence: LF\n");
1450            break;
1451    
1452            case PCRE_NEWLINE_CRLF:
1453            fprintf(outfile, "Forced newline sequence: CRLF\n");
1454            break;
1455    
1456            case PCRE_NEWLINE_ANYCRLF:
1457            fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1458            break;
1459    
1460            case PCRE_NEWLINE_ANY:
1461            fprintf(outfile, "Forced newline sequence: ANY\n");
1462            break;
1463    
1464        if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)          default:
1465          fprintf(outfile, "Case state changes\n");          break;
1466            }
1467    
1468        if (first_char == -1)        if (first_char == -1)
1469          {          {
1470          fprintf(outfile, "First char at start or follows \\n\n");          fprintf(outfile, "First char at start or follows newline\n");
1471          }          }
1472        else if (first_char < 0)        else if (first_char < 0)
1473          {          {
# Line 1063  while (!done) Line 1478  while (!done)
1478          int ch = first_char & 255;          int ch = first_char & 255;
1479          const char *caseless = ((first_char & REQ_CASELESS) == 0)?          const char *caseless = ((first_char & REQ_CASELESS) == 0)?
1480            "" : " (caseless)";            "" : " (caseless)";
1481          if (isprint(ch))          if (PRINTHEX(ch))
1482            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
1483          else          else
1484            fprintf(outfile, "First char = %d%s\n", ch, caseless);            fprintf(outfile, "First char = %d%s\n", ch, caseless);
# Line 1078  while (!done) Line 1493  while (!done)
1493          int ch = need_char & 255;          int ch = need_char & 255;
1494          const char *caseless = ((need_char & REQ_CASELESS) == 0)?          const char *caseless = ((need_char & REQ_CASELESS) == 0)?
1495            "" : " (caseless)";            "" : " (caseless)";
1496          if (isprint(ch))          if (PRINTHEX(ch))
1497            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
1498          else          else
1499            fprintf(outfile, "Need char = %d%s\n", ch, caseless);            fprintf(outfile, "Need char = %d%s\n", ch, caseless);
# Line 1114  while (!done) Line 1529  while (!done)
1529                    fprintf(outfile, "\n  ");                    fprintf(outfile, "\n  ");
1530                    c = 2;                    c = 2;
1531                    }                    }
1532                  if (isprint(i) && i != ' ')                  if (PRINTHEX(i) && i != ' ')
1533                    {                    {
1534                    fprintf(outfile, "%c ", i);                    fprintf(outfile, "%c ", i);
1535                    c += 2;                    c += 2;
# Line 1173  while (!done) Line 1588  while (!done)
1588                  strerror(errno));                  strerror(errno));
1589                }                }
1590              else fprintf(outfile, "Study data written to %s\n", to_file);              else fprintf(outfile, "Study data written to %s\n", to_file);
1591    
1592              }              }
1593            }            }
1594          fclose(f);          fclose(f);
# Line 1189  while (!done) Line 1605  while (!done)
1605    
1606    for (;;)    for (;;)
1607      {      {
1608      unsigned char *q;      uschar *q;
1609      unsigned char *bptr = dbuffer;      uschar *bptr;
1610      int *use_offsets = offsets;      int *use_offsets = offsets;
1611      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1612      int callout_data = 0;      int callout_data = 0;
# Line 1207  while (!done) Line 1623  while (!done)
1623    
1624      options = 0;      options = 0;
1625    
1626        *copynames = 0;
1627        *getnames = 0;
1628    
1629        copynamesptr = copynames;
1630        getnamesptr = getnames;
1631    
1632      pcre_callout = callout;      pcre_callout = callout;
1633      first_callout = 1;      first_callout = 1;
1634      callout_extra = 0;      callout_extra = 0;
# Line 1215  while (!done) Line 1637  while (!done)
1637      callout_fail_id = -1;      callout_fail_id = -1;
1638      show_malloc = 0;      show_malloc = 0;
1639    
1640      if (infile == stdin) printf("data> ");      if (extra != NULL) extra->flags &=
1641      if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)        ~(PCRE_EXTRA_MATCH_LIMIT|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
1642    
1643        len = 0;
1644        for (;;)
1645        {        {
1646        done = 1;        if (infile == stdin) printf("data> ");
1647        goto CONTINUE;        if (extend_inputline(infile, buffer + len) == NULL)
1648            {
1649            if (len > 0) break;
1650            done = 1;
1651            goto CONTINUE;
1652            }
1653          if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1654          len = (int)strlen((char *)buffer);
1655          if (buffer[len-1] == '\n') break;
1656        }        }
     if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);  
1657    
     len = (int)strlen((char *)buffer);  
1658      while (len > 0 && isspace(buffer[len-1])) len--;      while (len > 0 && isspace(buffer[len-1])) len--;
1659      buffer[len] = 0;      buffer[len] = 0;
1660      if (len == 0) break;      if (len == 0) break;
# Line 1231  while (!done) Line 1662  while (!done)
1662      p = buffer;      p = buffer;
1663      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1664    
1665      q = dbuffer;      bptr = q = dbuffer;
1666      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1667        {        {
1668        int i = 0;        int i = 0;
# Line 1253  while (!done) Line 1684  while (!done)
1684          c -= '0';          c -= '0';
1685          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
1686            c = c * 8 + *p++ - '0';            c = c * 8 + *p++ - '0';
1687    
1688    #if !defined NOUTF8
1689            if (use_utf8 && c > 255)
1690              {
1691              unsigned char buff8[8];
1692              int ii, utn;
1693              utn = ord2utf8(c, buff8);
1694              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1695              c = buff8[ii];   /* Last byte */
1696              }
1697    #endif
1698          break;          break;
1699    
1700          case 'x':          case 'x':
1701    
1702          /* Handle \x{..} specially - new Perl thing for utf8 */          /* Handle \x{..} specially - new Perl thing for utf8 */
1703    
1704    #if !defined NOUTF8
1705          if (*p == '{')          if (*p == '{')
1706            {            {
1707            unsigned char *pt = p;            unsigned char *pt = p;
# Line 1269  while (!done) Line 1712  while (!done)
1712              {              {
1713              unsigned char buff8[8];              unsigned char buff8[8];
1714              int ii, utn;              int ii, utn;
1715              utn = _pcre_ord2utf8(c, buff8);              utn = ord2utf8(c, buff8);
1716              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1717              c = buff8[ii];   /* Last byte */              c = buff8[ii];   /* Last byte */
1718              p = pt + 1;              p = pt + 1;
# Line 1277  while (!done) Line 1720  while (!done)
1720              }              }
1721            /* Not correct form; fall through */            /* Not correct form; fall through */
1722            }            }
1723    #endif
1724    
1725          /* Ordinary \x */          /* Ordinary \x */
1726    
# Line 1312  while (!done) Line 1756  while (!done)
1756            }            }
1757          else if (isalnum(*p))          else if (isalnum(*p))
1758            {            {
1759            uschar name[256];            uschar *npp = copynamesptr;
           uschar *npp = name;  
1760            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1761              *npp++ = 0;
1762            *npp = 0;            *npp = 0;
1763            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)copynamesptr);
1764            if (n < 0)            if (n < 0)
1765              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
1766            else copystrings |= 1 << n;            copynamesptr = npp;
1767            }            }
1768          else if (*p == '+')          else if (*p == '+')
1769            {            {
# Line 1357  while (!done) Line 1801  while (!done)
1801            }            }
1802          continue;          continue;
1803    
1804    #if !defined NODFA
1805          case 'D':          case 'D':
1806    #if !defined NOPOSIX
1807          if (posix || do_posix)          if (posix || do_posix)
1808            printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");            printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");
1809          else          else
1810    #endif
1811            use_dfa = 1;            use_dfa = 1;
1812          continue;          continue;
1813    
1814          case 'F':          case 'F':
1815          options |= PCRE_DFA_SHORTEST;          options |= PCRE_DFA_SHORTEST;
1816          continue;          continue;
1817    #endif
1818    
1819          case 'G':          case 'G':
1820          if (isdigit(*p))          if (isdigit(*p))
# Line 1376  while (!done) Line 1824  while (!done)
1824            }            }
1825          else if (isalnum(*p))          else if (isalnum(*p))
1826            {            {
1827            uschar name[256];            uschar *npp = getnamesptr;
           uschar *npp = name;  
1828            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1829              *npp++ = 0;
1830            *npp = 0;            *npp = 0;
1831            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)getnamesptr);
1832            if (n < 0)            if (n < 0)
1833              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
1834            else getstrings |= 1 << n;            getnamesptr = npp;
1835            }            }
1836          continue;          continue;
1837    
# Line 1409  while (!done) Line 1857  while (!done)
1857            if (offsets == NULL)            if (offsets == NULL)
1858              {              {
1859              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
1860                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
1861              yield = 1;              yield = 1;
1862              goto EXIT;              goto EXIT;
1863              }              }
# Line 1422  while (!done) Line 1870  while (!done)
1870          options |= PCRE_PARTIAL;          options |= PCRE_PARTIAL;
1871          continue;          continue;
1872    
1873            case 'Q':
1874            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1875            if (extra == NULL)
1876              {
1877              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1878              extra->flags = 0;
1879              }
1880            extra->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
1881            extra->match_limit_recursion = n;
1882            continue;
1883    
1884            case 'q':
1885            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1886            if (extra == NULL)
1887              {
1888              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1889              extra->flags = 0;
1890              }
1891            extra->flags |= PCRE_EXTRA_MATCH_LIMIT;
1892            extra->match_limit = n;
1893            continue;
1894    
1895    #if !defined NODFA
1896          case 'R':          case 'R':
1897          options |= PCRE_DFA_RESTART;          options |= PCRE_DFA_RESTART;
1898          continue;          continue;
1899    #endif
1900    
1901          case 'S':          case 'S':
1902          show_malloc = 1;          show_malloc = 1;
# Line 1437  while (!done) Line 1909  while (!done)
1909          case '?':          case '?':
1910          options |= PCRE_NO_UTF8_CHECK;          options |= PCRE_NO_UTF8_CHECK;
1911          continue;          continue;
1912    
1913            case '<':
1914              {
1915              int x = check_newline(p, outfile);
1916              if (x == 0) goto NEXT_DATA;
1917              options |= x;
1918              while (*p++ != '>');
1919              }
1920            continue;
1921          }          }
1922        *q++ = c;        *q++ = c;
1923        }        }
# Line 1467  while (!done) Line 1948  while (!done)
1948    
1949        if (rc != 0)        if (rc != 0)
1950          {          {
1951          (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);          (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1952          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
1953          }          }
1954          else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)
1955                  != 0)
1956            {
1957            fprintf(outfile, "Matched with REG_NOSUB\n");
1958            }
1959        else        else
1960          {          {
1961          size_t i;          size_t i;
# Line 1501  while (!done) Line 1987  while (!done)
1987    
1988      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
1989        {        {
1990        if (timeit)        if (timeitm > 0)
1991          {          {
1992          register int i;          register int i;
1993          clock_t time_taken;          clock_t time_taken;
1994          clock_t start_time = clock();          clock_t start_time = clock();
1995    
1996    #if !defined NODFA
1997          if (all_use_dfa || use_dfa)          if (all_use_dfa || use_dfa)
1998            {            {
1999            int workspace[1000];            int workspace[1000];
2000            for (i = 0; i < LOOPREPEAT; i++)            for (i = 0; i < timeitm; i++)
2001              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
2002                options | g_notempty, use_offsets, use_size_offsets, workspace,                options | g_notempty, use_offsets, use_size_offsets, workspace,
2003                sizeof(workspace)/sizeof(int));                sizeof(workspace)/sizeof(int));
2004            }            }
2005          else          else
2006    #endif
2007    
2008          for (i = 0; i < LOOPREPEAT; i++)          for (i = 0; i < timeitm; i++)
2009            count = pcre_exec(re, extra, (char *)bptr, len,            count = pcre_exec(re, extra, (char *)bptr, len,
2010              start_offset, options | g_notempty, use_offsets, use_size_offsets);              start_offset, options | g_notempty, use_offsets, use_size_offsets);
2011    
2012          time_taken = clock() - start_time;          time_taken = clock() - start_time;
2013          fprintf(outfile, "Execute time %.3f milliseconds\n",          fprintf(outfile, "Execute time %.4f milliseconds\n",
2014            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeitm) /
2015              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
2016          }          }
2017    
2018        /* 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
2019        varying limits in order to find the minimum value. */        varying limits in order to find the minimum value for the match limit and
2020          for the recursion limit. */
2021    
2022        if (find_match_limit)        if (find_match_limit)
2023          {          {
         int min = 0;  
         int mid = 64;  
         int max = -1;  
   
2024          if (extra == NULL)          if (extra == NULL)
2025            {            {
2026            extra = (pcre_extra *)malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2027            extra->flags = 0;            extra->flags = 0;
2028            }            }
         extra->flags |= PCRE_EXTRA_MATCH_LIMIT;  
2029    
2030          for (;;)          (void)check_match_limit(re, extra, bptr, len, start_offset,
2031            {            options|g_notempty, use_offsets, use_size_offsets,
2032            extra->match_limit = mid;            PCRE_EXTRA_MATCH_LIMIT, &(extra->match_limit),
2033            count = pcre_exec(re, extra, (char *)bptr, len, start_offset,            PCRE_ERROR_MATCHLIMIT, "match()");
2034              options | g_notempty, use_offsets, use_size_offsets);  
2035            if (count == PCRE_ERROR_MATCHLIMIT)          count = check_match_limit(re, extra, bptr, len, start_offset,
2036              {            options|g_notempty, use_offsets, use_size_offsets,
2037              /* fprintf(outfile, "Testing match limit = %d\n", mid); */            PCRE_EXTRA_MATCH_LIMIT_RECURSION, &(extra->match_limit_recursion),
2038              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;  
2039          }          }
2040    
2041        /* 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 2057  while (!done)
2057        /* 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
2058        value of match_limit. */        value of match_limit. */
2059    
2060    #if !defined NODFA
2061        else if (all_use_dfa || use_dfa)        else if (all_use_dfa || use_dfa)
2062          {          {
2063          int workspace[1000];          int workspace[1000];
# Line 1603  while (!done) Line 2070  while (!done)
2070            count = use_size_offsets/2;            count = use_size_offsets/2;
2071            }            }
2072          }          }
2073    #endif
2074    
2075        else        else
2076          {          {
# Line 1619  while (!done) Line 2087  while (!done)
2087    
2088        if (count >= 0)        if (count >= 0)
2089          {          {
2090          int i;          int i, maxcount;
2091    
2092    #if !defined NODFA
2093            if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
2094    #endif
2095              maxcount = use_size_offsets/3;
2096    
2097            /* This is a check against a lunatic return value. */
2098    
2099            if (count > maxcount)
2100              {
2101              fprintf(outfile,
2102                "** PCRE error: returned count %d is too big for offset size %d\n",
2103                count, use_size_offsets);
2104              count = use_size_offsets/3;
2105              if (do_g || do_G)
2106                {
2107                fprintf(outfile, "** /%c loop abandoned\n", do_g? 'g' : 'G');
2108                do_g = do_G = FALSE;        /* Break g/G loop */
2109                }
2110              }
2111    
2112          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
2113            {            {
2114            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
# Line 1647  while (!done) Line 2136  while (!done)
2136            {            {
2137            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
2138              {              {
2139              char copybuffer[16];              char copybuffer[256];
2140              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,
2141                i, copybuffer, sizeof(copybuffer));                i, copybuffer, sizeof(copybuffer));
2142              if (rc < 0)              if (rc < 0)
# Line 1657  while (!done) Line 2146  while (!done)
2146              }              }
2147            }            }
2148    
2149            for (copynamesptr = copynames;
2150                 *copynamesptr != 0;
2151                 copynamesptr += (int)strlen((char*)copynamesptr) + 1)
2152              {
2153              char copybuffer[256];
2154              int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
2155                count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));
2156              if (rc < 0)
2157                fprintf(outfile, "copy substring %s failed %d\n", copynamesptr, rc);
2158              else
2159                fprintf(outfile, "  C %s (%d) %s\n", copybuffer, rc, copynamesptr);
2160              }
2161    
2162          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2163            {            {
2164            if ((getstrings & (1 << i)) != 0)            if ((getstrings & (1 << i)) != 0)
# Line 1669  while (!done) Line 2171  while (!done)
2171              else              else
2172                {                {
2173                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
               /* free((void *)substring); */  
2174                pcre_free_substring(substring);                pcre_free_substring(substring);
2175                }                }
2176              }              }
2177            }            }
2178    
2179            for (getnamesptr = getnames;
2180                 *getnamesptr != 0;
2181                 getnamesptr += (int)strlen((char*)getnamesptr) + 1)
2182              {
2183              const char *substring;
2184              int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
2185                count, (char *)getnamesptr, &substring);
2186              if (rc < 0)
2187                fprintf(outfile, "copy substring %s failed %d\n", getnamesptr, rc);
2188              else
2189                {
2190                fprintf(outfile, "  G %s (%d) %s\n", substring, rc, getnamesptr);
2191                pcre_free_substring(substring);
2192                }
2193              }
2194    
2195          if (getlist)          if (getlist)
2196            {            {
2197            const char **stringlist;            const char **stringlist;
# Line 1699  while (!done) Line 2216  while (!done)
2216        else if (count == PCRE_ERROR_PARTIAL)        else if (count == PCRE_ERROR_PARTIAL)
2217          {          {
2218          fprintf(outfile, "Partial match");          fprintf(outfile, "Partial match");
2219    #if !defined NODFA
2220          if ((all_use_dfa || use_dfa) && use_size_offsets > 2)          if ((all_use_dfa || use_dfa) && use_size_offsets > 2)
2221            fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],            fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],
2222              bptr + use_offsets[0]);              bptr + use_offsets[0]);
2223    #endif
2224          fprintf(outfile, "\n");          fprintf(outfile, "\n");
2225          break;  /* Out of the /g loop */          break;  /* Out of the /g loop */
2226          }          }
2227    
2228        /* 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
2229        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
2230        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
2231        matching, the advance must be one character, not one byte. Fudge the        string - that was checked before setting g_notempty.
2232        offset values to achieve this. We won't be at the end of the string -  
2233        that was checked before setting g_notempty. */        Complication arises in the case when the newline option is "any" or
2234          "anycrlf". If the previous match was at the end of a line terminated by
2235          CRLF, an advance of one character just passes the \r, whereas we should
2236          prefer the longer newline sequence, as does the code in pcre_exec().
2237          Fudge the offset value to achieve this.
2238    
2239          Otherwise, in the case of UTF-8 matching, the advance must be one
2240          character, not one byte. */
2241    
2242        else        else
2243          {          {
2244          if (g_notempty != 0)          if (g_notempty != 0)
2245            {            {
2246            int onechar = 1;            int onechar = 1;
2247              unsigned int obits = ((real_pcre *)re)->options;
2248            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2249            if (use_utf8)            if ((obits & PCRE_NEWLINE_BITS) == 0)
2250                {
2251                int d;
2252                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2253                obits = (d == '\r')? PCRE_NEWLINE_CR :
2254                        (d == '\n')? PCRE_NEWLINE_LF :
2255                        (d == ('\r'<<8 | '\n'))? PCRE_NEWLINE_CRLF :
2256                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2257                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2258                }
2259              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2260                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2261                  &&
2262                  start_offset < len - 1 &&
2263                  bptr[start_offset] == '\r' &&
2264                  bptr[start_offset+1] == '\n')
2265                onechar++;
2266              else if (use_utf8)
2267              {              {
2268              while (start_offset + onechar < len)              while (start_offset + onechar < len)
2269                {                {
# Line 1754  while (!done) Line 2298  while (!done)
2298        character. */        character. */
2299    
2300        g_notempty = 0;        g_notempty = 0;
2301    
2302        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2303          {          {
2304          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
# Line 1772  while (!done) Line 2317  while (!done)
2317          len -= use_offsets[1];          len -= use_offsets[1];
2318          }          }
2319        }  /* End of loop for /g and /G */        }  /* End of loop for /g and /G */
2320    
2321        NEXT_DATA: continue;
2322      }    /* End of loop for data lines */      }    /* End of loop for data lines */
2323    
2324    CONTINUE:    CONTINUE:
# Line 1786  while (!done) Line 2333  while (!done)
2333      {      {
2334      new_free((void *)tables);      new_free((void *)tables);
2335      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
2336        locale_set = 0;
2337      }      }
2338    }    }
2339    

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

  ViewVC Help
Powered by ViewVC 1.1.5