/[pcre]/code/trunk/pcretest.c

Diff of /code/trunk/pcretest.c

Parent Directory | Revision Log | View Patch Patch

-revision 63 by nigel,
Sat Feb 24 21:40:03 2007 UTC
+revision 79 by nigel,
Sat Feb 24 21:40:52 2007 UTC
 Line 4
  /* This program was hacked up as a tester for PCRE. I really should have
  written it more tidily in the first place. Will I ever learn? It has grown and
- been extended and consequently is now rather untidy in places. */
+ been extended and consequently is now rather, er, *very* untidy in places.
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the University of Cambridge nor the names of its
+       contributors may be used to endorse or promote products derived from
+       this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ -----------------------------------------------------------------------------
+ */
  #include <ctype.h>
  #include <stdio.h>
-Line 12 
 been extended and consequently is now ra
+Line 42 
 been extended and consequently is now ra
  #include <stdlib.h>
  #include <time.h>
  #include <locale.h>
+ #include <errno.h>
- /* We need the internal info for displaying the results of pcre_study(). Also
- for getting the opcodes for showing compiled code. */
  #define PCRE_SPY        /* For Win32 build, import data, not export */
- #include "internal.h"
+ /* We need the internal info for displaying the results of pcre_study() and
+ other internal data; pcretest also uses some of the fixed tables, and generally
+ has "inside information" compared to a program that strictly follows the PCRE
+ API. */
+ #include "pcre_internal.h"
  /* It is possible to compile this test program without including support for
  testing the POSIX interface, though this is not available via the standard
-Line 27 
 Makefile. */
+Line 62 
 Makefile. */
  #include "pcreposix.h"
  #endif
+ /* It is also possible, for the benefit of the version imported into Exim, to
+ build pcretest without support for UTF8 (define NOUTF8), without the interface
+ to the DFA matcher (NODFA), and without the doublecheck of the old "info"
+ function (define NOINFOCHECK). */
  #ifndef CLOCKS_PER_SEC
  #ifdef CLK_TCK
  #define CLOCKS_PER_SEC CLK_TCK
-Line 35 
 Makefile. */
+Line 76 
 Makefile. */
  #endif
  #endif
- #define LOOPREPEAT 50000
+ #define LOOPREPEAT 500000
+ #define BUFFER_SIZE 30000
+ #define PBUFFER_SIZE BUFFER_SIZE
+ #define DBUFFER_SIZE BUFFER_SIZE
  static FILE *outfile;
-Line 45 
 static int callout_extra;
+Line 90 
 static int callout_extra;
  static int callout_fail_count;
  static int callout_fail_id;
  static int first_callout;
- static int utf8;
+ static int show_malloc;
+ static int use_utf8;
  static size_t gotten_store;
