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

Legend:
Removed from v.79  
changed lines
  Added in v.240

  ViewVC Help
Powered by ViewVC 1.1.5