/[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 87 by nigel, Sat Feb 24 21:41:21 2007 UTC revision 411 by ph10, Fri Apr 10 15:40:21 2009 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    
51  #define PCRE_SPY        /* For Win32 build, import data, not export */  #ifdef SUPPORT_LIBREADLINE
52    #ifdef HAVE_UNISTD_H
53    #include <unistd.h>
54    #endif
55    #include <readline/readline.h>
56    #include <readline/history.h>
57    #endif
58    
 /* We include pcre_internal.h because we need the internal info for displaying  
 the results of pcre_study() and we also need to know about the internal  
 macros, structures, and other internal data values; pcretest has "inside  
 information" compared to a program that strictly follows the PCRE API. */  
59    
60    /* A number of things vary for Windows builds. Originally, pcretest opened its
61    input and output without "b"; then I was told that "b" was needed in some
62    environments, so it was added for release 5.0 to both the input and output. (It
63    makes no difference on Unix-like systems.) Later I was told that it is wrong
64    for the input on Windows. I've now abstracted the modes into two macros that
65    are set here, to make it easier to fiddle with them, and removed "b" from the
66    input mode under Windows. */
67    
68    #if defined(_WIN32) || defined(WIN32)
69    #include <io.h>                /* For _setmode() */
70    #include <fcntl.h>             /* For _O_BINARY */
71    #define INPUT_MODE   "r"
72    #define OUTPUT_MODE  "wb"
73    
74    #ifndef isatty
75    #define isatty _isatty         /* This is what Windows calls them, I'm told, */
76    #endif                         /* though in some environments they seem to   */
77                                   /* be already defined, hence the #ifndefs.    */
78    #ifndef fileno
79    #define fileno _fileno
80    #endif
81    
82    #else
83    #include <sys/time.h>          /* These two includes are needed */
84    #include <sys/resource.h>      /* for setrlimit(). */
85    #define INPUT_MODE   "rb"
86    #define OUTPUT_MODE  "wb"
87    #endif
88    
89    
90    /* We have to include pcre_internal.h because we need the internal info for
91    displaying the results of pcre_study() and we also need to know about the
92    internal macros, structures, and other internal data values; pcretest has
93    "inside information" compared to a program that strictly follows the PCRE API.
94    
95    Although pcre_internal.h does itself include pcre.h, we explicitly include it
96    here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
97    appropriately for an application, not for building PCRE. */
98    
99    #include "pcre.h"
100  #include "pcre_internal.h"  #include "pcre_internal.h"
101    
102  /* We need access to the data tables that PCRE uses. So as not to have to keep  /* We need access to some of the data tables that PCRE uses. So as not to have
103  two copies, we include the source file here, changing the names of the external  to keep two copies, we include the source file here, changing the names of the
104  symbols to prevent clashes. */  external symbols to prevent clashes. */
105    
106    #define _pcre_ucp_gentype      ucp_gentype
107  #define _pcre_utf8_table1      utf8_table1  #define _pcre_utf8_table1      utf8_table1
108  #define _pcre_utf8_table1_size utf8_table1_size  #define _pcre_utf8_table1_size utf8_table1_size
109  #define _pcre_utf8_table2      utf8_table2  #define _pcre_utf8_table2      utf8_table2
# Line 64  symbols to prevent clashes. */ Line 111  symbols to prevent clashes. */
111  #define _pcre_utf8_table4      utf8_table4  #define _pcre_utf8_table4      utf8_table4
112  #define _pcre_utt              utt  #define _pcre_utt              utt
113  #define _pcre_utt_size         utt_size  #define _pcre_utt_size         utt_size
114    #define _pcre_utt_names        utt_names
115  #define _pcre_OP_lengths       OP_lengths  #define _pcre_OP_lengths       OP_lengths
116    
117  #include "pcre_tables.c"  #include "pcre_tables.c"
118    
119  /* We also need the pcre_printint() function for printing out compiled  /* We also need the pcre_printint() function for printing out compiled
120  patterns. This function is in a separate file so that it can be included in  patterns. This function is in a separate file so that it can be included in
121  pcre_compile.c when that module is compiled with debugging enabled. */  pcre_compile.c when that module is compiled with debugging enabled.
122    
123    The definition of the macro PRINTABLE, which determines whether to print an
124    output character as-is or as a hex value when showing compiled patterns, is
125    contained in this file. We uses it here also, in cases when the locale has not
126    been explicitly changed, so as to get consistent output from systems that
127    differ in their output from isprint() even in the "C" locale. */
128    
129  #include "pcre_printint.src"  #include "pcre_printint.src"
130    
131    #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
132    
133    
134  /* It is possible to compile this test program without including support for  /* It is possible to compile this test program without including support for
135  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 83  Makefile. */ Line 139  Makefile. */
139  #include "pcreposix.h"  #include "pcreposix.h"
140  #endif  #endif
141    
142  /* 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
143  build pcretest without support for UTF8 (define NOUTF8), without the interface  Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
144  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
145  function (define NOINFOCHECK). */  "info" function (define NOINFOCHECK). In fact, we automatically cut out the
146    UTF8 support if PCRE is built without it. */
147    
148    #ifndef SUPPORT_UTF8
149    #ifndef NOUTF8
150    #define NOUTF8
151    #endif
152    #endif
153    
154    
155  /* Other parameters */  /* Other parameters */
# Line 99  function (define NOINFOCHECK). */ Line 162  function (define NOINFOCHECK). */
162  #endif  #endif
163  #endif  #endif
164    
165  #define LOOPREPEAT 500000  /* This is the default loop count for timing. */
   
 #define BUFFER_SIZE 30000  
 #define PBUFFER_SIZE BUFFER_SIZE  
 #define DBUFFER_SIZE BUFFER_SIZE  
166    
167    #define LOOPREPEAT 500000
168    
169  /* Static variables */  /* Static variables */
170    
# Line 114  static int callout_count; Line 174  static int callout_count;
174  static int callout_extra;  static int callout_extra;
175  static int callout_fail_count;  static int callout_fail_count;
176  static int callout_fail_id;  static int callout_fail_id;
177    static int debug_lengths;
178  static int first_callout;  static int first_callout;
179    static int locale_set = 0;
180  static int show_malloc;  static int show_malloc;
181  static int use_utf8;  static int use_utf8;
182  static size_t gotten_store;  static size_t gotten_store;
183    
184    /* The buffers grow automatically if very long input lines are encountered. */
185    
186    static int buffer_size = 50000;
187    static uschar *buffer = NULL;
188    static uschar *dbuffer = NULL;
189  static uschar *pbuffer = NULL;  static uschar *pbuffer = NULL;
190    
191    
192    
193  /*************************************************  /*************************************************
194    *        Read or extend an input line            *
195    *************************************************/
196    
197    /* Input lines are read into buffer, but both patterns and data lines can be
198    continued over multiple input lines. In addition, if the buffer fills up, we
199    want to automatically expand it so as to be able to handle extremely large
200    lines that are needed for certain stress tests. When the input buffer is
201    expanded, the other two buffers must also be expanded likewise, and the
202    contents of pbuffer, which are a copy of the input for callouts, must be
203    preserved (for when expansion happens for a data line). This is not the most
204    optimal way of handling this, but hey, this is just a test program!
205    
206    Arguments:
207      f            the file to read
208      start        where in buffer to start (this *must* be within buffer)
209      prompt       for stdin or readline()
210    
211    Returns:       pointer to the start of new data
212                   could be a copy of start, or could be moved
213                   NULL if no data read and EOF reached
214    */
215    
216    static uschar *
217    extend_inputline(FILE *f, uschar *start, const char *prompt)
218    {
219    uschar *here = start;
220    
221    for (;;)
222      {
223      int rlen = buffer_size - (here - buffer);
224    
225      if (rlen > 1000)
226        {
227        int dlen;
228    
229        /* If libreadline support is required, use readline() to read a line if the
230        input is a terminal. Note that readline() removes the trailing newline, so
231        we must put it back again, to be compatible with fgets(). */
232    
233    #ifdef SUPPORT_LIBREADLINE
234        if (isatty(fileno(f)))
235          {
236          size_t len;
237          char *s = readline(prompt);
238          if (s == NULL) return (here == start)? NULL : start;
239          len = strlen(s);
240          if (len > 0) add_history(s);
241          if (len > rlen - 1) len = rlen - 1;
242          memcpy(here, s, len);
243          here[len] = '\n';
244          here[len+1] = 0;
245          free(s);
246          }
247        else
248    #endif
249    
250        /* Read the next line by normal means, prompting if the file is stdin. */
251    
252          {
253          if (f == stdin) printf(prompt);
254          if (fgets((char *)here, rlen,  f) == NULL)
255            return (here == start)? NULL : start;
256          }
257    
258        dlen = (int)strlen((char *)here);
259        if (dlen > 0 && here[dlen - 1] == '\n') return start;
260        here += dlen;
261        }
262    
263      else
264        {
265        int new_buffer_size = 2*buffer_size;
266        uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);
267        uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);
268        uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);
269    
270        if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
271          {
272          fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
273          exit(1);
274          }
275    
276        memcpy(new_buffer, buffer, buffer_size);
277        memcpy(new_pbuffer, pbuffer, buffer_size);
278    
279        buffer_size = new_buffer_size;
280    
281        start = new_buffer + (start - buffer);
282        here = new_buffer + (here - buffer);
283    
284        free(buffer);
285        free(dbuffer);
286        free(pbuffer);
287    
288        buffer = new_buffer;
289        dbuffer = new_dbuffer;
290        pbuffer = new_pbuffer;
291        }
292      }
293    
294    return NULL;  /* Control never gets here */
295    }
296    
297    
298    
299    
300    
301    
302    
303    /*************************************************
304  *          Read number from string               *  *          Read number from string               *
305  *************************************************/  *************************************************/
306    
307  /* 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
308  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
309  for unpicking the -o argument, so just keep it simple.  for unpicking arguments, so just keep it simple.
310    
311  Arguments:  Arguments:
312    str           string to be converted    str           string to be converted
# Line 159  return(result); Line 336  return(result);
336  and returns the value of the character.  and returns the value of the character.
337    
338  Argument:  Argument:
339    buffer   a pointer to the byte vector    utf8bytes   a pointer to the byte vector
340    vptr     a pointer to an int to receive the value    vptr        a pointer to an int to receive the value
341    
342  Returns:   >  0 => the number of bytes consumed  Returns:      >  0 => the number of bytes consumed
343             -6 to 0 => malformed UTF-8 character at offset = (-return)                -6 to 0 => malformed UTF-8 character at offset = (-return)
344  */  */
345    
346  #if !defined NOUTF8  #if !defined NOUTF8
347    
348  static int  static int
349  utf82ord(unsigned char *buffer, int *vptr)  utf82ord(unsigned char *utf8bytes, int *vptr)
350  {  {
351  int c = *buffer++;  int c = *utf8bytes++;
352  int d = c;  int d = c;
353  int i, j, s;  int i, j, s;
354    
# Line 191  d = (c & utf8_table3[i]) << s; Line 368  d = (c & utf8_table3[i]) << s;
368    
369  for (j = 0; j < i; j++)  for (j = 0; j < i; j++)
370    {    {
371    c = *buffer++;    c = *utf8bytes++;
372    if ((c & 0xc0) != 0x80) return -(j+1);    if ((c & 0xc0) != 0x80) return -(j+1);
373    s -= 6;    s -= 6;
374    d |= (c & 0x3f) << s;    d |= (c & 0x3f) << s;
# Line 222  and encodes it as a UTF-8 character in 0 Line 399  and encodes it as a UTF-8 character in 0
399    
400  Arguments:  Arguments:
401    cvalue     the character value    cvalue     the character value
402    buffer     pointer to buffer for result - at least 6 bytes long    utf8bytes  pointer to buffer for result - at least 6 bytes long
403    
404  Returns:     number of characters placed in the buffer  Returns:     number of characters placed in the buffer
405  */  */
406    
407    #if !defined NOUTF8
408    
409  static int  static int
410  ord2utf8(int cvalue, uschar *buffer)  ord2utf8(int cvalue, uschar *utf8bytes)
411  {  {
412  register int i, j;  register int i, j;
413  for (i = 0; i < utf8_table1_size; i++)  for (i = 0; i < utf8_table1_size; i++)
414    if (cvalue <= utf8_table1[i]) break;    if (cvalue <= utf8_table1[i]) break;
415  buffer += i;  utf8bytes += i;
416  for (j = i; j > 0; j--)  for (j = i; j > 0; j--)
417   {   {
418   *buffer-- = 0x80 | (cvalue & 0x3f);   *utf8bytes-- = 0x80 | (cvalue & 0x3f);
419   cvalue >>= 6;   cvalue >>= 6;
420   }   }
421  *buffer = utf8_table2[i] | cvalue;  *utf8bytes = utf8_table2[i] | cvalue;
422  return i + 1;  return i + 1;
423  }  }
424    
425    #endif
426    
427    
428    
429  /*************************************************  /*************************************************
# Line 269  while (length-- > 0) Line 450  while (length-- > 0)
450        {        {
451        length -= rc - 1;        length -= rc - 1;
452        p += rc;        p += rc;
453        if (c < 256 && isprint(c))        if (PRINTHEX(c))
454          {          {
455          if (f != NULL) fprintf(f, "%c", c);          if (f != NULL) fprintf(f, "%c", c);
456          yield++;          yield++;
457          }          }
458        else        else
459          {          {
460          int n;          int n = 4;
461          if (f != NULL) fprintf(f, "\\x{%02x}%n", c, &n);          if (f != NULL) fprintf(f, "\\x{%02x}", c);
462          yield += n;          yield += (n <= 0x000000ff)? 2 :
463                     (n <= 0x00000fff)? 3 :
464                     (n <= 0x0000ffff)? 4 :
465                     (n <= 0x000fffff)? 5 : 6;
466          }          }
467        continue;        continue;
468        }        }
# Line 287  while (length-- > 0) Line 471  while (length-- > 0)
471    
472     /* Not UTF-8, or malformed UTF-8  */     /* Not UTF-8, or malformed UTF-8  */
473    
474    if (isprint(c = *(p++)))    c = *p++;
475      if (PRINTHEX(c))
476      {      {
477      if (f != NULL) fprintf(f, "%c", c);      if (f != NULL) fprintf(f, "%c", c);
478      yield++;      yield++;
# Line 461  if ((rc = pcre_fullinfo(re, study, optio Line 646  if ((rc = pcre_fullinfo(re, study, optio
646  *         Byte flipping function                 *  *         Byte flipping function                 *
647  *************************************************/  *************************************************/
648    
649  static long int  static unsigned long int
650  byteflip(long int value, int n)  byteflip(unsigned long int value, int n)
651  {  {
652  if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);  if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
653  return ((value & 0x000000ff) << 24) |  return ((value & 0x000000ff) << 24) |
# Line 526  return count; Line 711  return count;
711    
712    
713  /*************************************************  /*************************************************
714    *         Case-independent strncmp() function    *
715    *************************************************/
716    
717    /*
718    Arguments:
719      s         first string
720      t         second string
721      n         number of characters to compare
722    
723    Returns:    < 0, = 0, or > 0, according to the comparison
724    */
725    
726    static int
727    strncmpic(uschar *s, uschar *t, int n)
728    {
729    while (n--)
730      {
731      int c = tolower(*s++) - tolower(*t++);
732      if (c) return c;
733      }
734    return 0;
735    }
736    
737    
738    
739    /*************************************************
740    *         Check newline indicator                *
741    *************************************************/
742    
743    /* This is used both at compile and run-time to check for <xxx> escapes, where
744    xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
745    no match.
746    
747    Arguments:
748      p           points after the leading '<'
749      f           file for error message
750    
751    Returns:      appropriate PCRE_NEWLINE_xxx flags, or 0
752    */
753    
754    static int
755    check_newline(uschar *p, FILE *f)
756    {
757    if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
758    if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
759    if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
760    if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
761    if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
762    if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
763    if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
764    fprintf(f, "Unknown newline type at: <%s\n", p);
765    return 0;
766    }
767    
768    
769    
770    /*************************************************
771    *             Usage function                     *
772    *************************************************/
773    
774    static void
775    usage(void)
776    {
777    printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
778    printf("Input and output default to stdin and stdout.\n");
779    #ifdef SUPPORT_LIBREADLINE
780    printf("If input is a terminal, readline() is used to read from it.\n");
781    #else
782    printf("This version of pcretest is not linked with readline().\n");
783    #endif
784    printf("\nOptions:\n");
785    printf("  -b       show compiled code (bytecode)\n");
786    printf("  -C       show PCRE compile-time options and exit\n");
787    printf("  -d       debug: show compiled code and information (-b and -i)\n");
788    #if !defined NODFA
789    printf("  -dfa     force DFA matching for all subjects\n");
790    #endif
791    printf("  -help    show usage information\n");
792    printf("  -i       show information about compiled patterns\n"
793           "  -M       find MATCH_LIMIT minimum for each subject\n"
794           "  -m       output memory used information\n"
795           "  -o <n>   set size of offsets vector to <n>\n");
796    #if !defined NOPOSIX
797    printf("  -p       use POSIX interface\n");
798    #endif
799    printf("  -q       quiet: do not output PCRE version number at start\n");
800    printf("  -S <n>   set stack size to <n> megabytes\n");
801    printf("  -s       output store (memory) used information\n"
802           "  -t       time compilation and execution\n");
803    printf("  -t <n>   time compilation and execution, repeating <n> times\n");
804    printf("  -tm      time execution (matching) only\n");
805    printf("  -tm <n>  time execution (matching) only, repeating <n> times\n");
806    }
807    
808    
809    
810    /*************************************************
811  *                Main Program                    *  *                Main Program                    *
812  *************************************************/  *************************************************/
813    
# Line 538  int main(int argc, char **argv) Line 820  int main(int argc, char **argv)
820  FILE *infile = stdin;  FILE *infile = stdin;
821  int options = 0;  int options = 0;
822  int study_options = 0;  int study_options = 0;
823    int default_find_match_limit = FALSE;
824  int op = 1;  int op = 1;
825  int timeit = 0;  int timeit = 0;
826    int timeitm = 0;
827  int showinfo = 0;  int showinfo = 0;
828  int showstore = 0;  int showstore = 0;
829  int quiet = 0;  int quiet = 0;
# Line 553  int debug = 0; Line 837  int debug = 0;
837  int done = 0;  int done = 0;
838  int all_use_dfa = 0;  int all_use_dfa = 0;
839  int yield = 0;  int yield = 0;
840    int stack_size;
841    
842  unsigned char *buffer;  /* These vectors store, end-to-end, a list of captured substring names. Assume
843  unsigned char *dbuffer;  that 1024 is plenty long enough for the few names we'll be testing. */
844    
845    uschar copynames[1024];
846    uschar getnames[1024];
847    
848    uschar *copynamesptr;
849    uschar *getnamesptr;
850    
851  /* Get buffers from malloc() so that Electric Fence will check their misuse  /* Get buffers from malloc() so that Electric Fence will check their misuse
852  when I am debugging. */  when I am debugging. They grow automatically when very long lines are read. */
853    
854  buffer = (unsigned char *)malloc(BUFFER_SIZE);  buffer = (unsigned char *)malloc(buffer_size);
855  dbuffer = (unsigned char *)malloc(DBUFFER_SIZE);  dbuffer = (unsigned char *)malloc(buffer_size);
856  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.  */  
857    
858  #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) */  
859    
860  outfile = stdout;  outfile = stdout;
861    
862    /* The following  _setmode() stuff is some Windows magic that tells its runtime
863    library to translate CRLF into a single LF character. At least, that's what
864    I've been told: never having used Windows I take this all on trust. Originally
865    it set 0x8000, but then I was advised that _O_BINARY was better. */
866    
867    #if defined(_WIN32) || defined(WIN32)
868    _setmode( _fileno( stdout ), _O_BINARY );
869    #endif
870    
871  /* Scan options */  /* Scan options */
872    
873  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
# Line 582  while (argc > 1 && argv[op][0] == '-') Line 876  while (argc > 1 && argv[op][0] == '-')
876    
877    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
878      showstore = 1;      showstore = 1;
   else if (strcmp(argv[op], "-t") == 0) timeit = 1;  
879    else if (strcmp(argv[op], "-q") == 0) quiet = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
880      else if (strcmp(argv[op], "-b") == 0) debug = 1;
881    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
882    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
883      else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;
884  #if !defined NODFA  #if !defined NODFA
885    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;    else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
886  #endif  #endif
# Line 596  while (argc > 1 && argv[op][0] == '-') Line 891  while (argc > 1 && argv[op][0] == '-')
891      op++;      op++;
892      argc--;      argc--;
893      }      }
894      else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
895        {
896        int both = argv[op][2] == 0;
897        int temp;
898        if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
899                         *endptr == 0))
900          {
901          timeitm = temp;
902          op++;
903          argc--;
904          }
905        else timeitm = LOOPREPEAT;
906        if (both) timeit = timeitm;
907        }
908      else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
909          ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
910            *endptr == 0))
911        {
912    #if defined(_WIN32) || defined(WIN32)
913        printf("PCRE: -S not supported on this OS\n");
914        exit(1);
915    #else
916        int rc;
917        struct rlimit rlim;
918        getrlimit(RLIMIT_STACK, &rlim);
919        rlim.rlim_cur = stack_size * 1024 * 1024;
920        rc = setrlimit(RLIMIT_STACK, &rlim);
921        if (rc != 0)
922          {
923        printf("PCRE: setrlimit() failed with error %d\n", rc);
924        exit(1);
925          }
926        op++;
927        argc--;
928    #endif
929        }
930  #if !defined NOPOSIX  #if !defined NOPOSIX
931    else if (strcmp(argv[op], "-p") == 0) posix = 1;    else if (strcmp(argv[op], "-p") == 0) posix = 1;
932  #endif  #endif
933    else if (strcmp(argv[op], "-C") == 0)    else if (strcmp(argv[op], "-C") == 0)
934      {      {
935      int rc;      int rc;
936        unsigned long int lrc;
937      printf("PCRE version %s\n", pcre_version());      printf("PCRE version %s\n", pcre_version());
938      printf("Compiled with\n");      printf("Compiled with\n");
939      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
# Line 609  while (argc > 1 && argv[op][0] == '-') Line 941  while (argc > 1 && argv[op][0] == '-')
941      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
942      printf("  %sUnicode properties support\n", rc? "" : "No ");      printf("  %sUnicode properties support\n", rc? "" : "No ");
943      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
944      printf("  Newline character is %s\n", (rc == '\r')? "CR" : "LF");      /* Note that these values are always the ASCII values, even
945        in EBCDIC environments. CR is 13 and NL is 10. */
946        printf("  Newline sequence is %s\n", (rc == 13)? "CR" :
947          (rc == 10)? "LF" : (rc == (13<<8 | 10))? "CRLF" :
948          (rc == -2)? "ANYCRLF" :
949          (rc == -1)? "ANY" : "???");
950        (void)pcre_config(PCRE_CONFIG_BSR, &rc);
951        printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
952                                         "all Unicode newlines");
953      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
954      printf("  Internal link size = %d\n", rc);      printf("  Internal link size = %d\n", rc);
955      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);      (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
956      printf("  POSIX malloc threshold = %d\n", rc);      printf("  POSIX malloc threshold = %d\n", rc);
957      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &lrc);
958      printf("  Default match limit = %d\n", rc);      printf("  Default match limit = %ld\n", lrc);
959      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
960      printf("  Default recursion depth limit = %d\n", rc);      printf("  Default recursion depth limit = %ld\n", lrc);
961      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);      (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
962      printf("  Match recursion uses %s\n", rc? "stack" : "heap");      printf("  Match recursion uses %s\n", rc? "stack" : "heap");
963      exit(0);      goto EXIT;
964        }
965      else if (strcmp(argv[op], "-help") == 0 ||
966               strcmp(argv[op], "--help") == 0)
967        {
968        usage();
969        goto EXIT;
970      }      }
971    else    else
972      {      {
973      printf("** Unknown or malformed option %s\n", argv[op]);      printf("** Unknown or malformed option %s\n", argv[op]);
974      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");  
975      yield = 1;      yield = 1;
976      goto EXIT;      goto EXIT;
977      }      }
# Line 653  offsets = (int *)malloc(size_offsets_max Line 986  offsets = (int *)malloc(size_offsets_max
986  if (offsets == NULL)  if (offsets == NULL)
987    {    {
988    printf("** Failed to get %d bytes of memory for offsets vector\n",    printf("** Failed to get %d bytes of memory for offsets vector\n",
989      size_offsets_max * sizeof(int));      (int)(size_offsets_max * sizeof(int)));
990    yield = 1;    yield = 1;
991    goto EXIT;    goto EXIT;
992    }    }
# Line 662  if (offsets == NULL) Line 995  if (offsets == NULL)
995    
996  if (argc > 1)  if (argc > 1)
997    {    {
998    infile = fopen(argv[op], "rb");    infile = fopen(argv[op], INPUT_MODE);
999    if (infile == NULL)    if (infile == NULL)
1000      {      {
1001      printf("** Failed to open %s\n", argv[op]);      printf("** Failed to open %s\n", argv[op]);
# Line 673  if (argc > 1) Line 1006  if (argc > 1)
1006    
1007  if (argc > 2)  if (argc > 2)
1008    {    {
1009    outfile = fopen(argv[op+1], "wb");    outfile = fopen(argv[op+1], OUTPUT_MODE);
1010    if (outfile == NULL)    if (outfile == NULL)
1011      {      {
1012      printf("** Failed to open %s\n", argv[op+1]);      printf("** Failed to open %s\n", argv[op+1]);
# Line 718  while (!done) Line 1051  while (!done)
1051    int do_showinfo = showinfo;    int do_showinfo = showinfo;
1052    int do_showrest = 0;    int do_showrest = 0;
1053    int do_flip = 0;    int do_flip = 0;
1054    int erroroffset, len, delimiter;    int erroroffset, len, delimiter, poffset;
1055    
1056    use_utf8 = 0;    use_utf8 = 0;
1057      debug_lengths = 1;
1058    
1059    if (infile == stdin) printf("  re> ");    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
   if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL) break;  
1060    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1061    fflush(outfile);    fflush(outfile);
1062    
# Line 735  while (!done) Line 1068  while (!done)
1068    
1069    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
1070      {      {
1071      unsigned long int magic;      unsigned long int magic, get_options;
1072      uschar sbuf[8];      uschar sbuf[8];
1073      FILE *f;      FILE *f;
1074    
# Line 783  while (!done) Line 1116  while (!done)
1116    
1117      /* Need to know if UTF-8 for printing data strings */      /* Need to know if UTF-8 for printing data strings */
1118    
1119      new_info(re, NULL, PCRE_INFO_OPTIONS, &options);      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1120      use_utf8 = (options & PCRE_UTF8) != 0;      use_utf8 = (get_options & PCRE_UTF8) != 0;
1121    
1122      /* Now see if there is any following study data */      /* Now see if there is any following study data */
1123    
# Line 823  while (!done) Line 1156  while (!done)
1156    
1157    if (isalnum(delimiter) || delimiter == '\\')    if (isalnum(delimiter) || delimiter == '\\')
1158      {      {
1159      fprintf(outfile, "** Delimiter must not be alphameric or \\\n");      fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
1160      goto SKIP_DATA;      goto SKIP_DATA;
1161      }      }
1162    
1163    pp = p;    pp = p;
1164      poffset = p - buffer;
1165    
1166    for(;;)    for(;;)
1167      {      {
# Line 838  while (!done) Line 1172  while (!done)
1172        pp++;        pp++;
1173        }        }
1174      if (*pp != 0) break;      if (*pp != 0) break;
1175        if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
     len = BUFFER_SIZE - (pp - buffer);  
     if (len < 256)  
       {  
       fprintf(outfile, "** Expression too long - missing delimiter?\n");  
       goto SKIP_DATA;  
       }  
   
     if (infile == stdin) printf("    > ");  
     if (fgets((char *)pp, len, infile) == NULL)  
1176        {        {
1177        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1178        done = 1;        done = 1;
# Line 856  while (!done) Line 1181  while (!done)
1181      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
1182      }      }
1183    
1184      /* The buffer may have moved while being extended; reset the start of data
1185      pointer to the correct relative point in the buffer. */
1186    
1187      p = buffer + poffset;
1188    
1189    /* If the first character after the delimiter is backslash, make    /* If the first character after the delimiter is backslash, make
1190    the pattern end with backslash. This is purely to provide a way    the pattern end with backslash. This is purely to provide a way
1191    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 887  while (!done) Line 1217  while (!done)
1217    
1218        case '+': do_showrest = 1; break;        case '+': do_showrest = 1; break;
1219        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
1220          case 'B': do_debug = 1; break;
1221        case 'C': options |= PCRE_AUTO_CALLOUT; break;        case 'C': options |= PCRE_AUTO_CALLOUT; break;
1222        case 'D': do_debug = do_showinfo = 1; break;        case 'D': do_debug = do_showinfo = 1; break;
1223        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
1224        case 'F': do_flip = 1; break;        case 'F': do_flip = 1; break;
1225        case 'G': do_G = 1; break;        case 'G': do_G = 1; break;
1226        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
1227          case 'J': options |= PCRE_DUPNAMES; break;
1228        case 'M': log_store = 1; break;        case 'M': log_store = 1; break;
1229        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
1230    
# Line 903  while (!done) Line 1235  while (!done)
1235        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
1236        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
1237        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
1238          case 'Z': debug_lengths = 0; break;
1239        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;        case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
1240        case '?': options |= PCRE_NO_UTF8_CHECK; break;        case '?': options |= PCRE_NO_UTF8_CHECK; break;
1241    
1242        case 'L':        case 'L':
1243        ppp = pp;        ppp = pp;
1244        /* The '\r' test here is so that it works on Windows */        /* The '\r' test here is so that it works on Windows. */
1245        while (*ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;        /* The '0' test is just in case this is an unterminated line. */
1246          while (*ppp != 0 && *ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
1247        *ppp = 0;        *ppp = 0;
1248        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
1249          {          {
1250          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);          fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);
1251          goto SKIP_DATA;          goto SKIP_DATA;
1252          }          }
1253          locale_set = 1;
1254        tables = pcre_maketables();        tables = pcre_maketables();
1255        pp = ppp;        pp = ppp;
1256        break;        break;
# Line 927  while (!done) Line 1262  while (!done)
1262        *pp = 0;        *pp = 0;
1263        break;        break;
1264    
1265          case '<':
1266            {
1267            if (strncmp((char *)pp, "JS>", 3) == 0)
1268              {
1269              options |= PCRE_JAVASCRIPT_COMPAT;
1270              pp += 3;
1271              }
1272            else
1273              {
1274              int x = check_newline(pp, outfile);
1275              if (x == 0) goto SKIP_DATA;
1276              options |= x;
1277              while (*pp++ != '>');
1278              }
1279            }
1280          break;
1281    
1282        case '\r':                      /* So that it works in Windows */        case '\r':                      /* So that it works in Windows */
1283        case '\n':        case '\n':
1284        case ' ':        case ' ':
# Line 961  while (!done) Line 1313  while (!done)
1313    
1314      if (rc != 0)      if (rc != 0)
1315        {        {
1316        (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);        (void)regerror(rc, &preg, (char *)buffer, buffer_size);
1317        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);
1318        goto SKIP_DATA;        goto SKIP_DATA;
1319        }        }
# Line 973  while (!done) Line 1325  while (!done)
1325  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1326    
1327      {      {
1328      if (timeit)      if (timeit > 0)
1329        {        {
1330        register int i;        register int i;
1331        clock_t time_taken;        clock_t time_taken;
1332        clock_t start_time = clock();        clock_t start_time = clock();
1333        for (i = 0; i < LOOPREPEAT; i++)        for (i = 0; i < timeit; i++)
1334          {          {
1335          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);          re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
1336          if (re != NULL) free(re);          if (re != NULL) free(re);
1337          }          }
1338        time_taken = clock() - start_time;        time_taken = clock() - start_time;
1339        fprintf(outfile, "Compile time %.3f milliseconds\n",        fprintf(outfile, "Compile time %.4f milliseconds\n",
1340          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /          (((double)time_taken * 1000.0) / (double)timeit) /
1341            (double)CLOCKS_PER_SEC);            (double)CLOCKS_PER_SEC);
1342        }        }
1343    
# Line 1002  while (!done) Line 1354  while (!done)
1354          {          {
1355          for (;;)          for (;;)
1356            {            {
1357            if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)            if (extend_inputline(infile, buffer, NULL) == NULL)
1358              {              {
1359              done = 1;              done = 1;
1360              goto CONTINUE;              goto CONTINUE;
# Line 1037  while (!done) Line 1389  while (!done)
1389    
1390      if (do_study)      if (do_study)
1391        {        {
1392        if (timeit)        if (timeit > 0)
1393          {          {
1394          register int i;          register int i;
1395          clock_t time_taken;          clock_t time_taken;
1396          clock_t start_time = clock();          clock_t start_time = clock();
1397          for (i = 0; i < LOOPREPEAT; i++)          for (i = 0; i < timeit; i++)
1398            extra = pcre_study(re, study_options, &error);            extra = pcre_study(re, study_options, &error);
1399          time_taken = clock() - start_time;          time_taken = clock() - start_time;
1400          if (extra != NULL) free(extra);          if (extra != NULL) free(extra);
1401          fprintf(outfile, "  Study time %.3f milliseconds\n",          fprintf(outfile, "  Study time %.4f milliseconds\n",
1402            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeit) /
1403              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
1404          }          }
1405        extra = pcre_study(re, study_options, &error);        extra = pcre_study(re, study_options, &error);
# Line 1065  while (!done) Line 1417  while (!done)
1417      if (do_flip)      if (do_flip)
1418        {        {
1419        real_pcre *rre = (real_pcre *)re;        real_pcre *rre = (real_pcre *)re;
1420        rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));        rre->magic_number =
1421            byteflip(rre->magic_number, sizeof(rre->magic_number));
1422        rre->size = byteflip(rre->size, sizeof(rre->size));        rre->size = byteflip(rre->size, sizeof(rre->size));
1423        rre->options = byteflip(rre->options, sizeof(rre->options));        rre->options = byteflip(rre->options, sizeof(rre->options));
1424        rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));        rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
1425        rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));        rre->top_bracket =
1426        rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));          (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
1427        rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte));        rre->top_backref =
1428        rre->name_table_offset = byteflip(rre->name_table_offset,          (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
1429          rre->first_byte =
1430            (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));
1431          rre->req_byte =
1432            (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));
1433          rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
1434          sizeof(rre->name_table_offset));          sizeof(rre->name_table_offset));
1435        rre->name_entry_size = byteflip(rre->name_entry_size,        rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
1436          sizeof(rre->name_entry_size));          sizeof(rre->name_entry_size));
1437        rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count));        rre->name_count = (pcre_uint16)byteflip(rre->name_count,
1438            sizeof(rre->name_count));
1439    
1440        if (extra != NULL)        if (extra != NULL)
1441          {          {
# Line 1090  while (!done) Line 1449  while (!done)
1449    
1450      SHOW_INFO:      SHOW_INFO:
1451    
1452        if (do_debug)
1453          {
1454          fprintf(outfile, "------------------------------------------------------------------\n");
1455          pcre_printint(re, outfile, debug_lengths);
1456          }
1457    
1458      if (do_showinfo)      if (do_showinfo)
1459        {        {
1460        unsigned long int get_options, all_options;        unsigned long int get_options, all_options;
1461  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1462        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1463  #endif  #endif
1464        int count, backrefmax, first_char, need_char;        int count, backrefmax, first_char, need_char, okpartial, jchanged,
1465            hascrorlf;
1466        int nameentrysize, namecount;        int nameentrysize, namecount;
1467        const uschar *nametable;        const uschar *nametable;
1468    
       if (do_debug)  
         {  
         fprintf(outfile, "------------------------------------------------------------------\n");  
         pcre_printint(re, outfile);  
         }  
   
1469        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1470        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
1471        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
# Line 1115  while (!done) Line 1475  while (!done)
1475        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
1476        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
1477        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);        new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
1478          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
1479          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
1480          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
1481    
1482  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1483        old_count = pcre_info(re, &old_options, &old_first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
# Line 1156  while (!done) Line 1519  while (!done)
1519            }            }
1520          }          }
1521    
1522        /* The NOPARTIAL bit is a private bit in the options, so we have        if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
1523        to fish it out via out back door */        if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
1524    
1525        all_options = ((real_pcre *)re)->options;        all_options = ((real_pcre *)re)->options;
1526        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");  
1527    
1528        if (get_options == 0) fprintf(outfile, "No options\n");        if (get_options == 0) fprintf(outfile, "No options\n");
1529          else fprintf(outfile, "Options:%s%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",
1530            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
1531            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
1532            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
1533            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
1534            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",            ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
1535            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
1536              ((get_options & PCRE_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
1537              ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
1538            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
1539            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
1540            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
1541            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
1542            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",            ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
1543            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "");            ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
1544              ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
1545    
1546          if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
1547    
1548          switch (get_options & PCRE_NEWLINE_BITS)
1549            {
1550            case PCRE_NEWLINE_CR:
1551            fprintf(outfile, "Forced newline sequence: CR\n");
1552            break;
1553    
1554            case PCRE_NEWLINE_LF:
1555            fprintf(outfile, "Forced newline sequence: LF\n");
1556            break;
1557    
1558            case PCRE_NEWLINE_CRLF:
1559            fprintf(outfile, "Forced newline sequence: CRLF\n");
1560            break;
1561    
1562            case PCRE_NEWLINE_ANYCRLF:
1563            fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
1564            break;
1565    
1566            case PCRE_NEWLINE_ANY:
1567            fprintf(outfile, "Forced newline sequence: ANY\n");
1568            break;
1569    
1570        if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)          default:
1571          fprintf(outfile, "Case state changes\n");          break;
1572            }
1573    
1574        if (first_char == -1)        if (first_char == -1)
1575          {          {
1576          fprintf(outfile, "First char at start or follows \\n\n");          fprintf(outfile, "First char at start or follows newline\n");
1577          }          }
1578        else if (first_char < 0)        else if (first_char < 0)
1579          {          {
# Line 1199  while (!done) Line 1584  while (!done)
1584          int ch = first_char & 255;          int ch = first_char & 255;
1585          const char *caseless = ((first_char & REQ_CASELESS) == 0)?          const char *caseless = ((first_char & REQ_CASELESS) == 0)?
1586            "" : " (caseless)";            "" : " (caseless)";
1587          if (isprint(ch))          if (PRINTHEX(ch))
1588            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
1589          else          else
1590            fprintf(outfile, "First char = %d%s\n", ch, caseless);            fprintf(outfile, "First char = %d%s\n", ch, caseless);
# Line 1214  while (!done) Line 1599  while (!done)
1599          int ch = need_char & 255;          int ch = need_char & 255;
1600          const char *caseless = ((need_char & REQ_CASELESS) == 0)?          const char *caseless = ((need_char & REQ_CASELESS) == 0)?
1601            "" : " (caseless)";            "" : " (caseless)";
1602          if (isprint(ch))          if (PRINTHEX(ch))
1603            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
1604          else          else
1605            fprintf(outfile, "Need char = %d%s\n", ch, caseless);            fprintf(outfile, "Need char = %d%s\n", ch, caseless);
# Line 1250  while (!done) Line 1635  while (!done)
1635                    fprintf(outfile, "\n  ");                    fprintf(outfile, "\n  ");
1636                    c = 2;                    c = 2;
1637                    }                    }
1638                  if (isprint(i) && i != ' ')                  if (PRINTHEX(i) && i != ' ')
1639                    {                    {
1640                    fprintf(outfile, "%c ", i);                    fprintf(outfile, "%c ", i);
1641                    c += 2;                    c += 2;
# Line 1282  while (!done) Line 1667  while (!done)
1667        else        else
1668          {          {
1669          uschar sbuf[8];          uschar sbuf[8];
1670          sbuf[0] = (true_size >> 24)  & 255;          sbuf[0] = (uschar)((true_size >> 24) & 255);
1671          sbuf[1] = (true_size >> 16)  & 255;          sbuf[1] = (uschar)((true_size >> 16) & 255);
1672          sbuf[2] = (true_size >>  8)  & 255;          sbuf[2] = (uschar)((true_size >>  8) & 255);
1673          sbuf[3] = (true_size)  & 255;          sbuf[3] = (uschar)((true_size) & 255);
1674    
1675          sbuf[4] = (true_study_size >> 24)  & 255;          sbuf[4] = (uschar)((true_study_size >> 24) & 255);
1676          sbuf[5] = (true_study_size >> 16)  & 255;          sbuf[5] = (uschar)((true_study_size >> 16) & 255);
1677          sbuf[6] = (true_study_size >>  8)  & 255;          sbuf[6] = (uschar)((true_study_size >>  8) & 255);
1678          sbuf[7] = (true_study_size)  & 255;          sbuf[7] = (uschar)((true_study_size) & 255);
1679    
1680          if (fwrite(sbuf, 1, 8, f) < 8 ||          if (fwrite(sbuf, 1, 8, f) < 8 ||
1681              fwrite(re, 1, true_size, f) < true_size)              fwrite(re, 1, true_size, f) < true_size)
# Line 1309  while (!done) Line 1694  while (!done)
1694                  strerror(errno));                  strerror(errno));
1695                }                }
1696              else fprintf(outfile, "Study data written to %s\n", to_file);              else fprintf(outfile, "Study data written to %s\n", to_file);
1697    
1698              }              }
1699            }            }
1700          fclose(f);          fclose(f);
# Line 1326  while (!done) Line 1712  while (!done)
1712    for (;;)    for (;;)
1713      {      {
1714      uschar *q;      uschar *q;
1715      uschar *bptr = dbuffer;      uschar *bptr;
1716      int *use_offsets = offsets;      int *use_offsets = offsets;
1717      int use_size_offsets = size_offsets;      int use_size_offsets = size_offsets;
1718      int callout_data = 0;      int callout_data = 0;
1719      int callout_data_set = 0;      int callout_data_set = 0;
1720      int count, c;      int count, c;
1721      int copystrings = 0;      int copystrings = 0;
1722      int find_match_limit = 0;      int find_match_limit = default_find_match_limit;
1723      int getstrings = 0;      int getstrings = 0;
1724      int getlist = 0;      int getlist = 0;
1725      int gmatched = 0;      int gmatched = 0;
# Line 1343  while (!done) Line 1729  while (!done)
1729    
1730      options = 0;      options = 0;
1731    
1732        *copynames = 0;
1733        *getnames = 0;
1734    
1735        copynamesptr = copynames;
1736        getnamesptr = getnames;
1737    
1738      pcre_callout = callout;      pcre_callout = callout;
1739      first_callout = 1;      first_callout = 1;
1740      callout_extra = 0;      callout_extra = 0;
# Line 1351  while (!done) Line 1743  while (!done)
1743      callout_fail_id = -1;      callout_fail_id = -1;
1744      show_malloc = 0;      show_malloc = 0;
1745    
1746      if (infile == stdin) printf("data> ");      if (extra != NULL) extra->flags &=
1747      if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)        ~(PCRE_EXTRA_MATCH_LIMIT|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
1748    
1749        len = 0;
1750        for (;;)
1751        {        {
1752        done = 1;        if (extend_inputline(infile, buffer + len, "data> ") == NULL)
1753        goto CONTINUE;          {
1754            if (len > 0) break;
1755            done = 1;
1756            goto CONTINUE;
1757            }
1758          if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1759          len = (int)strlen((char *)buffer);
1760          if (buffer[len-1] == '\n') break;
1761        }        }
     if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);  
1762    
     len = (int)strlen((char *)buffer);  
1763      while (len > 0 && isspace(buffer[len-1])) len--;      while (len > 0 && isspace(buffer[len-1])) len--;
1764      buffer[len] = 0;      buffer[len] = 0;
1765      if (len == 0) break;      if (len == 0) break;
# Line 1367  while (!done) Line 1767  while (!done)
1767      p = buffer;      p = buffer;
1768      while (isspace(*p)) p++;      while (isspace(*p)) p++;
1769    
1770      q = dbuffer;      bptr = q = dbuffer;
1771      while ((c = *p++) != 0)      while ((c = *p++) != 0)
1772        {        {
1773        int i = 0;        int i = 0;
# Line 1389  while (!done) Line 1789  while (!done)
1789          c -= '0';          c -= '0';
1790          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
1791            c = c * 8 + *p++ - '0';            c = c * 8 + *p++ - '0';
1792    
1793    #if !defined NOUTF8
1794            if (use_utf8 && c > 255)
1795              {
1796              unsigned char buff8[8];
1797              int ii, utn;
1798              utn = ord2utf8(c, buff8);
1799              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1800              c = buff8[ii];   /* Last byte */
1801              }
1802    #endif
1803          break;          break;
1804    
1805          case 'x':          case 'x':
# Line 1406  while (!done) Line 1817  while (!done)
1817              {              {
1818              unsigned char buff8[8];              unsigned char buff8[8];
1819              int ii, utn;              int ii, utn;
1820              utn = ord2utf8(c, buff8);              if (use_utf8)
1821              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                {
1822              c = buff8[ii];   /* Last byte */                utn = ord2utf8(c, buff8);
1823                  for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1824                  c = buff8[ii];   /* Last byte */
1825                  }
1826                else
1827                 {
1828                 if (c > 255)
1829                   fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
1830                     "UTF-8 mode is not enabled.\n"
1831                     "** Truncation will probably give the wrong result.\n", c);
1832                 }
1833              p = pt + 1;              p = pt + 1;
1834              break;              break;
1835              }              }
# Line 1450  while (!done) Line 1871  while (!done)
1871            }            }
1872          else if (isalnum(*p))          else if (isalnum(*p))
1873            {            {
1874            uschar name[256];            uschar *npp = copynamesptr;
           uschar *npp = name;  
1875            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1876              *npp++ = 0;
1877            *npp = 0;            *npp = 0;
1878            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)copynamesptr);
1879            if (n < 0)            if (n < 0)
1880              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
1881            else copystrings |= 1 << n;            copynamesptr = npp;
1882            }            }
1883          else if (*p == '+')          else if (*p == '+')
1884            {            {
# Line 1518  while (!done) Line 1939  while (!done)
1939            }            }
1940          else if (isalnum(*p))          else if (isalnum(*p))
1941            {            {
1942            uschar name[256];            uschar *npp = getnamesptr;
           uschar *npp = name;  
1943            while (isalnum(*p)) *npp++ = *p++;            while (isalnum(*p)) *npp++ = *p++;
1944              *npp++ = 0;
1945            *npp = 0;            *npp = 0;
1946            n = pcre_get_stringnumber(re, (char *)name);            n = pcre_get_stringnumber(re, (char *)getnamesptr);
1947            if (n < 0)            if (n < 0)
1948              fprintf(outfile, "no parentheses with name \"%s\"\n", name);              fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
1949            else getstrings |= 1 << n;            getnamesptr = npp;
1950            }            }
1951          continue;          continue;
1952    
# Line 1551  while (!done) Line 1972  while (!done)
1972            if (offsets == NULL)            if (offsets == NULL)
1973              {              {
1974              printf("** Failed to get %d bytes of memory for offsets vector\n",              printf("** Failed to get %d bytes of memory for offsets vector\n",
1975                size_offsets_max * sizeof(int));                (int)(size_offsets_max * sizeof(int)));
1976              yield = 1;              yield = 1;
1977              goto EXIT;              goto EXIT;
1978              }              }
# Line 1564  while (!done) Line 1985  while (!done)
1985          options |= PCRE_PARTIAL;          options |= PCRE_PARTIAL;
1986          continue;          continue;
1987    
1988            case 'Q':
1989            while(isdigit(*p)) n = n * 10 + *p++ - '0';
1990            if (extra == NULL)
1991              {
1992              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
1993              extra->flags = 0;
1994              }
1995            extra->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
1996            extra->match_limit_recursion = n;
1997            continue;
1998    
1999            case 'q':
2000            while(isdigit(*p)) n = n * 10 + *p++ - '0';
2001            if (extra == NULL)
2002              {
2003              extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2004              extra->flags = 0;
2005              }
2006            extra->flags |= PCRE_EXTRA_MATCH_LIMIT;
2007            extra->match_limit = n;
2008            continue;
2009    
2010  #if !defined NODFA  #if !defined NODFA
2011          case 'R':          case 'R':
2012          options |= PCRE_DFA_RESTART;          options |= PCRE_DFA_RESTART;
# Line 1574  while (!done) Line 2017  while (!done)
2017          show_malloc = 1;          show_malloc = 1;
2018          continue;          continue;
2019    
2020            case 'Y':
2021            options |= PCRE_NO_START_OPTIMIZE;
2022            continue;
2023    
2024          case 'Z':          case 'Z':
2025          options |= PCRE_NOTEOL;          options |= PCRE_NOTEOL;
2026          continue;          continue;
# Line 1581  while (!done) Line 2028  while (!done)
2028          case '?':          case '?':
2029          options |= PCRE_NO_UTF8_CHECK;          options |= PCRE_NO_UTF8_CHECK;
2030          continue;          continue;
2031    
2032            case '<':
2033              {
2034              int x = check_newline(p, outfile);
2035              if (x == 0) goto NEXT_DATA;
2036              options |= x;
2037              while (*p++ != '>');
2038              }
2039            continue;
2040          }          }
2041        *q++ = c;        *q++ = c;
2042        }        }
2043      *q = 0;      *q = 0;
2044      len = q - dbuffer;      len = q - dbuffer;
2045    
2046        /* Move the data to the end of the buffer so that a read over the end of
2047        the buffer will be seen by valgrind, even if it doesn't cause a crash. If
2048        we are using the POSIX interface, we must include the terminating zero. */
2049    
2050    #if !defined NOPOSIX
2051        if (posix || do_posix)
2052          {
2053          memmove(bptr + buffer_size - len - 1, bptr, len + 1);
2054          bptr += buffer_size - len - 1;
2055          }
2056        else
2057    #endif
2058          {
2059          memmove(bptr + buffer_size - len, bptr, len);
2060          bptr += buffer_size - len;
2061          }
2062    
2063      if ((all_use_dfa || use_dfa) && find_match_limit)      if ((all_use_dfa || use_dfa) && find_match_limit)
2064        {        {
2065        printf("**Match limit not relevant for DFA matching: ignored\n");        printf("**Match limit not relevant for DFA matching: ignored\n");
# Line 1606  while (!done) Line 2079  while (!done)
2079          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);          pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
2080        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
2081        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
2082          if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
2083    
2084        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
2085    
2086        if (rc != 0)        if (rc != 0)
2087          {          {
2088          (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);          (void)regerror(rc, &preg, (char *)buffer, buffer_size);
2089          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
2090          }          }
2091        else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)        else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)
# Line 1650  while (!done) Line 2124  while (!done)
2124    
2125      for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
2126        {        {
2127        if (timeit)        if (timeitm > 0)
2128          {          {
2129          register int i;          register int i;
2130          clock_t time_taken;          clock_t time_taken;
# Line 1660  while (!done) Line 2134  while (!done)
2134          if (all_use_dfa || use_dfa)          if (all_use_dfa || use_dfa)
2135            {            {
2136            int workspace[1000];            int workspace[1000];
2137            for (i = 0; i < LOOPREPEAT; i++)            for (i = 0; i < timeitm; i++)
2138              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,              count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
2139                options | g_notempty, use_offsets, use_size_offsets, workspace,                options | g_notempty, use_offsets, use_size_offsets, workspace,
2140                sizeof(workspace)/sizeof(int));                sizeof(workspace)/sizeof(int));
# Line 1668  while (!done) Line 2142  while (!done)
2142          else          else
2143  #endif  #endif
2144    
2145          for (i = 0; i < LOOPREPEAT; i++)          for (i = 0; i < timeitm; i++)
2146            count = pcre_exec(re, extra, (char *)bptr, len,            count = pcre_exec(re, extra, (char *)bptr, len,
2147              start_offset, options | g_notempty, use_offsets, use_size_offsets);              start_offset, options | g_notempty, use_offsets, use_size_offsets);
2148    
2149          time_taken = clock() - start_time;          time_taken = clock() - start_time;
2150          fprintf(outfile, "Execute time %.3f milliseconds\n",          fprintf(outfile, "Execute time %.4f milliseconds\n",
2151            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /            (((double)time_taken * 1000.0) / (double)timeitm) /
2152              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
2153          }          }
2154    
# Line 1690  while (!done) Line 2164  while (!done)
2164            extra->flags = 0;            extra->flags = 0;
2165            }            }
2166    
2167          count = check_match_limit(re, extra, bptr, len, start_offset,          (void)check_match_limit(re, extra, bptr, len, start_offset,
2168            options|g_notempty, use_offsets, use_size_offsets,            options|g_notempty, use_offsets, use_size_offsets,
2169            PCRE_EXTRA_MATCH_LIMIT, &(extra->match_limit),            PCRE_EXTRA_MATCH_LIMIT, &(extra->match_limit),
2170            PCRE_ERROR_MATCHLIMIT, "match()");            PCRE_ERROR_MATCHLIMIT, "match()");
# Line 1750  while (!done) Line 2224  while (!done)
2224    
2225        if (count >= 0)        if (count >= 0)
2226          {          {
2227          int i;          int i, maxcount;
2228    
2229    #if !defined NODFA
2230            if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
2231    #endif
2232              maxcount = use_size_offsets/3;
2233    
2234            /* This is a check against a lunatic return value. */
2235    
2236            if (count > maxcount)
2237              {
2238              fprintf(outfile,
2239                "** PCRE error: returned count %d is too big for offset size %d\n",
2240                count, use_size_offsets);
2241              count = use_size_offsets/3;
2242              if (do_g || do_G)
2243                {
2244                fprintf(outfile, "** /%c loop abandoned\n", do_g? 'g' : 'G');
2245                do_g = do_G = FALSE;        /* Break g/G loop */
2246                }
2247              }
2248    
2249          for (i = 0; i < count * 2; i += 2)          for (i = 0; i < count * 2; i += 2)
2250            {            {
2251            if (use_offsets[i] < 0)            if (use_offsets[i] < 0)
# Line 1778  while (!done) Line 2273  while (!done)
2273            {            {
2274            if ((copystrings & (1 << i)) != 0)            if ((copystrings & (1 << i)) != 0)
2275              {              {
2276              char copybuffer[16];              char copybuffer[256];
2277              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,              int rc = pcre_copy_substring((char *)bptr, use_offsets, count,
2278                i, copybuffer, sizeof(copybuffer));                i, copybuffer, sizeof(copybuffer));
2279              if (rc < 0)              if (rc < 0)
# Line 1788  while (!done) Line 2283  while (!done)
2283              }              }
2284            }            }
2285    
2286            for (copynamesptr = copynames;
2287                 *copynamesptr != 0;
2288                 copynamesptr += (int)strlen((char*)copynamesptr) + 1)
2289              {
2290              char copybuffer[256];
2291              int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
2292                count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));
2293              if (rc < 0)
2294                fprintf(outfile, "copy substring %s failed %d\n", copynamesptr, rc);
2295              else
2296                fprintf(outfile, "  C %s (%d) %s\n", copybuffer, rc, copynamesptr);
2297              }
2298    
2299          for (i = 0; i < 32; i++)          for (i = 0; i < 32; i++)
2300            {            {
2301            if ((getstrings & (1 << i)) != 0)            if ((getstrings & (1 << i)) != 0)
# Line 1800  while (!done) Line 2308  while (!done)
2308              else              else
2309                {                {
2310                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);                fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
               /* free((void *)substring); */  
2311                pcre_free_substring(substring);                pcre_free_substring(substring);
2312                }                }
2313              }              }
2314            }            }
2315    
2316            for (getnamesptr = getnames;
2317                 *getnamesptr != 0;
2318                 getnamesptr += (int)strlen((char*)getnamesptr) + 1)
2319              {
2320              const char *substring;
2321              int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
2322                count, (char *)getnamesptr, &substring);
2323              if (rc < 0)
2324                fprintf(outfile, "copy substring %s failed %d\n", getnamesptr, rc);
2325              else
2326                {
2327                fprintf(outfile, "  G %s (%d) %s\n", substring, rc, getnamesptr);
2328                pcre_free_substring(substring);
2329                }
2330              }
2331    
2332          if (getlist)          if (getlist)
2333            {            {
2334            const char **stringlist;            const char **stringlist;
# Line 1840  while (!done) Line 2363  while (!done)
2363          }          }
2364    
2365        /* 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
2366        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
2367        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
2368        matching, the advance must be one character, not one byte. Fudge the        string - that was checked before setting g_notempty.
2369        offset values to achieve this. We won't be at the end of the string -  
2370        that was checked before setting g_notempty. */        Complication arises in the case when the newline option is "any" or
2371          "anycrlf". If the previous match was at the end of a line terminated by
2372          CRLF, an advance of one character just passes the \r, whereas we should
2373          prefer the longer newline sequence, as does the code in pcre_exec().
2374          Fudge the offset value to achieve this.
2375    
2376          Otherwise, in the case of UTF-8 matching, the advance must be one
2377          character, not one byte. */
2378    
2379        else        else
2380          {          {
2381          if (g_notempty != 0)          if (g_notempty != 0)
2382            {            {
2383            int onechar = 1;            int onechar = 1;
2384              unsigned int obits = ((real_pcre *)re)->options;
2385            use_offsets[0] = start_offset;            use_offsets[0] = start_offset;
2386            if (use_utf8)            if ((obits & PCRE_NEWLINE_BITS) == 0)
2387                {
2388                int d;
2389                (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
2390                /* Note that these values are always the ASCII ones, even in
2391                EBCDIC environments. CR = 13, NL = 10. */
2392                obits = (d == 13)? PCRE_NEWLINE_CR :
2393                        (d == 10)? PCRE_NEWLINE_LF :
2394                        (d == (13<<8 | 10))? PCRE_NEWLINE_CRLF :
2395                        (d == -2)? PCRE_NEWLINE_ANYCRLF :
2396                        (d == -1)? PCRE_NEWLINE_ANY : 0;
2397                }
2398              if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
2399                   (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
2400                  &&
2401                  start_offset < len - 1 &&
2402                  bptr[start_offset] == '\r' &&
2403                  bptr[start_offset+1] == '\n')
2404                onechar++;
2405              else if (use_utf8)
2406              {              {
2407              while (start_offset + onechar < len)              while (start_offset + onechar < len)
2408                {                {
# Line 1887  while (!done) Line 2437  while (!done)
2437        character. */        character. */
2438    
2439        g_notempty = 0;        g_notempty = 0;
2440    
2441        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2442          {          {
2443          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
# Line 1905  while (!done) Line 2456  while (!done)
2456          len -= use_offsets[1];          len -= use_offsets[1];
2457          }          }
2458        }  /* End of loop for /g and /G */        }  /* End of loop for /g and /G */
2459    
2460        NEXT_DATA: continue;
2461      }    /* End of loop for data lines */      }    /* End of loop for data lines */
2462    
2463    CONTINUE:    CONTINUE:
# Line 1919  while (!done) Line 2472  while (!done)
2472      {      {
2473      new_free((void *)tables);      new_free((void *)tables);
2474      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
2475        locale_set = 0;
2476      }      }
2477    }    }
2478    

Legend:
Removed from v.87  
changed lines
  Added in v.411

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12