+ static uschar *pbuffer = NULL;
- static int utf8_table1[] = {
-x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff};
- static int utf8_table2[] = {
-, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
- static int utf8_table3[] = {
-xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
- /*************************************************
- *         Print compiled regex                   *
- *************************************************/
- /* The code for doing this is held in a separate file that is also included in
- pcre.c when it is compiled with the debug switch. It defines a function called
- print_internals(), which uses a table of opcode lengths defined by the macro
- OP_LENGTHS, whose name must be OP_lengths. */
- static uschar OP_lengths[] = { OP_LENGTHS };
- #include "printint.c"
-Line 103 
 return(result);
+Line 125 
 return(result);
- /*************************************************
- *       Convert character value to UTF-8         *
- *************************************************/
- /* This function takes an integer value in the range 0 - 0x7fffffff
- and encodes it as a UTF-8 character in 0 to 6 bytes.
- Arguments:
-   cvalue     the character value
-   buffer     pointer to buffer for result - at least 6 bytes long
- Returns:     number of characters placed in the buffer
-              -1 if input character is negative
-if input character is positive but too big (only when
-              int is longer than 32 bits)
- */
- static int
- ord2utf8(int cvalue, unsigned char *buffer)
- {
- register int i, j;
- for (i = 0; i < sizeof(utf8_table1)/sizeof(int); i++)
-   if (cvalue <= utf8_table1[i]) break;
- if (i >= sizeof(utf8_table1)/sizeof(int)) return 0;
- if (cvalue < 0) return -1;
- buffer += i;
- for (j = i; j > 0; j--)
-  {
-  *buffer-- = 0x80 | (cvalue & 0x3f);
-  cvalue >>= 6;
-  }
- *buffer = utf8_table2[i] | cvalue;
- return i + 1;
- }
  /*************************************************
  *            Convert UTF-8 string to value       *
-Line 155 
 Returns:   >  0 => the number of bytes c
+Line 141 
 Returns:   >  0 => the number of bytes c
             -6 to 0 => malformed UTF-8 character at offset = (-return)
  */
- int
+ #if !defined NOUTF8
+ static int
  utf82ord(unsigned char *buffer, int *vptr)
  {
  int c = *buffer++;
-Line 174 
 if (i == 0 || i == 6) return 0;        /
+Line 162 
 if (i == 0 || i == 6) return 0;        /
  /* i now has a value in the range 1-5 */
  s = 6*i;
- d = (c & utf8_table3[i]) << s;
+ d = (c & _pcre_utf8_table3[i]) << s;
  for (j = 0; j < i; j++)
    {
-Line 186 
 for (j = 0; j < i; j++)
+Line 174 
 for (j = 0; j < i; j++)
  /* Check that encoding was the correct unique one */
- for (j = 0; j < sizeof(utf8_table1)/sizeof(int); j++)
+ for (j = 0; j < _pcre_utf8_table1_size; j++)
-   if (d <= utf8_table1[j]) break;
+   if (d <= _pcre_utf8_table1[j]) break;
  if (j != i) return -(i+1);
  /* Valid value */
-Line 196 
 if (j != i) return -(i+1);
+Line 184 
 if (j != i) return -(i+1);
  return i+1;
  }
+ #endif
  /*************************************************
-Line 213 
 int yield = 0;
+Line 203 
 int yield = 0;
  while (length-- > 0)
    {
-   if (utf8)
+ #if !defined NOUTF8
+   if (use_utf8)
      {
      int rc = utf82ord(p, &c);
-Line 235 
 while (length-- > 0)
+Line 226 
 while (length-- > 0)
        continue;
        }
      }
+ #endif
     /* Not UTF-8, or malformed UTF-8  */
-Line 266 
 data is not zero. */
+Line 258 
 data is not zero. */
  static int callout(pcre_callout_block *cb)
  {
  FILE *f = (first_callout | callout_extra)? outfile : NULL;
- int i, pre_start, post_start;
+ int i, pre_start, post_start, subject_length;
  if (callout_extra)
    {
-   int i;
    fprintf(f, "Callout %d: last capture = %d\n",
      cb->callout_number, cb->capture_last);
-Line 298 
 pre_start = pchars((unsigned char *)cb->
+Line 289 
 pre_start = pchars((unsigned char *)cb->
  post_start = pchars((unsigned char *)(cb->subject + cb->start_match),
    cb->current_position - cb->start_match, f);
+ subject_length = pchars((unsigned char *)cb->subject, cb->subject_length, NULL);
  (void)pchars((unsigned char *)(cb->subject + cb->current_position),
    cb->subject_length - cb->current_position, f);
  if (f != NULL) fprintf(f, "\n");
  /* Always print appropriate indicators, with callout number if not already
- shown */
+ shown. For automatic callouts, show the pattern offset. */
- if (callout_extra) fprintf(outfile, "    ");
+ if (cb->callout_number == 255)
-   else fprintf(outfile, "%3d ", cb->callout_number);
+   {
+   fprintf(outfile, "%+3d ", cb->pattern_position);
+   if (cb->pattern_position > 99) fprintf(outfile, "\n    ");
+   }
+ else
+   {
+   if (callout_extra) fprintf(outfile, "    ");
+     else fprintf(outfile, "%3d ", cb->callout_number);
+   }
  for (i = 0; i < pre_start; i++) fprintf(outfile, " ");
  fprintf(outfile, "^");
-Line 318 
 if (post_start > 0)
+Line 319 
 if (post_start > 0)
    fprintf(outfile, "^");
    }
- fprintf(outfile, "\n");
+ for (i = 0; i < subject_length - pre_start - post_start + 4; i++)
+   fprintf(outfile, " ");
+ fprintf(outfile, "%.*s", (cb->next_item_length == 0)? 1 : cb->next_item_length,
+   pbuffer + cb->pattern_position);
+ fprintf(outfile, "\n");
  first_callout = 0;
- if ((int)(cb->callout_data) != 0)
+ if (cb->callout_data != NULL)
    {
-   fprintf(outfile, "Callout data = %d\n", (int)(cb->callout_data));
+   int callout_data = *((int *)(cb->callout_data));
-   return (int)(cb->callout_data);
+   if (callout_data != 0)
+     {
+     fprintf(outfile, "Callout data = %d\n", callout_data);
+     return callout_data;
+     }
    }
  return (cb->callout_number != callout_fail_id)? 0 :
-Line 334 
 return (cb->callout_number != callout_fa
+Line 344 
 return (cb->callout_number != callout_fa
  /*************************************************
- *            Local malloc function               *
+ *            Local malloc functions              *
  *************************************************/
  /* Alternative malloc function, to test functionality and show the size of the
-Line 342 
 compiled re. */
+Line 352 
 compiled re. */
  static void *new_malloc(size_t size)
  {
+ void *block = malloc(size);
  gotten_store = size;
- return malloc(size);
+ if (show_malloc)
+   fprintf(outfile, "malloc       %3d %p\n", (int)size, block);
+ return block;
+ }
+ static void new_free(void *block)
+ {
+ if (show_malloc)
+   fprintf(outfile, "free             %p\n", block);
+ free(block);
+ }
+ /* For recursion malloc/free, to test stacking calls */
+ static void *stack_malloc(size_t size)
+ {
+ void *block = malloc(size);
+ if (show_malloc)
+   fprintf(outfile, "stack_malloc %3d %p\n", (int)size, block);
+ return block;
  }
+ static void stack_free(void *block)
+ {
+ if (show_malloc)
+   fprintf(outfile, "stack_free       %p\n", block);
+ free(block);
+ }
  /*************************************************
-Line 364 
 if ((rc = pcre_fullinfo(re, study, optio
+Line 401 
 if ((rc = pcre_fullinfo(re, study, optio
  /*************************************************
+ *         Byte flipping function                 *
+ *************************************************/
+ static long int
+ byteflip(long int value, int n)
+ {
+ if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
+ return ((value & 0x000000ff) << 24) |
+        ((value & 0x0000ff00) <<  8) |
+        ((value & 0x00ff0000) >>  8) |
+        ((value & 0xff000000) >> 24);
+ }
+ /*************************************************
  *                Main Program                    *
  *************************************************/
-Line 382 
 int showinfo = 0;
+Line 436 
 int showinfo = 0;
  int showstore = 0;
  int size_offsets = 45;
  int size_offsets_max;
- int *offsets;
+ int *offsets = NULL;
  #if !defined NOPOSIX
  int posix = 0;
  #endif
  int debug = 0;
  int done = 0;
- unsigned char buffer[30000];
+ int all_use_dfa = 0;
- unsigned char dbuffer[1024];
+ int yield = 0;
+ unsigned char *buffer;
+ unsigned char *dbuffer;
- /* Static so that new_malloc can use it. */
+ /* Get buffers from malloc() so that Electric Fence will check their misuse
+ when I am debugging. */
+ buffer = (unsigned char *)malloc(BUFFER_SIZE);
+ dbuffer = (unsigned char *)malloc(DBUFFER_SIZE);
+ pbuffer = (unsigned char *)malloc(PBUFFER_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.  */
+ #if defined(_WIN32) || defined(WIN32)
+ _setmode( _fileno( stdout ), 0x8000 );
+ #endif  /* defined(_WIN32) || defined(WIN32) */
  outfile = stdout;
-Line 406 
 while (argc > 1 && argv[op][0] == '-')
+Line 476 
 while (argc > 1 && argv[op][0] == '-')
    else if (strcmp(argv[op], "-t") == 0) timeit = 1;
    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
+ #if !defined NODFA
+   else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
+ #endif
    else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
-       ((size_offsets = get_value(argv[op+1], &endptr)), *endptr == 0))
+       ((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),
+         *endptr == 0))
      {
      op++;
      argc--;
-Line 422 
 while (argc > 1 && argv[op][0] == '-')
+Line 496 
 while (argc > 1 && argv[op][0] == '-')
      printf("Compiled with\n");
      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
      printf("  %sUTF-8 support\n", rc? "" : "No ");
+     (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
+     printf("  %sUnicode properties support\n", rc? "" : "No ");
      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
      printf("  Newline character is %s\n", (rc == '\r')? "CR" : "LF");
      (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
-Line 430 
 while (argc > 1 && argv[op][0] == '-')
+Line 506 
 while (argc > 1 && argv[op][0] == '-')
      printf("  POSIX malloc threshold = %d\n", rc);
      (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
      printf("  Default match limit = %d\n", rc);
+     (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
+     printf("  Match recursion uses %s\n", rc? "stack" : "heap");
      exit(0);
      }
    else
-Line 437 
 while (argc > 1 && argv[op][0] == '-')
+Line 515 
 while (argc > 1 && argv[op][0] == '-')
      printf("** Unknown or malformed option %s\n", argv[op]);
      printf("Usage:   pcretest [-d] [-i] [-o <n>] [-p] [-s] [-t] [<input> [<output>]]\n");
      printf("  -C     show PCRE compile-time options and exit\n");
-     printf("  -d     debug: show compiled code; implies -i\n"
+     printf("  -d     debug: show compiled code; implies -i\n");
-            "  -i     show information about compiled pattern\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 information\n"
+     printf("  -s     output store (memory) used information\n"
             "  -t     time compilation and execution\n");
-     return 1;
+     yield = 1;
+     goto EXIT;
      }
    op++;
    argc--;
-Line 454 
 while (argc > 1 && argv[op][0] == '-')
+Line 537 
 while (argc > 1 && argv[op][0] == '-')
  /* Get the store for the offsets vector, and remember what it was */
  size_offsets_max = size_offsets;
- offsets = malloc(size_offsets_max * sizeof(int));
+ offsets = (int *)malloc(size_offsets_max * sizeof(int));
  if (offsets == NULL)
    {
    printf("** Failed to get %d bytes of memory for offsets vector\n",
      size_offsets_max * sizeof(int));
-   return 1;
+   yield = 1;
+   goto EXIT;
    }
  /* Sort out the input and output files */
  if (argc > 1)
    {
-   infile = fopen(argv[op], "r");
+   infile = fopen(argv[op], "rb");
    if (infile == NULL)
      {
      printf("** Failed to open %s\n", argv[op]);
-     return 1;
+     yield = 1;
+     goto EXIT;
      }
    }
  if (argc > 2)
    {
-   outfile = fopen(argv[op+1], "w");
+   outfile = fopen(argv[op+1], "wb");
    if (outfile == NULL)
      {
      printf("** Failed to open %s\n", argv[op+1]);
-     return 1;
+     yield = 1;
+     goto EXIT;
      }
    }
  /* Set alternative malloc function */
  pcre_malloc = new_malloc;
+ pcre_free = new_free;
+ pcre_stack_malloc = stack_malloc;
+ pcre_stack_free = stack_free;
  /* Heading line, then prompt for first regex if stdin */
-Line 506 
 while (!done)
+Line 595 
 while (!done)
    const char *error;
    unsigned char *p, *pp, *ppp;
+   unsigned char *to_file = NULL;
    const unsigned char *tables = NULL;
+   unsigned long int true_size, true_study_size = 0;
+   size_t size, regex_gotten_store;
    int do_study = 0;
    int do_debug = debug;
    int do_G = 0;
    int do_g = 0;
    int do_showinfo = showinfo;
    int do_showrest = 0;
+   int do_flip = 0;
    int erroroffset, len, delimiter;
-   utf8 = 0;
+   use_utf8 = 0;
    if (infile == stdin) printf("  re> ");
-   if (fgets((char *)buffer, sizeof(buffer), infile) == NULL) break;
+   if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL) break;
    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
    fflush(outfile);
-Line 526 
 while (!done)
+Line 619 
 while (!done)
    while (isspace(*p)) p++;
    if (*p == 0) continue;
-   /* Get the delimiter and seek the end of the pattern; if is isn't
+   /* See if the pattern is to be loaded pre-compiled from a file. */
-   complete, read more. */
+   if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
+     {
+     unsigned long int magic;
+     uschar sbuf[8];
+     FILE *f;
+     p++;
+     pp = p + (int)strlen((char *)p);
+     while (isspace(pp[-1])) pp--;
+     *pp = 0;
+     f = fopen((char *)p, "rb");
+     if (f == NULL)
+       {
+       fprintf(outfile, "Failed to open %s: %s\n", p, strerror(errno));
+       continue;
+       }
+     if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ;
+     true_size =
+       (sbuf[0] << 24) | (sbuf[1] << 16) | (sbuf[2] << 8) | sbuf[3];
+     true_study_size =
+       (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];
+     re = (real_pcre *)new_malloc(true_size);
+     regex_gotten_store = gotten_store;
+     if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;
+     magic = ((real_pcre *)re)->magic_number;
+     if (magic != MAGIC_NUMBER)
+       {
+       if (byteflip(magic, sizeof(magic)) == MAGIC_NUMBER)
+         {
+         do_flip = 1;
+         }
+       else
+         {
+         fprintf(outfile, "Data in %s is not a compiled PCRE regex\n", p);
+         fclose(f);
+         continue;
+         }
+       }
+     fprintf(outfile, "Compiled regex%s loaded from %s\n",
+       do_flip? " (byte-inverted)" : "", p);
+     /* Need to know if UTF-8 for printing data strings */
+     new_info(re, NULL, PCRE_INFO_OPTIONS, &options);
+     use_utf8 = (options & PCRE_UTF8) != 0;
+     /* Now see if there is any following study data */
+     if (true_study_size != 0)
+       {
+       pcre_study_data *psd;
+       extra = (pcre_extra *)new_malloc(sizeof(pcre_extra) + true_study_size);
+       extra->flags = PCRE_EXTRA_STUDY_DATA;
+       psd = (pcre_study_data *)(((char *)extra) + sizeof(pcre_extra));
+       extra->study_data = psd;
+       if (fread(psd, 1, true_study_size, f) != true_study_size)
+         {
+         FAIL_READ:
+         fprintf(outfile, "Failed to read data from %s\n", p);
+         if (extra != NULL) new_free(extra);
+         if (re != NULL) new_free(re);
+         fclose(f);
+         continue;
+         }
+       fprintf(outfile, "Study data loaded from %s\n", p);
+       do_study = 1;     /* To get the data output if requested */
+       }
+     else fprintf(outfile, "No study data\n");
+     fclose(f);
+     goto SHOW_INFO;
+     }
+   /* In-line pattern (the usual case). Get the delimiter and seek the end of
+   the pattern; if is isn't complete, read more. */
    delimiter = *p++;
-Line 549 
 while (!done)
+Line 727 
 while (!done)
        }
      if (*pp != 0) break;
-     len = sizeof(buffer) - (pp - buffer);
+     len = BUFFER_SIZE - (pp - buffer);
      if (len < 256)
        {
        fprintf(outfile, "** Expression too long - missing delimiter?\n");
-Line 572 
 while (!done)
+Line 750 
 while (!done)
    if (pp[1] == '\\') *pp++ = '\\';
-   /* Terminate the pattern at the delimiter */
+   /* Terminate the pattern at the delimiter, and save a copy of the pattern
+   for callouts. */
    *pp++ = 0;
+   strcpy((char *)pbuffer, (char *)p);
    /* Look for options after final delimiter */
-Line 586 
 while (!done)
+Line 766 
 while (!done)
      {
      switch (*pp++)
        {
+       case 'f': options |= PCRE_FIRSTLINE; break;
        case 'g': do_g = 1; break;
        case 'i': options |= PCRE_CASELESS; break;
        case 'm': options |= PCRE_MULTILINE; break;
-Line 594 
 while (!done)
+Line 775 
 while (!done)
        case '+': do_showrest = 1; break;
        case 'A': options |= PCRE_ANCHORED; break;
+       case 'C': options |= PCRE_AUTO_CALLOUT; break;
        case 'D': do_debug = do_showinfo = 1; break;
        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
+       case 'F': do_flip = 1; break;
        case 'G': do_G = 1; break;
        case 'I': do_showinfo = 1; break;
        case 'M': log_store = 1; break;
-Line 608 
 while (!done)
+Line 791 
 while (!done)
        case 'S': do_study = 1; break;
        case 'U': options |= PCRE_UNGREEDY; break;
        case 'X': options |= PCRE_EXTRA; break;
-       case '8': options |= PCRE_UTF8; utf8 = 1; break;
+       case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
+       case '?': options |= PCRE_NO_UTF8_CHECK; break;
        case 'L':
        ppp = pp;
-       while (*ppp != '\n' && *ppp != ' ') ppp++;
+       /* The '\r' test here is so that it works on Windows */
+       while (*ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
        *ppp = 0;
        if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
          {
-Line 623 
 while (!done)
+Line 808 
 while (!done)
        pp = ppp;
        break;
-       case '\n': case ' ': break;
+       case '>':
+       to_file = pp;
+       while (*pp != 0) pp++;
+       while (isspace(pp[-1])) pp--;
+       *pp = 0;
+       break;
+       case '\r':                      /* So that it works in Windows */
+       case '\n':
+       case ' ':
+       break;
        default:
        fprintf(outfile, "** Unknown option '%c'\n", pp[-1]);
        goto SKIP_DATA;
-Line 639 
 while (!done)
+Line 835 
 while (!done)
      {
      int rc;
      int cflags = 0;
      if ((options & PCRE_CASELESS) != 0) cflags |= REG_ICASE;
      if ((options & PCRE_MULTILINE) != 0) cflags |= REG_NEWLINE;
+     if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
      rc = regcomp(&preg, (char *)p, cflags);
      /* Compilation failed; go back for another re, skipping to blank line
-Line 648 
 while (!done)
+Line 846 
 while (!done)
      if (rc != 0)
        {
-       (void)regerror(rc, &preg, (char *)buffer, sizeof(buffer));
+       (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);
        fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, buffer);
        goto SKIP_DATA;
        }
-Line 689 
 while (!done)
+Line 887 
 while (!done)
          {
          for (;;)
            {
-           if (fgets((char *)buffer, sizeof(buffer), infile) == NULL)
+           if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)
              {
              done = 1;
              goto CONTINUE;
-Line 713 
 while (!done)
+Line 911 
 while (!done)
                sizeof(real_pcre) -
                ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));
+     /* Extract the size for possible writing before possibly flipping it,
+     and remember the store that was got. */
+     true_size = ((real_pcre *)re)->size;
+     regex_gotten_store = gotten_store;
+     /* If /S was present, study the regexp to generate additional info to
+     help with the matching. */
+     if (do_study)
+       {
+       if (timeit)
+         {
+         register int i;
+         clock_t time_taken;
+         clock_t start_time = clock();
+         for (i = 0; i < LOOPREPEAT; i++)
+           extra = pcre_study(re, study_options, &error);
+         time_taken = clock() - start_time;
+         if (extra != NULL) free(extra);
+         fprintf(outfile, "  Study time %.3f milliseconds\n",
+           (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /
+             (double)CLOCKS_PER_SEC);
+         }
+       extra = pcre_study(re, study_options, &error);
+       if (error != NULL)
+         fprintf(outfile, "Failed to study: %s\n", error);
+       else if (extra != NULL)
+         true_study_size = ((pcre_study_data *)(extra->study_data))->size;
+       }
+     /* If the 'F' option was present, we flip the bytes of all the integer
+     fields in the regex data block and the study block. This is to make it
+     possible to test PCRE's handling of byte-flipped patterns, e.g. those
+     compiled on a different architecture. */
+     if (do_flip)
+       {
+       real_pcre *rre = (real_pcre *)re;
+       rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));
+       rre->size = byteflip(rre->size, sizeof(rre->size));
+       rre->options = byteflip(rre->options, sizeof(rre->options));
+       rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));
+       rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));
+       rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));
+       rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte));
+       rre->name_table_offset = byteflip(rre->name_table_offset,
+         sizeof(rre->name_table_offset));
+       rre->name_entry_size = byteflip(rre->name_entry_size,
+         sizeof(rre->name_entry_size));
+       rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count));
+       if (extra != NULL)
+         {
+         pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
+         rsd->size = byteflip(rsd->size, sizeof(rsd->size));
+         rsd->options = byteflip(rsd->options, sizeof(rsd->options));
+         }
+       }
+     /* Extract information from the compiled data if required */
+     SHOW_INFO:
      if (do_showinfo)
        {
-       unsigned long int get_options;
+       unsigned long int get_options, all_options;
+ #if !defined NOINFOCHECK
        int old_first_char, old_options, old_count;
+ #endif
        int count, backrefmax, first_char, need_char;
        int nameentrysize, namecount;
        const uschar *nametable;
-       size_t size;
        if (do_debug)
          {
          fprintf(outfile, "------------------------------------------------------------------\n");
-         print_internals(re, outfile);
+         _pcre_printint(re, outfile);
          }
        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
-Line 736 
 while (!done)
+Line 999 
 while (!done)
        new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);
        new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
        new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
-       new_info(re, NULL, PCRE_INFO_NAMETABLE, &nametable);
+       new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
+ #if !defined NOINFOCHECK
        old_count = pcre_info(re, &old_options, &old_first_char);
        if (count < 0) fprintf(outfile,
          "Error %d from pcre_info()\n", count);
-Line 755 
 while (!done)
+Line 1019 
 while (!done)
            "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
              get_options, old_options);
          }
+ #endif
-       if (size != gotten_store) fprintf(outfile,
+       if (size != regex_gotten_store) fprintf(outfile,
          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
-         size, gotten_store);
+         (int)size, (int)regex_gotten_store);
        fprintf(outfile, "Capturing subpattern count = %d\n", count);
        if (backrefmax > 0)
-Line 776 
 while (!done)
+Line 1041 
 while (!done)
            }
          }
+       /* The NOPARTIAL bit is a private bit in the options, so we have
+       to fish it out via out back door */
+       all_options = ((real_pcre *)re)->options;
+       if (do_flip)
+         {
+         all_options = byteflip(all_options, sizeof(all_options));
+         }
+       if ((all_options & PCRE_NOPARTIAL) != 0)
+         fprintf(outfile, "Partial matching not supported\n");
        if (get_options == 0) fprintf(outfile, "No options\n");
-         else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s\n",
+         else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s%s\n",
            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
            ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
+           ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
            ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
-           ((get_options & PCRE_UTF8) != 0)? " utf8" : "");
+           ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
+           ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "");
        if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)
          fprintf(outfile, "Case state changes\n");
-Line 802 
 while (!done)
+Line 1081 
 while (!done)
        else
          {
          int ch = first_char & 255;
-         char *caseless = ((first_char & REQ_CASELESS) == 0)?
+         const char *caseless = ((first_char & REQ_CASELESS) == 0)?
            "" : " (caseless)";
          if (isprint(ch))
            fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
-Line 817 
 while (!done)
+Line 1096 
 while (!done)
        else
          {
          int ch = need_char & 255;
-         char *caseless = ((need_char & REQ_CASELESS) == 0)?
+         const char *caseless = ((need_char & REQ_CASELESS) == 0)?
            "" : " (caseless)";
          if (isprint(ch))
            fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
          else
            fprintf(outfile, "Need char = %d%s\n", ch, caseless);
          }
-       }
-     /* If /S was present, study the regexp to generate additional info to
+       /* Don't output study size; at present it is in any case a fixed
-     help with the matching. */
+       value, but it varies, depending on the computer architecture, and
+       so messes up the test suite. (And with the /F option, it might be
+       flipped.) */
-     if (do_study)
+       if (do_study)
-       {
-       if (timeit)
          {
-         register int i;
+         if (extra == NULL)
-         clock_t time_taken;
+           fprintf(outfile, "Study returned NULL\n");
-         clock_t start_time = clock();
+         else
-         for (i = 0; i < LOOPREPEAT; i++)
+           {
-           extra = pcre_study(re, study_options, &error);
+           uschar *start_bits = NULL;
-         time_taken = clock() - start_time;
+           new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
-         if (extra != NULL) free(extra);
-         fprintf(outfile, "  Study time %.3f milliseconds\n",
+           if (start_bits == NULL)
-           (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /
+             fprintf(outfile, "No starting byte set\n");
-             (double)CLOCKS_PER_SEC);
+           else
+             {
+             int i;
+             int c = 24;
+             fprintf(outfile, "Starting byte set: ");
+             for (i = 0; i < 256; i++)
+               {
+               if ((start_bits[i/8] & (1<<(i&7))) != 0)
+                 {
+                 if (c > 75)
+                   {
+                   fprintf(outfile, "\n  ");
+                   c = 2;
+                   }
+                 if (isprint(i) && i != ' ')
+                   {
+                   fprintf(outfile, "%c ", i);
+                   c += 2;
+                   }
+                 else
+                   {
+                   fprintf(outfile, "\\x%02x ", i);
+                   c += 5;
+                   }
+                 }
+               }
+             fprintf(outfile, "\n");
+             }
+           }
          }
+       }
-       extra = pcre_study(re, study_options, &error);
+     /* If the '>' option was present, we write out the regex to a file, and
-       if (error != NULL)
+     that is all. The first 8 bytes of the file are the regex length and then
-         fprintf(outfile, "Failed to study: %s\n", error);
+     the study length, in big-endian order. */
-       else if (extra == NULL)
-         fprintf(outfile, "Study returned NULL\n");
-       else if (do_showinfo)
+     if (to_file != NULL)
+       {
+       FILE *f = fopen((char *)to_file, "wb");
+       if (f == NULL)
+         {
+         fprintf(outfile, "Unable to open %s: %s\n", to_file, strerror(errno));
+         }
+       else
          {
-         size_t size;
+         uschar sbuf[8];
-         uschar *start_bits = NULL;
+         sbuf[0] = (true_size >> 24)  & 255;
-         new_info(re, extra, PCRE_INFO_STUDYSIZE, &size);
+         sbuf[1] = (true_size >> 16)  & 255;
-         new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
+         sbuf[2] = (true_size >>  8)  & 255;
-         fprintf(outfile, "Study size = %d\n", size);
+         sbuf[3] = (true_size)  & 255;
-         if (start_bits == NULL)
-           fprintf(outfile, "No starting character set\n");
+         sbuf[4] = (true_study_size >> 24)  & 255;
+         sbuf[5] = (true_study_size >> 16)  & 255;
+         sbuf[6] = (true_study_size >>  8)  & 255;
+         sbuf[7] = (true_study_size)  & 255;
+         if (fwrite(sbuf, 1, 8, f) < 8 ||
+             fwrite(re, 1, true_size, f) < true_size)
+           {
+           fprintf(outfile, "Write error on %s: %s\n", to_file, strerror(errno));
+           }
          else
            {
-           int i;
+           fprintf(outfile, "Compiled regex written to %s\n", to_file);
-           int c = 24;
+           if (extra != NULL)
-           fprintf(outfile, "Starting character set: ");
-           for (i = 0; i < 256; i++)
              {
-             if ((start_bits[i/8] & (1<<(i%8))) != 0)
+             if (fwrite(extra->study_data, 1, true_study_size, f) <
+                 true_study_size)
                {
-               if (c > 75)
+               fprintf(outfile, "Write error on %s: %s\n", to_file,
-                 {
+                 strerror(errno));
-                 fprintf(outfile, "\n  ");
-                 c = 2;
-                 }
-               if (isprint(i) && i != ' ')
-                 {
-                 fprintf(outfile, "%c ", i);
-                 c += 2;
-                 }
-               else
-                 {
-                 fprintf(outfile, "\\x%02x ", i);
-                 c += 5;
-                 }
                }
+             else fprintf(outfile, "Study data written to %s\n", to_file);
              }
-           fprintf(outfile, "\n");
            }
+         fclose(f);
          }
+       new_free(re);
+       if (extra != NULL) new_free(extra);
+       if (tables != NULL) new_free((void *)tables);
+       continue;  /* With next regex */
        }
-     }
+     }        /* End of non-POSIX compile */
    /* Read data lines and test them */
-Line 910 
 while (!done)
+Line 1223 
 while (!done)
      int gmatched = 0;
      int start_offset = 0;
      int g_notempty = 0;
+     int use_dfa = 0;
      options = 0;
-Line 919 
 while (!done)
+Line 1233 
 while (!done)
      callout_count = 0;
      callout_fail_count = 999999;
      callout_fail_id = -1;
+     show_malloc = 0;
      if (infile == stdin) printf("data> ");
-     if (fgets((char *)buffer, sizeof(buffer), infile) == NULL)
+     if (fgets((char *)buffer, BUFFER_SIZE, infile) == NULL)
        {
        done = 1;
        goto CONTINUE;
-Line 964 
 while (!done)
+Line 1279 
 while (!done)
          /* Handle \x{..} specially - new Perl thing for utf8 */
+ #if !defined NOUTF8
          if (*p == '{')
            {
            unsigned char *pt = p;
-Line 972 
 while (!done)
+Line 1288 
 while (!done)
              c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'W');
            if (*pt == '}')
              {
-             unsigned char buffer[8];
+             unsigned char buff8[8];
              int ii, utn;
-             utn = ord2utf8(c, buffer);
+             utn = _pcre_ord2utf8(c, buff8);
-             for (ii = 0; ii < utn - 1; ii++) *q++ = buffer[ii];
+             for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
-             c = buffer[ii];   /* Last byte */
+             c = buff8[ii];   /* Last byte */
              p = pt + 1;
              break;
              }
            /* Not correct form; fall through */
            }
+ #endif
          /* Ordinary \x */
-Line 993 
 while (!done)
+Line 1310 
 while (!done)
            }
          break;
-         case 0:   /* Allows for an empty line */
+         case 0:   /* \ followed by EOF allows for an empty line */
          p--;
          continue;
+         case '>':
+         while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0';
+         continue;
          case 'A':  /* Option setting */
          options |= PCRE_ANCHORED;
          continue;
-Line 1014 
 while (!done)
+Line 1335 
 while (!done)
          else if (isalnum(*p))
            {
            uschar name[256];
-           uschar *pp = name;
+           uschar *npp = name;
-           while (isalnum(*p)) *pp++ = *p++;
+           while (isalnum(*p)) *npp++ = *p++;
-           *pp = 0;
+           *npp = 0;
-           n = pcre_get_stringnumber(re, name);
+           n = pcre_get_stringnumber(re, (char *)name);
            if (n < 0)
              fprintf(outfile, "no parentheses with name \"%s\"\n", name);
            else copystrings |= 1 << n;
-Line 1058 
 while (!done)
+Line 1379 
 while (!done)
            }
          continue;
+ #if !defined NODFA
+         case 'D':
+ #if !defined NOPOSIX
+         if (posix || do_posix)
+           printf("** Can't use dfa matching in POSIX mode: \\D ignored\n");
+         else
+ #endif
+           use_dfa = 1;
+         continue;
+         case 'F':
+         options |= PCRE_DFA_SHORTEST;
+         continue;
+ #endif
          case 'G':
          if (isdigit(*p))
            {
-Line 1067 
 while (!done)
+Line 1403 
 while (!done)
          else if (isalnum(*p))
            {
            uschar name[256];
-           uschar *pp = name;
+           uschar *npp = name;
-           while (isalnum(*p)) *pp++ = *p++;
+           while (isalnum(*p)) *npp++ = *p++;
-           *pp = 0;
+           *npp = 0;
-           n = pcre_get_stringnumber(re, name);
+           n = pcre_get_stringnumber(re, (char *)name);
            if (n < 0)
              fprintf(outfile, "no parentheses with name \"%s\"\n", name);
            else getstrings |= 1 << n;
-Line 1095 
 while (!done)
+Line 1431 
 while (!done)
            {
            size_offsets_max = n;
            free(offsets);
-           use_offsets = offsets = malloc(size_offsets_max * sizeof(int));
+           use_offsets = offsets = (int *)malloc(size_offsets_max * sizeof(int));
            if (offsets == NULL)
              {
              printf("** Failed to get %d bytes of memory for offsets vector\n",
                size_offsets_max * sizeof(int));
-             return 1;
+             yield = 1;
+             goto EXIT;
              }
            }
          use_size_offsets = n;
          if (n == 0) use_offsets = NULL;   /* Ensures it can't write to it */
          continue;
+         case 'P':
+         options |= PCRE_PARTIAL;
+         continue;
+ #if !defined NODFA
+         case 'R':
+         options |= PCRE_DFA_RESTART;
+         continue;
+ #endif
+         case 'S':
+         show_malloc = 1;
+         continue;
          case 'Z':
          options |= PCRE_NOTEOL;
          continue;
+         case '?':
+         options |= PCRE_NO_UTF8_CHECK;
+         continue;
          }
        *q++ = c;
        }
      *q = 0;
      len = q - dbuffer;
+     if ((all_use_dfa || use_dfa) && find_match_limit)
+       {
+       printf("**Match limit not relevant for DFA matching: ignored\n");
+       find_match_limit = 0;
+       }
      /* Handle matching via the POSIX interface, which does not
      support timing or playing with the match limit or callout data. */
-Line 1126 
 while (!done)
+Line 1487 
 while (!done)
        int eflags = 0;
        regmatch_t *pmatch = NULL;
        if (use_size_offsets > 0)
-         pmatch = malloc(sizeof(regmatch_t) * use_size_offsets);
+         pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
-Line 1134 
 while (!done)
+Line 1495 
 while (!done)
        if (rc != 0)
          {
-         (void)regerror(rc, &preg, (char *)buffer, sizeof(buffer));
+         (void)regerror(rc, &preg, (char *)buffer, BUFFER_SIZE);
          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
          }
        else
-Line 1173 
 while (!done)
+Line 1534 
 while (!done)
          register int i;
          clock_t time_taken;
          clock_t start_time = clock();
+ #if !defined NODFA
+         if (all_use_dfa || use_dfa)
+           {
+           int workspace[1000];
+           for (i = 0; i < LOOPREPEAT; i++)
+             count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
+               options | g_notempty, use_offsets, use_size_offsets, workspace,
+               sizeof(workspace)/sizeof(int));
+           }
+         else
+ #endif
          for (i = 0; i < LOOPREPEAT; i++)
            count = pcre_exec(re, extra, (char *)bptr, len,
              start_offset, options | g_notempty, use_offsets, use_size_offsets);
          time_taken = clock() - start_time;
          fprintf(outfile, "Execute time %.3f milliseconds\n",
            (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /
-Line 1193 
 while (!done)
+Line 1568 
 while (!done)
          if (extra == NULL)
            {
-           extra = malloc(sizeof(pcre_extra));
+           extra = (pcre_extra *)malloc(sizeof(pcre_extra));
            extra->flags = 0;
            }
          extra->flags |= PCRE_EXTRA_MATCH_LIMIT;
-Line 1209 
 while (!done)
+Line 1584 
 while (!done)
              min = mid;
              mid = (mid == max - 1)? max : (max > 0)? (min + max)/2 : mid*2;
              }
-           else if (count >= 0 || count == PCRE_ERROR_NOMATCH)
+           else if (count >= 0 || count == PCRE_ERROR_NOMATCH ||
+                                  count == PCRE_ERROR_PARTIAL)
              {
              if (mid == min + 1)
                {
-Line 1232 
 while (!done)
+Line 1608 
 while (!done)
          {
          if (extra == NULL)
            {
-           extra = malloc(sizeof(pcre_extra));
+           extra = (pcre_extra *)malloc(sizeof(pcre_extra));
            extra->flags = 0;
            }
          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;
-         extra->callout_data = (void *)callout_data;
+         extra->callout_data = &callout_data;
          count = pcre_exec(re, extra, (char *)bptr, len, start_offset,
            options | g_notempty, use_offsets, use_size_offsets);
          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;
-Line 1245 
 while (!done)
+Line 1621 
 while (!done)
        /* The normal case is just to do the match once, with the default
        value of match_limit. */
-       else count = pcre_exec(re, extra, (char *)bptr, len,
+ #if !defined NODFA
-         start_offset, options | g_notempty, use_offsets, use_size_offsets);
+       else if (all_use_dfa || use_dfa)
+         {
+         int workspace[1000];
+         count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
+           options | g_notempty, use_offsets, use_size_offsets, workspace,
+           sizeof(workspace)/sizeof(int));
+         if (count == 0)
+           {
+           fprintf(outfile, "Matched, but too many subsidiary matches\n");
+           count = use_size_offsets/2;
+           }
+         }
+ #endif
-       if (count == 0)
+       else
          {
-         fprintf(outfile, "Matched, but too many substrings\n");
+         count = pcre_exec(re, extra, (char *)bptr, len,
-         count = use_size_offsets/3;
+           start_offset, options | g_notempty, use_offsets, use_size_offsets);
+         if (count == 0)
+           {
+           fprintf(outfile, "Matched, but too many substrings\n");
+           count = use_size_offsets/3;
+           }
          }
        /* Matched */
-Line 1333 
 while (!done)
+Line 1726 
 while (!done)
            }
          }
+       /* There was a partial match */
+       else if (count == PCRE_ERROR_PARTIAL)
+         {
+         fprintf(outfile, "Partial match");
+ #if !defined NODFA
+         if ((all_use_dfa || use_dfa) && use_size_offsets > 2)
+           fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],
+             bptr + use_offsets[0]);
+ #endif
+         fprintf(outfile, "\n");
+         break;  /* Out of the /g loop */
+         }
        /* Failed to match. If this is a /g or /G loop and we previously set
        g_notempty after a null match, this is not necessarily the end.
-       We want to advance the start offset, and continue. Fudge the offset
+       We want to advance the start offset, and continue. In the case of UTF-8
-       values to achieve this. We won't be at the end of the string - that
+       matching, the advance must be one character, not one byte. Fudge the
-       was checked before setting g_notempty. */
+       offset values to achieve this. We won't be at the end of the string -
+       that was checked before setting g_notempty. */
        else
          {
          if (g_notempty != 0)
            {
+           int onechar = 1;
            use_offsets[0] = start_offset;
-           use_offsets[1] = start_offset + 1;
+           if (use_utf8)
+             {
+             while (start_offset + onechar < len)
+               {
+               int tb = bptr[start_offset+onechar];
+               if (tb <= 127) break;
+               tb &= 0xc0;
+               if (tb != 0 && tb != 0xc0) onechar++;
+               }
+             }
+           use_offsets[1] = start_offset + onechar;
            }
          else
            {
-           if (gmatched == 0)   /* Error if no previous matches */
+           if (count == PCRE_ERROR_NOMATCH)
              {
-             if (count == -1) fprintf(outfile, "No match\n");
+             if (gmatched == 0) fprintf(outfile, "No match\n");
-               else fprintf(outfile, "Error %d\n", count);
              }
+           else fprintf(outfile, "Error %d\n", count);
            break;  /* Out of the /g loop */
            }
          }
-Line 1395 
 while (!done)
+Line 1814 
 while (!done)
    if (posix || do_posix) regfree(&preg);
  #endif
-   if (re != NULL) free(re);
+   if (re != NULL) new_free(re);
-   if (extra != NULL) free(extra);
+   if (extra != NULL) new_free(extra);
    if (tables != NULL)
      {
-     free((void *)tables);
+     new_free((void *)tables);
      setlocale(LC_CTYPE, "C");
      }
    }
- fprintf(outfile, "\n");
+ if (infile == stdin) fprintf(outfile, "\n");
- return 0;
+ EXIT:
+ if (infile != NULL && infile != stdin) fclose(infile);
+ if (outfile != NULL && outfile != stdout) fclose(outfile);
+ free(buffer);
+ free(dbuffer);
+ free(pbuffer);
+ free(offsets);
+ return yield;
  }
- /* End */
+ /* End of pcretest.c */

 Legend:



Removed from v.63
 


changed lines


 
Added in v.79
 Legend:



Removed from v.63
 


changed lines


 
Added in v.79
-Removed from v.63
+Added in v.79

	ViewVC Help
Powered by ViewVC 1.1.5