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

Diff of /code/trunk/pcretest.c

Parent Directory | Revision Log | View Patch Patch

-revision 96 by nigel,
Fri Mar  2 13:10:43 2007 UTC
+revision 836 by ph10,
Wed Dec 28 17:16:11 2011 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, er, *very* untidy in places.
+ been extended and consequently is now rather, er, *very* untidy in places. The
+ addition of 16-bit support has made it even worse. :-(
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
-Line 35 
 POSSIBILITY OF SUCH DAMAGE.
+Line 36 
 POSSIBILITY OF SUCH DAMAGE.
  -----------------------------------------------------------------------------
  */
+ /* This program now supports the testing of both the 8-bit and 16-bit PCRE
+ libraries in a single program. This is different from the modules such as
+ pcre_compile.c in the library itself, which are compiled separately for each
+ mode. If both modes are enabled, for example, pcre_compile.c is compiled twice
+ (the second time with COMPILE_PCRE16 defined). By contrast, pcretest.c is
+ compiled only once. Therefore, it must not make use of any of the macros from
+ pcre_internal.h that depend on COMPILE_PCRE8 or COMPILE_PCRE16. It does,
+ however, make use of SUPPORT_PCRE8 and SUPPORT_PCRE16 to ensure that it calls
+ only supported library functions. */
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
  #include <ctype.h>
  #include <stdio.h>
-Line 44 
 POSSIBILITY OF SUCH DAMAGE.
+Line 59 
 POSSIBILITY OF SUCH DAMAGE.
  #include <locale.h>
  #include <errno.h>
+ #ifdef SUPPORT_LIBREADLINE
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #include <readline/readline.h>
+ #include <readline/history.h>
+ #endif
  /* A number of things vary for Windows builds. Originally, pcretest opened its
  input and output without "b"; then I was told that "b" was needed in some
-Line 59 
 input mode under Windows. */
+Line 82 
 input mode under Windows. */
  #define INPUT_MODE   "r"
  #define OUTPUT_MODE  "wb"
+ #ifndef isatty
+ #define isatty _isatty         /* This is what Windows calls them, I'm told, */
+ #endif                         /* though in some environments they seem to   */
+                                /* be already defined, hence the #ifndefs.    */
+ #ifndef fileno
+ #define fileno _fileno
+ #endif
+ /* A user sent this fix for Borland Builder 5 under Windows. */
+ #ifdef __BORLANDC__
+ #define _setmode(handle, mode) setmode(handle, mode)
+ #endif
+ /* Not Windows */
  #else
  #include <sys/time.h>          /* These two includes are needed */
  #include <sys/resource.h>      /* for setrlimit(). */
-Line 67 
 input mode under Windows. */
+Line 106 
 input mode under Windows. */
  #endif
- #define PCRE_SPY        /* For Win32 build, import data, not export */
+ /* We have to 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
- /* We include pcre_internal.h because we need the internal info for displaying
+ internal macros, structures, and other internal data values; pcretest has
- the results of pcre_study() and we also need to know about the internal
+ "inside information" compared to a program that strictly follows the PCRE API.
- macros, structures, and other internal data values; pcretest has "inside
- information" compared to a program that strictly follows the PCRE API. */
+ Although pcre_internal.h does itself include pcre.h, we explicitly include it
+ here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
+ appropriately for an application, not for building PCRE. */
+ #include "pcre.h"
+ #if defined SUPPORT_PCRE16 && !defined SUPPORT_PCRE8
+ /* Configure internal macros to 16 bit mode. */
+ #define COMPILE_PCRE16
+ #endif
  #include "pcre_internal.h"
- /* We need access to the data tables that PCRE uses. So as not to have to keep
+ /* The pcre_printint() function, which prints the internal form of a compiled
- two copies, we include the source file here, changing the names of the external
+ regex, is held in a separate file so that (a) it can be compiled in either
- symbols to prevent clashes. */
+-bit or 16-bit mode, and (b) it can be #included directly in pcre_compile.c
+ when that is compiled in debug mode. */
- #define _pcre_utf8_table1      utf8_table1
- #define _pcre_utf8_table1_size utf8_table1_size
- #define _pcre_utf8_table2      utf8_table2
- #define _pcre_utf8_table3      utf8_table3
- #define _pcre_utf8_table4      utf8_table4
- #define _pcre_utt              utt
- #define _pcre_utt_size         utt_size
- #define _pcre_OP_lengths       OP_lengths
- #include "pcre_tables.c"
+ #ifdef SUPPORT_PCRE8
+ void pcre_printint(pcre *external_re, FILE *f, BOOL print_lengths);
+ #endif
+ #ifdef SUPPORT_PCRE16
+ void pcre16_printint(pcre *external_re, FILE *f, BOOL print_lengths);
+ #endif
+ /* We need access to some of the data tables that PCRE uses. So as not to have
+ to keep two copies, we include the source file here, changing the names of the
+ external symbols to prevent clashes. */
+ #define PCRE_INCLUDED
+ #undef PRIV
+ #define PRIV(name) name
- /* We also need the pcre_printint() function for printing out compiled
+ #include "pcre_tables.c"
- patterns. This function is in a separate file so that it can be included in
- pcre_compile.c when that module is compiled with debugging enabled.
- The definition of the macro PRINTABLE, which determines whether to print an
+ /* The definition of the macro PRINTABLE, which determines whether to print an
  output character as-is or as a hex value when showing compiled patterns, is
- contained in this file. We uses it here also, in cases when the locale has not
+ the same as in the printint.src file. We uses it here in cases when the locale
- been explicitly changed, so as to get consistent output from systems that
+ has not been explicitly changed, so as to get consistent output from systems
- differ in their output from isprint() even in the "C" locale. */
+ that differ in their output from isprint() even in the "C" locale. */
- #include "pcre_printint.src"
+ #ifdef EBCDIC
+ #define PRINTABLE(c) ((c) >= 64 && (c) < 255)
+ #else
+ #define PRINTABLE(c) ((c) >= 32 && (c) < 127)
+ #endif
- #define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
+ #define PRINTOK(c) (locale_set? isprint(c) : PRINTABLE(c))
+ /* Posix support is disabled in 16 bit only mode. */
+ #if defined SUPPORT_PCRE16 && !defined SUPPORT_PCRE8 && !defined NOPOSIX
+ #define NOPOSIX
+ #endif
  /* 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 114 
 Makefile. */
+Line 173 
 Makefile. */
  #include "pcreposix.h"
  #endif
- /* It is also possible, for the benefit of the version imported into Exim, to
+ /* It is also possible, originally for the benefit of a version that was
- build pcretest without support for UTF8 (define NOUTF8), without the interface
+ imported into Exim, to build pcretest without support for UTF8 or UTF16 (define
- to the DFA matcher (NODFA), and without the doublecheck of the old "info"
+ NOUTF), without the interface to the DFA matcher (NODFA). In fact, we
- function (define NOINFOCHECK). */
+ automatically cut out the UTF support if PCRE is built without it. */
+ #ifndef SUPPORT_UTF
+ #ifndef NOUTF
+ #define NOUTF
+ #endif
+ #endif
+ /* To make the code a bit tidier for 8-bit and 16-bit support, we define macros
+ for all the pcre[16]_xxx functions (except pcre16_fullinfo, which is called
+ only from one place and is handled differently). I couldn't dream up any way of
+ using a single macro to do this in a generic way, because of the many different
+ argument requirements. We know that at least one of SUPPORT_PCRE8 and
+ SUPPORT_PCRE16 must be set. First define macros for each individual mode; then
+ use these in the definitions of generic macros.
+ **** Special note about the PCHARSxxx macros: the address of the string to be
+ printed is always given as two arguments: a base address followed by an offset.
+ The base address is cast to the correct data size for 8 or 16 bit data; the
+ offset is in units of this size. If the string were given as base+offset in one
+ argument, the casting might be incorrectly applied. */
+ #ifdef SUPPORT_PCRE8
+ #define PCHARS8(lv, p, offset, len, f) \
+   lv = pchars((pcre_uint8 *)(p) + offset, len, f)
+ #define PCHARSV8(p, offset, len, f) \
+   (void)pchars((pcre_uint8 *)(p) + offset, len, f)
+ #define READ_CAPTURE_NAME8(p, cn8, cn16, re) \
+   p = read_capture_name8(p, cn8, re)
+ #define SET_PCRE_CALLOUT8(callout) \
+   pcre_callout = callout
+ #define STRLEN8(p) ((int)strlen((char *)p))
+ #define PCRE_COMPILE8(re, pat, options, error, erroffset, tables) \
+   re = pcre_compile((char *)pat, options, error, erroffset, tables)
+ #define PCRE_COPY_NAMED_SUBSTRING8(rc, re, bptr, offsets, count, \
+     namesptr, cbuffer, size) \
+   rc = pcre_copy_named_substring(re, (char *)bptr, offsets, count, \
+     (char *)namesptr, cbuffer, size)
+ #define PCRE_COPY_SUBSTRING8(rc, bptr, offsets, count, i, cbuffer, size) \
+   rc = pcre_copy_substring((char *)bptr, offsets, count, i, cbuffer, size)
+ #define PCRE_DFA_EXEC8(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets, workspace, size_workspace) \
+   count = pcre_dfa_exec(re, extra, (char *)bptr, len, start_offset, options, \
+     offsets, size_offsets, workspace, size_workspace)
+ #define PCRE_EXEC8(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets) \
+   count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options, \
+     offsets, size_offsets)
+ #define PCRE_FREE_STUDY8(extra) \
+   pcre_free_study(extra)
+ #define PCRE_FREE_SUBSTRING8(substring) \
+   pcre_free_substring(substring)
+ #define PCRE_FREE_SUBSTRING_LIST8(listptr) \
+   pcre_free_substring_list(listptr)
+ #define PCRE_GET_NAMED_SUBSTRING8(rc, re, bptr, offsets, count, \
+     getnamesptr, subsptr) \
+   rc = pcre_get_named_substring(re, (char *)bptr, offsets, count, \
+     (char *)getnamesptr, subsptr)
+ #define PCRE_GET_STRINGNUMBER8(n, rc, ptr) \
+   n = pcre_get_stringnumber(re, (char *)ptr)
+ #define PCRE_GET_SUBSTRING8(rc, bptr, offsets, count, i, subsptr) \
+   rc = pcre_get_substring((char *)bptr, offsets, count, i, subsptr)
+ #define PCRE_GET_SUBSTRING_LIST8(rc, bptr, offsets, count, listptr) \
+   rc = pcre_get_substring_list((const char *)bptr, offsets, count, listptr)
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER8(re, extra, tables) \
+   pcre_pattern_to_host_byte_order(re, extra, tables)
+ #define PCRE_PRINTINT8(re, outfile, debug_lengths) \
+   pcre_printint(re, outfile, debug_lengths)
+ #define PCRE_STUDY8(extra, re, options, error) \
+   extra = pcre_study(re, options, error)
+ #endif /* SUPPORT_PCRE8 */
+ /* -----------------------------------------------------------*/
+ #ifdef SUPPORT_PCRE16
+ #define PCHARS16(lv, p, offset, len, f) \
+   lv = pchars16((PCRE_SPTR16)(p) + offset, len, f)
+ #define PCHARSV16(p, offset, len, f) \
+   (void)pchars16((PCRE_SPTR16)(p) + offset, len, f)
+ #define READ_CAPTURE_NAME16(p, cn8, cn16, re) \
+   p = read_capture_name16(p, cn16, re)
+ #define STRLEN16(p) ((int)strlen16((PCRE_SPTR16)p))
+ #define SET_PCRE_CALLOUT16(callout) \
+   pcre16_callout = callout
+ #define PCRE_COMPILE16(re, pat, options, error, erroffset, tables) \
+   re = pcre16_compile((PCRE_SPTR16)pat, options, error, erroffset, tables)
+ #define PCRE_COPY_NAMED_SUBSTRING16(rc, re, bptr, offsets, count, \
+     namesptr, cbuffer, size) \
+   rc = pcre16_copy_named_substring(re, (PCRE_SPTR16)bptr, offsets, count, \
+     (PCRE_SPTR16)namesptr, (PCRE_SCHAR16 *)cbuffer, size/2)
+ #define PCRE_COPY_SUBSTRING16(rc, bptr, offsets, count, i, cbuffer, size) \
+   rc = pcre16_copy_substring((PCRE_SPTR16)bptr, offsets, count, i, \
+     (PCRE_SCHAR16 *)cbuffer, size/2)
+ #define PCRE_DFA_EXEC16(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets, workspace, size_workspace) \
+   count = pcre16_dfa_exec(re, extra, (PCRE_SPTR16)bptr, len, start_offset, \
+     options, offsets, size_offsets, workspace, size_workspace)
+ #define PCRE_EXEC16(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets) \
+   count = pcre16_exec(re, extra, (PCRE_SPTR16)bptr, len, start_offset, \
+     options, offsets, size_offsets)
+ #define PCRE_FREE_STUDY16(extra) \
+   pcre16_free_study(extra)
+ #define PCRE_FREE_SUBSTRING16(substring) \
+   pcre16_free_substring((PCRE_SPTR16)substring)
+ #define PCRE_FREE_SUBSTRING_LIST16(listptr) \
+   pcre16_free_substring_list((PCRE_SPTR16 *)listptr)
+ #define PCRE_GET_NAMED_SUBSTRING16(rc, re, bptr, offsets, count, \
+     getnamesptr, subsptr) \
+   rc = pcre16_get_named_substring(re, (PCRE_SPTR16)bptr, offsets, count, \
+     (PCRE_SPTR16)getnamesptr, (PCRE_SPTR16 *)(void*)subsptr)
+ #define PCRE_GET_STRINGNUMBER16(n, rc, ptr) \
+   n = pcre16_get_stringnumber(re, (PCRE_SPTR16)ptr)
+ #define PCRE_GET_SUBSTRING16(rc, bptr, offsets, count, i, subsptr) \
+   rc = pcre16_get_substring((PCRE_SPTR16)bptr, offsets, count, i, \
+     (PCRE_SPTR16 *)(void*)subsptr)
+ #define PCRE_GET_SUBSTRING_LIST16(rc, bptr, offsets, count, listptr) \
+   rc = pcre16_get_substring_list((PCRE_SPTR16)bptr, offsets, count, \
+     (PCRE_SPTR16 **)(void*)listptr)
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER16(re, extra, tables) \
+   pcre16_pattern_to_host_byte_order(re, extra, tables)
+ #define PCRE_PRINTINT16(re, outfile, debug_lengths) \
+   pcre16_printint(re, outfile, debug_lengths)
+ #define PCRE_STUDY16(extra, re, options, error) \
+   extra = pcre16_study(re, options, error)
+ #endif /* SUPPORT_PCRE16 */
+ /* ----- Both modes are supported; a runtime test is needed, except for
+ pcre_config(), and the JIT stack functions, when it doesn't matter which
+ version is called. ----- */
+ #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
+ #define CHAR_SIZE (use_pcre16? 2:1)
+ #define PCHARS(lv, p, offset, len, f) \
+   if (use_pcre16) \
+     PCHARS16(lv, p, offset, len, f); \
+   else \
+     PCHARS8(lv, p, offset, len, f)
+ #define PCHARSV(p, offset, len, f) \
+   if (use_pcre16) \
+     PCHARSV16(p, offset, len, f); \
+   else \
+     PCHARSV8(p, offset, len, f)
+ #define READ_CAPTURE_NAME(p, cn8, cn16, re) \
+   if (use_pcre16) \
+     READ_CAPTURE_NAME16(p, cn8, cn16, re); \
+   else \
+     READ_CAPTURE_NAME8(p, cn8, cn16, re)
+ #define SET_PCRE_CALLOUT(callout) \
+   if (use_pcre16) \
+     SET_PCRE_CALLOUT16(callout); \
+   else \
+     SET_PCRE_CALLOUT8(callout)
+ #define STRLEN(p) (use_pcre16? STRLEN16(p) : STRLEN8(p))
+ #define PCRE_ASSIGN_JIT_STACK pcre_assign_jit_stack
+ #define PCRE_COMPILE(re, pat, options, error, erroffset, tables) \
+   if (use_pcre16) \
+     PCRE_COMPILE16(re, pat, options, error, erroffset, tables); \
+   else \
+     PCRE_COMPILE8(re, pat, options, error, erroffset, tables)
+ #define PCRE_CONFIG pcre_config
+ #define PCRE_COPY_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
+     namesptr, cbuffer, size) \
+   if (use_pcre16) \
+     PCRE_COPY_NAMED_SUBSTRING16(rc, re, bptr, offsets, count, \
+       namesptr, cbuffer, size); \
+   else \
+     PCRE_COPY_NAMED_SUBSTRING8(rc, re, bptr, offsets, count, \
+       namesptr, cbuffer, size)
+ #define PCRE_COPY_SUBSTRING(rc, bptr, offsets, count, i, cbuffer, size) \
+   if (use_pcre16) \
+     PCRE_COPY_SUBSTRING16(rc, bptr, offsets, count, i, cbuffer, size); \
+   else \
+     PCRE_COPY_SUBSTRING8(rc, bptr, offsets, count, i, cbuffer, size)
+ #define PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets, workspace, size_workspace) \
+   if (use_pcre16) \
+     PCRE_DFA_EXEC16(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets, workspace, size_workspace); \
+   else \
+     PCRE_DFA_EXEC8(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets, workspace, size_workspace)
+ #define PCRE_EXEC(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets) \
+   if (use_pcre16) \
+     PCRE_EXEC16(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets); \
+   else \
+     PCRE_EXEC8(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets)
+ #define PCRE_FREE_STUDY(extra) \
+   if (use_pcre16) \
+     PCRE_FREE_STUDY16(extra); \
+   else \
+     PCRE_FREE_STUDY8(extra)
+ #define PCRE_FREE_SUBSTRING(substring) \
+   if (use_pcre16) \
+     PCRE_FREE_SUBSTRING16(substring); \
+   else \
+     PCRE_FREE_SUBSTRING8(substring)
+ #define PCRE_FREE_SUBSTRING_LIST(listptr) \
+   if (use_pcre16) \
+     PCRE_FREE_SUBSTRING_LIST16(listptr); \
+   else \
+     PCRE_FREE_SUBSTRING_LIST8(listptr)
+ #define PCRE_GET_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
+     getnamesptr, subsptr) \
+   if (use_pcre16) \
+     PCRE_GET_NAMED_SUBSTRING16(rc, re, bptr, offsets, count, \
+       getnamesptr, subsptr); \
+   else \
+     PCRE_GET_NAMED_SUBSTRING8(rc, re, bptr, offsets, count, \
+       getnamesptr, subsptr)
+ #define PCRE_GET_STRINGNUMBER(n, rc, ptr) \
+   if (use_pcre16) \
+     PCRE_GET_STRINGNUMBER16(n, rc, ptr); \
+   else \
+     PCRE_GET_STRINGNUMBER8(n, rc, ptr)
+ #define PCRE_GET_SUBSTRING(rc, bptr, use_offsets, count, i, subsptr) \
+   if (use_pcre16) \
+     PCRE_GET_SUBSTRING16(rc, bptr, use_offsets, count, i, subsptr); \
+   else \
+     PCRE_GET_SUBSTRING8(rc, bptr, use_offsets, count, i, subsptr)
+ #define PCRE_GET_SUBSTRING_LIST(rc, bptr, offsets, count, listptr) \
+   if (use_pcre16) \
+     PCRE_GET_SUBSTRING_LIST16(rc, bptr, offsets, count, listptr); \
+   else \
+     PCRE_GET_SUBSTRING_LIST8(rc, bptr, offsets, count, listptr)
+ #define PCRE_JIT_STACK_ALLOC pcre_jit_stack_alloc
+ #define PCRE_JIT_STACK_FREE pcre_jit_stack_free
+ #define PCRE_MAKETABLES \
+   (use_pcre16? pcre16_maketables() : pcre_maketables())
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER(re, extra, tables) \
+   if (use_pcre16) \
+     PCRE_PATTERN_TO_HOST_BYTE_ORDER16(re, extra, tables); \
+   else \
+     PCRE_PATTERN_TO_HOST_BYTE_ORDER8(re, extra, tables)
+ #define PCRE_PRINTINT(re, outfile, debug_lengths) \
+   if (use_pcre16) \
+     PCRE_PRINTINT16(re, outfile, debug_lengths); \
+   else \
+     PCRE_PRINTINT8(re, outfile, debug_lengths)
+ #define PCRE_STUDY(extra, re, options, error) \
+   if (use_pcre16) \
+     PCRE_STUDY16(extra, re, options, error); \
+   else \
+     PCRE_STUDY8(extra, re, options, error)
+ /* ----- Only 8-bit mode is supported ----- */
+ #elif defined SUPPORT_PCRE8
+ #define CHAR_SIZE                 1
+ #define PCHARS                    PCHARS8
+ #define PCHARSV                   PCHARSV8
+ #define READ_CAPTURE_NAME         READ_CAPTURE_NAME8
+ #define SET_PCRE_CALLOUT          SET_PCRE_CALLOUT8
+ #define STRLEN                    STRLEN8
+ #define PCRE_ASSIGN_JIT_STACK     pcre_assign_jit_stack
+ #define PCRE_COMPILE              PCRE_COMPILE8
+ #define PCRE_CONFIG               pcre_config
+ #define PCRE_COPY_NAMED_SUBSTRING PCRE_COPY_NAMED_SUBSTRING8
+ #define PCRE_COPY_SUBSTRING       PCRE_COPY_SUBSTRING8
+ #define PCRE_DFA_EXEC             PCRE_DFA_EXEC8
+ #define PCRE_EXEC                 PCRE_EXEC8
+ #define PCRE_FREE_STUDY           PCRE_FREE_STUDY8
+ #define PCRE_FREE_SUBSTRING       PCRE_FREE_SUBSTRING8
+ #define PCRE_FREE_SUBSTRING_LIST  PCRE_FREE_SUBSTRING_LIST8
+ #define PCRE_GET_NAMED_SUBSTRING  PCRE_GET_NAMED_SUBSTRING8
+ #define PCRE_GET_STRINGNUMBER     PCRE_GET_STRINGNUMBER8
+ #define PCRE_GET_SUBSTRING        PCRE_GET_SUBSTRING8
+ #define PCRE_GET_SUBSTRING_LIST   PCRE_GET_SUBSTRING_LIST8
+ #define PCRE_JIT_STACK_ALLOC      pcre_jit_stack_alloc
+ #define PCRE_JIT_STACK_FREE       pcre_jit_stack_free
+ #define PCRE_MAKETABLES           pcre_maketables()
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER PCRE_PATTERN_TO_HOST_BYTE_ORDER8
+ #define PCRE_PRINTINT             PCRE_PRINTINT8
+ #define PCRE_STUDY                PCRE_STUDY8
+ /* ----- Only 16-bit mode is supported ----- */
+ #else
+ #define CHAR_SIZE                 2
+ #define PCHARS                    PCHARS16
+ #define PCHARSV                   PCHARSV16
+ #define READ_CAPTURE_NAME         READ_CAPTURE_NAME16
+ #define SET_PCRE_CALLOUT          SET_PCRE_CALLOUT16
+ #define STRLEN                    STRLEN16
+ #define PCRE_ASSIGN_JIT_STACK     pcre16_assign_jit_stack
+ #define PCRE_COMPILE              PCRE_COMPILE16
+ #define PCRE_CONFIG               pcre16_config
+ #define PCRE_COPY_NAMED_SUBSTRING PCRE_COPY_NAMED_SUBSTRING16
+ #define PCRE_COPY_SUBSTRING       PCRE_COPY_SUBSTRING16
+ #define PCRE_DFA_EXEC             PCRE_DFA_EXEC16
+ #define PCRE_EXEC                 PCRE_EXEC16
+ #define PCRE_FREE_STUDY           PCRE_FREE_STUDY16
+ #define PCRE_FREE_SUBSTRING       PCRE_FREE_SUBSTRING16
+ #define PCRE_FREE_SUBSTRING_LIST  PCRE_FREE_SUBSTRING_LIST16
+ #define PCRE_GET_NAMED_SUBSTRING  PCRE_GET_NAMED_SUBSTRING16
+ #define PCRE_GET_STRINGNUMBER     PCRE_GET_STRINGNUMBER16
+ #define PCRE_GET_SUBSTRING        PCRE_GET_SUBSTRING16
+ #define PCRE_GET_SUBSTRING_LIST   PCRE_GET_SUBSTRING_LIST16
+ #define PCRE_JIT_STACK_ALLOC      pcre16_jit_stack_alloc
+ #define PCRE_JIT_STACK_FREE       pcre16_jit_stack_free
+ #define PCRE_MAKETABLES           pcre16_maketables()
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER PCRE_PATTERN_TO_HOST_BYTE_ORDER16
+ #define PCRE_PRINTINT             PCRE_PRINTINT16
+ #define PCRE_STUDY                PCRE_STUDY16
+ #endif
+ /* ----- End of mode-specific function call macros ----- */
  /* Other parameters */
-Line 142 
 static int callout_count;
+Line 580 
 static int callout_count;
  static int callout_extra;
  static int callout_fail_count;
  static int callout_fail_id;
+ static int debug_lengths;
  static int first_callout;
  static int locale_set = 0;
  static int show_malloc;
- static int use_utf8;
+ static int use_utf;
  static size_t gotten_store;
+ static size_t first_gotten_store = 0;
+ static const unsigned char *last_callout_mark = NULL;
  /* The buffers grow automatically if very long input lines are encountered. */
  static int buffer_size = 50000;
- static uschar *buffer = NULL;
+ static pcre_uint8 *buffer = NULL;
- static uschar *dbuffer = NULL;
+ static pcre_uint8 *dbuffer = NULL;
- static uschar *pbuffer = NULL;
+ static pcre_uint8 *pbuffer = NULL;
+ /* Another buffer is needed translation to 16-bit character strings. It will
+ obtained and extended as required. */
+ #ifdef SUPPORT_PCRE16
+ static int buffer16_size = 0;
+ static pcre_uint16 *buffer16 = NULL;
+ #ifdef SUPPORT_PCRE8
+ /* We need the table of operator lengths that is used for 16-bit compiling, in
+ order to swap bytes in a pattern for saving/reloading testing. Luckily, the
+ data is defined as a macro. However, we must ensure that LINK_SIZE is adjusted
+ appropriately for the 16-bit world. Just as a safety check, make sure that
+ COMPILE_PCRE16 is *not* set. */
+ #ifdef COMPILE_PCRE16
+ #error COMPILE_PCRE16 must not be set when compiling pcretest.c
+ #endif
- /*************************************************
+ #if LINK_SIZE == 2
- *        Read or extend an input line            *
+ #undef LINK_SIZE
- *************************************************/
+ #define LINK_SIZE 1
+ #elif LINK_SIZE == 3 || LINK_SIZE == 4
- /* Input lines are read into buffer, but both patterns and data lines can be
+ #undef LINK_SIZE
- continued over multiple input lines. In addition, if the buffer fills up, we
+ #define LINK_SIZE 2
- want to automatically expand it so as to be able to handle extremely large
+ #else
- lines that are needed for certain stress tests. When the input buffer is
+ #error LINK_SIZE must be either 2, 3, or 4
- expanded, the other two buffers must also be expanded likewise, and the
+ #endif
- contents of pbuffer, which are a copy of the input for callouts, must be
- preserved (for when expansion happens for a data line). This is not the most
- optimal way of handling this, but hey, this is just a test program!
- Arguments:
-   f            the file to read
-   start        where in buffer to start (this *must* be within buffer)
- Returns:       pointer to the start of new data
+ #endif /* SUPPORT_PCRE8 */
-                could be a copy of start, or could be moved
-                NULL if no data read and EOF reached
- */
- static uschar *
+ static const pcre_uint16 OP_lengths16[] = { OP_LENGTHS };
- extend_inputline(FILE *f, uschar *start)
+ #endif  /* SUPPORT_PCRE16 */
- {
- uschar *here = start;
- for (;;)
+ /* If we have 8-bit support, default use_pcre16 to false; if there is also
-   {
+-bit support, it can be changed by an option. If there is no 8-bit support,
-   int rlen = buffer_size - (here - buffer);
+ there must be 16-bit support, so default it to 1. */
-   if (rlen > 1000)
+ #ifdef SUPPORT_PCRE8
-     {
+ static int use_pcre16 = 0;
-     int dlen;
+ #else
-     if (fgets((char *)here, rlen,  f) == NULL)
+ static int use_pcre16 = 1;
-       return (here == start)? NULL : start;
+ #endif
-     dlen = (int)strlen((char *)here);
-     if (dlen > 0 && here[dlen - 1] == '\n') return start;
-     here += dlen;
-     }
-   else
+ /* Textual explanations for runtime error codes */
-     {
-     int new_buffer_size = 2*buffer_size;
-     uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);
-     uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);
-     uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);
-     if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
+ static const char *errtexts[] = {
-       {
+   NULL,  /* 0 is no error */
-       fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
+   NULL,  /* NOMATCH is handled specially */
-       exit(1);
+   "NULL argument passed",
-       }
+   "bad option value",
+   "magic number missing",
+   "unknown opcode - pattern overwritten?",
+   "no more memory",
+   NULL,  /* never returned by pcre_exec() or pcre_dfa_exec() */
+   "match limit exceeded",
+   "callout error code",
+   NULL,  /* BADUTF8/16 is handled specially */
+   NULL,  /* BADUTF8/16 offset is handled specially */
+   NULL,  /* PARTIAL is handled specially */
+   "not used - internal error",
+   "internal error - pattern overwritten?",
+   "bad count value",
+   "item unsupported for DFA matching",
+   "backreference condition or recursion test not supported for DFA matching",
+   "match limit not supported for DFA matching",
+   "workspace size exceeded in DFA matching",
+   "too much recursion for DFA matching",
+   "recursion limit exceeded",
+   "not used - internal error",
+   "invalid combination of newline options",
+   "bad offset value",
+   NULL,  /* SHORTUTF8/16 is handled specially */
+   "nested recursion at the same subject position",
+   "JIT stack limit reached",
+   "pattern compiled in wrong mode: 8-bit/16-bit error"
+ };
-     memcpy(new_buffer, buffer, buffer_size);
-     memcpy(new_pbuffer, pbuffer, buffer_size);
-     buffer_size = new_buffer_size;
+ /*************************************************
+ *         Alternate character tables             *
+ *************************************************/
-     start = new_buffer + (start - buffer);
+ /* By default, the "tables" pointer when calling PCRE is set to NULL, thereby
-     here = new_buffer + (here - buffer);
+ using the default tables of the library. However, the T option can be used to
+ select alternate sets of tables, for different kinds of testing. Note also that
+ the L (locale) option also adjusts the tables. */
+ /* This is the set of tables distributed as default with PCRE. It recognizes
+ only ASCII characters. */
+ static const pcre_uint8 tables0[] = {
+ /* This table is a lower casing table. */
+,  1,  2,  3,  4,  5,  6,  7,
+,  9, 10, 11, 12, 13, 14, 15,
+, 17, 18, 19, 20, 21, 22, 23,
+, 25, 26, 27, 28, 29, 30, 31,
+, 33, 34, 35, 36, 37, 38, 39,
+, 41, 42, 43, 44, 45, 46, 47,
+, 49, 50, 51, 52, 53, 54, 55,
+, 57, 58, 59, 60, 61, 62, 63,
+, 97, 98, 99,100,101,102,103,
+,105,106,107,108,109,110,111,
+,113,114,115,116,117,118,119,
+,121,122, 91, 92, 93, 94, 95,
+, 97, 98, 99,100,101,102,103,
+,105,106,107,108,109,110,111,
+,113,114,115,116,117,118,119,
+,121,122,123,124,125,126,127,
+,129,130,131,132,133,134,135,
+,137,138,139,140,141,142,143,
+,145,146,147,148,149,150,151,
+,153,154,155,156,157,158,159,
+,161,162,163,164,165,166,167,
+,169,170,171,172,173,174,175,
+,177,178,179,180,181,182,183,
+,185,186,187,188,189,190,191,
+,193,194,195,196,197,198,199,
+,201,202,203,204,205,206,207,
+,209,210,211,212,213,214,215,
+,217,218,219,220,221,222,223,
+,225,226,227,228,229,230,231,
+,233,234,235,236,237,238,239,
+,241,242,243,244,245,246,247,
+,249,250,251,252,253,254,255,
+ /* This table is a case flipping table. */
+,  1,  2,  3,  4,  5,  6,  7,
+,  9, 10, 11, 12, 13, 14, 15,
+, 17, 18, 19, 20, 21, 22, 23,
+, 25, 26, 27, 28, 29, 30, 31,
+, 33, 34, 35, 36, 37, 38, 39,
+, 41, 42, 43, 44, 45, 46, 47,
+, 49, 50, 51, 52, 53, 54, 55,
+, 57, 58, 59, 60, 61, 62, 63,
+, 97, 98, 99,100,101,102,103,
+,105,106,107,108,109,110,111,
+,113,114,115,116,117,118,119,
+,121,122, 91, 92, 93, 94, 95,
+, 65, 66, 67, 68, 69, 70, 71,
+, 73, 74, 75, 76, 77, 78, 79,
+, 81, 82, 83, 84, 85, 86, 87,
+, 89, 90,123,124,125,126,127,
+,129,130,131,132,133,134,135,
+,137,138,139,140,141,142,143,
+,145,146,147,148,149,150,151,
+,153,154,155,156,157,158,159,
+,161,162,163,164,165,166,167,
+,169,170,171,172,173,174,175,
+,177,178,179,180,181,182,183,
+,185,186,187,188,189,190,191,
+,193,194,195,196,197,198,199,
+,201,202,203,204,205,206,207,
+,209,210,211,212,213,214,215,
+,217,218,219,220,221,222,223,
+,225,226,227,228,229,230,231,
+,233,234,235,236,237,238,239,
+,241,242,243,244,245,246,247,
+,249,250,251,252,253,254,255,
+ /* This table contains bit maps for various character classes. Each map is 32
+ bytes long and the bits run from the least significant end of each byte. The
+ classes that have their own maps are: space, xdigit, digit, upper, lower, word,
+ graph, print, punct, and cntrl. Other classes are built from combinations. */
+x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
+x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ /* This table identifies various classes of character by individual bits:
+x01   white space character
+x02   letter
+x04   decimal digit
+x08   hexadecimal digit
+x10   alphanumeric or '_'
+x80   regular expression metacharacter or binary zero
+ */
-     free(buffer);
+x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-     free(dbuffer);
+x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
-     free(pbuffer);
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
+x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
+x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
+x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
+x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
+x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
+x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
+x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
+x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /*  X - _  */
+x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
+x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
+x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
+x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
+x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
+ /* This is a set of tables that came orginally from a Windows user. It seems to
+ be at least an approximation of ISO 8859. In particular, there are characters
+ greater than 128 that are marked as spaces, letters, etc. */
+ static const pcre_uint8 tables1[] = {
+,1,2,3,4,5,6,7,
+,9,10,11,12,13,14,15,
+,17,18,19,20,21,22,23,
+,25,26,27,28,29,30,31,
+,33,34,35,36,37,38,39,
+,41,42,43,44,45,46,47,
+,49,50,51,52,53,54,55,
+,57,58,59,60,61,62,63,
+,97,98,99,100,101,102,103,
+,105,106,107,108,109,110,111,
+,113,114,115,116,117,118,119,
+,121,122,91,92,93,94,95,
+,97,98,99,100,101,102,103,
+,105,106,107,108,109,110,111,
+,113,114,115,116,117,118,119,
+,121,122,123,124,125,126,127,
+,129,130,131,132,133,134,135,
+,137,138,139,140,141,142,143,
+,145,146,147,148,149,150,151,
+,153,154,155,156,157,158,159,
+,161,162,163,164,165,166,167,
+,169,170,171,172,173,174,175,
+,177,178,179,180,181,182,183,
+,185,186,187,188,189,190,191,
+,225,226,227,228,229,230,231,
+,233,234,235,236,237,238,239,
+,241,242,243,244,245,246,215,
+,249,250,251,252,253,254,223,
+,225,226,227,228,229,230,231,
+,233,234,235,236,237,238,239,
+,241,242,243,244,245,246,247,
+,249,250,251,252,253,254,255,
+,1,2,3,4,5,6,7,
+,9,10,11,12,13,14,15,
+,17,18,19,20,21,22,23,
+,25,26,27,28,29,30,31,
+,33,34,35,36,37,38,39,
+,41,42,43,44,45,46,47,
+,49,50,51,52,53,54,55,
+,57,58,59,60,61,62,63,
+,97,98,99,100,101,102,103,
+,105,106,107,108,109,110,111,
+,113,114,115,116,117,118,119,
+,121,122,91,92,93,94,95,
+,65,66,67,68,69,70,71,
+,73,74,75,76,77,78,79,
+,81,82,83,84,85,86,87,
+,89,90,123,124,125,126,127,
+,129,130,131,132,133,134,135,
+,137,138,139,140,141,142,143,
+,145,146,147,148,149,150,151,
+,153,154,155,156,157,158,159,
+,161,162,163,164,165,166,167,
+,169,170,171,172,173,174,175,
+,177,178,179,180,181,182,183,
+,185,186,187,188,189,190,191,
+,225,226,227,228,229,230,231,
+,233,234,235,236,237,238,239,
+,241,242,243,244,245,246,215,
+,249,250,251,252,253,254,223,
+,193,194,195,196,197,198,199,
+,201,202,203,204,205,206,207,
+,209,210,211,212,213,214,247,
+,217,218,219,220,221,222,255,
+,62,0,0,1,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,1,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,255,3,
+,0,0,0,126,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,255,3,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,12,2,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,255,255,7,0,0,0,0,
+,0,0,0,0,0,0,0,
+,255,127,127,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,254,255,255,7,
+,0,0,0,0,4,32,4,
+,0,0,128,255,255,127,255,
+,0,0,0,0,0,255,3,
+,255,255,135,254,255,255,7,
+,0,0,0,0,4,44,6,
+,255,127,255,255,255,127,255,
+,0,0,0,254,255,255,255,
+,255,255,255,255,255,255,127,
+,0,0,0,254,255,255,255,
+,255,255,255,255,255,255,255,
+,2,0,0,255,255,255,255,
+,255,255,255,255,255,255,127,
+,0,0,0,255,255,255,255,
+,255,255,255,255,255,255,255,
+,0,0,0,254,255,0,252,
+,0,0,248,1,0,0,120,
+,0,0,0,254,255,255,255,
+,0,128,0,0,0,128,0,
+,255,255,255,0,0,0,0,
+,0,0,0,0,0,0,128,
+,255,255,255,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,1,1,0,1,1,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,128,0,0,0,
+,128,128,128,0,0,128,0,
+,28,28,28,28,28,28,28,
+,28,0,0,0,0,0,128,
+,26,26,26,26,26,26,18,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,18,
+,18,18,128,128,0,128,16,
+,26,26,26,26,26,26,18,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,18,
+,18,18,128,128,0,0,0,
+,0,0,0,0,1,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,0,0,0,0,0,0,
+,0,18,0,0,0,0,0,
+,0,20,20,0,18,0,0,
+,20,18,0,0,0,0,0,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,0,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,18,
+,18,18,18,18,18,18,0,
+,18,18,18,18,18,18,18
+ };
-     buffer = new_buffer;
-     dbuffer = new_dbuffer;
-     pbuffer = new_pbuffer;
-     }
-   }
- return NULL;  /* Control never gets here */
- }
+ #ifndef HAVE_STRERROR
+ /*************************************************
+ *     Provide strerror() for non-ANSI libraries  *
+ *************************************************/
+ /* Some old-fashioned systems still around (e.g. SunOS4) don't have strerror()
+ in their libraries, but can provide the same facility by this simple
+ alternative function. */
+ extern int   sys_nerr;
+ extern char *sys_errlist[];
+ char *
+ strerror(int n)
+ {
+ if (n < 0 || n >= sys_nerr) return "unknown error number";
+ return sys_errlist[n];
+ }
+ #endif /* HAVE_STRERROR */
  /*************************************************
- *          Read number from string               *
+ *         JIT memory callback                    *
  *************************************************/
- /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess
+ static pcre_jit_stack* jit_callback(void *arg)
- around with conditional compilation, just do the job by hand. It is only used
- for unpicking arguments, so just keep it simple.
- Arguments:
-   str           string to be converted
-   endptr        where to put the end pointer
- Returns:        the unsigned long
- */
- static int
- get_value(unsigned char *str, unsigned char **endptr)
  {
- int result = 0;
+ return (pcre_jit_stack *)arg;
- while(*str != 0 && isspace(*str)) str++;
- while (isdigit(*str)) result = result * 10 + (int)(*str++ - '0');
- *endptr = str;
- return(result);
  }
+ #if !defined NOUTF || defined SUPPORT_PCRE16
  /*************************************************
  *            Convert UTF-8 string to value       *
  *************************************************/
-Line 281 
 Returns:      >  0 => the number of byte
+Line 1049 
 Returns:      >  0 => the number of byte
                -6 to 0 => malformed UTF-8 character at offset = (-return)
  */
- #if !defined NOUTF8
  static int
- utf82ord(unsigned char *utf8bytes, int *vptr)
+ utf82ord(pcre_uint8 *utf8bytes, int *vptr)
  {
  int c = *utf8bytes++;
  int d = c;
-Line 323 
 if (j != i) return -(i+1);
+Line 1089 
 if (j != i) return -(i+1);
  *vptr = d;
  return i+1;
  }
+ #endif /* NOUTF || SUPPORT_PCRE16 */
- #endif
+ #if !defined NOUTF || defined SUPPORT_PCRE16
  /*************************************************
  *       Convert character value to UTF-8         *
  *************************************************/
-Line 342 
 Arguments:
+Line 1108 
 Arguments:
  Returns:     number of characters placed in the buffer
  */
- #if !defined NOUTF8
  static int
- ord2utf8(int cvalue, uschar *utf8bytes)
+ ord2utf8(int cvalue, pcre_uint8 *utf8bytes)
  {
  register int i, j;
  for (i = 0; i < utf8_table1_size; i++)
-Line 359 
 for (j = i; j > 0; j--)
+Line 1123 
 for (j = i; j > 0; j--)
  *utf8bytes = utf8_table2[i] | cvalue;
  return i + 1;
  }
+ #endif /* NOUTF || SUPPORT_PCRE16 */
+ #ifdef SUPPORT_PCRE16
+ /*************************************************
+ *         Convert a string to 16-bit             *
+ *************************************************/
+ /* In non-UTF mode, the space needed for a 16-bit string is exactly double the
+-bit size. For a UTF-8 string, the size needed for UTF-16 is no more than
+ double, because up to 0xffff uses no more than 3 bytes in UTF-8 but possibly 4
+ in UTF-16. Higher values use 4 bytes in UTF-8 and up to 4 bytes in UTF-16. The
+ result is always left in buffer16.
+ Note that this function does not object to surrogate values. This is
+ deliberate; it makes it possible to construct UTF-16 strings that are invalid,
+ for the purpose of testing that they are correctly faulted.
+ Patterns to be converted are either plain ASCII or UTF-8; data lines are always
+ in UTF-8 so that values greater than 255 can be handled.
+ Arguments:
+   data       TRUE if converting a data line; FALSE for a regex
+   p          points to a byte string
+   utf        true if UTF-8 (to be converted to UTF-16)
+   len        number of bytes in the string (excluding trailing zero)
+ Returns:     number of 16-bit data items used (excluding trailing zero)
+              OR -1 if a UTF-8 string is malformed
+              OR -2 if a value > 0x10ffff is encountered
+              OR -3 if a value > 0xffff is encountered when not in UTF mode
+ */
+ static int
+ to16(int data, pcre_uint8 *p, int utf, int len)
+ {
+ pcre_uint16 *pp;
+ if (buffer16_size < 2*len + 2)
+   {
+   if (buffer16 != NULL) free(buffer16);
+   buffer16_size = 2*len + 2;
+   buffer16 = (pcre_uint16 *)malloc(buffer16_size);
+   if (buffer16 == NULL)
+     {
+     fprintf(stderr, "pcretest: malloc(%d) failed for buffer16\n", buffer16_size);
+     exit(1);
+     }
+   }
+ pp = buffer16;
+ if (!utf && !data)
+   {
+   while (len-- > 0) *pp++ = *p++;
+   }
+ else
+   {
+   int c = 0;
+   while (len > 0)
+     {
+     int chlen = utf82ord(p, &c);
+     if (chlen <= 0) return -1;
+     if (c > 0x10ffff) return -2;
+     p += chlen;
+     len -= chlen;
+     if (c < 0x10000) *pp++ = c; else
+       {
+       if (!utf) return -3;
+       c -= 0x10000;
+       *pp++ = 0xD800 | (c >> 10);
+       *pp++ = 0xDC00 | (c & 0x3ff);
+       }
+     }
+   }
+ *pp = 0;
+ return pp - buffer16;
+ }
+ #endif
+ /*************************************************
+ *        Read or extend an input line            *
+ *************************************************/
+ /* Input lines are read into buffer, but both patterns and data lines can be
+ continued over multiple input lines. In addition, if the buffer fills up, we
+ want to automatically expand it so as to be able to handle extremely large
+ lines that are needed for certain stress tests. When the input buffer is
+ expanded, the other two buffers must also be expanded likewise, and the
+ contents of pbuffer, which are a copy of the input for callouts, must be
+ preserved (for when expansion happens for a data line). This is not the most
+ optimal way of handling this, but hey, this is just a test program!
+ Arguments:
+   f            the file to read
+   start        where in buffer to start (this *must* be within buffer)
+   prompt       for stdin or readline()
+ Returns:       pointer to the start of new data
+                could be a copy of start, or could be moved
+                NULL if no data read and EOF reached
+ */
+ static pcre_uint8 *
+ extend_inputline(FILE *f, pcre_uint8 *start, const char *prompt)
+ {
+ pcre_uint8 *here = start;
+ for (;;)
+   {
+   int rlen = (int)(buffer_size - (here - buffer));
+   if (rlen > 1000)
+     {
+     int dlen;
+     /* If libreadline support is required, use readline() to read a line if the
+     input is a terminal. Note that readline() removes the trailing newline, so
+     we must put it back again, to be compatible with fgets(). */
+ #ifdef SUPPORT_LIBREADLINE
+     if (isatty(fileno(f)))
+       {
+       size_t len;
+       char *s = readline(prompt);
+       if (s == NULL) return (here == start)? NULL : start;
+       len = strlen(s);
+       if (len > 0) add_history(s);
+       if (len > rlen - 1) len = rlen - 1;
+       memcpy(here, s, len);
+       here[len] = '\n';
+       here[len+1] = 0;
+       free(s);
+       }
+     else
  #endif
+     /* Read the next line by normal means, prompting if the file is stdin. */
+       {
+       if (f == stdin) printf("%s", prompt);
+       if (fgets((char *)here, rlen,  f) == NULL)
+         return (here == start)? NULL : start;
+       }
+     dlen = (int)strlen((char *)here);
+     if (dlen > 0 && here[dlen - 1] == '\n') return start;
+     here += dlen;
+     }
+   else
+     {
+     int new_buffer_size = 2*buffer_size;
+     pcre_uint8 *new_buffer = (pcre_uint8 *)malloc(new_buffer_size);
+     pcre_uint8 *new_dbuffer = (pcre_uint8 *)malloc(new_buffer_size);
+     pcre_uint8 *new_pbuffer = (pcre_uint8 *)malloc(new_buffer_size);
+     if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
+       {
+       fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
+       exit(1);
+       }
+     memcpy(new_buffer, buffer, buffer_size);
+     memcpy(new_pbuffer, pbuffer, buffer_size);
+     buffer_size = new_buffer_size;
+     start = new_buffer + (start - buffer);
+     here = new_buffer + (here - buffer);
+     free(buffer);
+     free(dbuffer);
+     free(pbuffer);
+     buffer = new_buffer;
+     dbuffer = new_dbuffer;
+     pbuffer = new_pbuffer;
+     }
+   }
+ return NULL;  /* Control never gets here */
+ }
+ /*************************************************
+ *          Read number from string               *
+ *************************************************/
+ /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess
+ around with conditional compilation, just do the job by hand. It is only used
+ for unpicking arguments, so just keep it simple.
+ Arguments:
+   str           string to be converted
+   endptr        where to put the end pointer
+ Returns:        the unsigned long
+ */
+ static int
+ get_value(pcre_uint8 *str, pcre_uint8 **endptr)
+ {
+ int result = 0;
+ while(*str != 0 && isspace(*str)) str++;
+ while (isdigit(*str)) result = result * 10 + (int)(*str++ - '0');
+ *endptr = str;
+ return(result);
+ }
  /*************************************************
- *             Print character string             *
+ *             Print one character                *
  *************************************************/
- /* Character string printing function. Must handle UTF-8 strings in utf8
+ /* Print a single character either literally, or as a hex escape. */
- mode. Yields number of characters printed. If handed a NULL file, just counts
- chars without printing. */
- static int pchars(unsigned char *p, int length, FILE *f)
+ static int pchar(int c, FILE *f)
+ {
+ if (PRINTOK(c))
+   {
+   if (f != NULL) fprintf(f, "%c", c);
+   return 1;
+   }
+ if (c < 0x100)
+   {
+   if (use_utf)
+     {
+     if (f != NULL) fprintf(f, "\\x{%02x}", c);
+     return 6;
+     }
+   else
+     {
+     if (f != NULL) fprintf(f, "\\x%02x", c);
+     return 4;
+     }
+   }
+ if (f != NULL) fprintf(f, "\\x{%02x}", c);
+ return (c <= 0x000000ff)? 6 :
+        (c <= 0x00000fff)? 7 :
+        (c <= 0x0000ffff)? 8 :
+        (c <= 0x000fffff)? 9 : 10;
+ }
+ #ifdef SUPPORT_PCRE8
+ /*************************************************
+ *         Print 8-bit character string           *
+ *************************************************/
+ /* Must handle UTF-8 strings in utf8 mode. Yields number of characters printed.
+ If handed a NULL file, just counts chars without printing. */
+ static int pchars(pcre_uint8 *p, int length, FILE *f)
  {
  int c = 0;
  int yield = 0;
+ if (length < 0)
+   length = strlen((char *)p);
  while (length-- > 0)
    {
- #if !defined NOUTF8
+ #if !defined NOUTF
-   if (use_utf8)
+   if (use_utf)
      {
      int rc = utf82ord(p, &c);
      if (rc > 0 && rc <= length + 1)   /* Mustn't run over the end */
        {
        length -= rc - 1;
        p += rc;
-       if (PRINTHEX(c))
+       yield += pchar(c, f);
-         {
-         if (f != NULL) fprintf(f, "%c", c);
-         yield++;
-         }
-       else
-         {
-         int n = 4;
-         if (f != NULL) fprintf(f, "\\x{%02x}", c);
-         yield += (n <= 0x000000ff)? 2 :
-                  (n <= 0x00000fff)? 3 :
-                  (n <= 0x0000ffff)? 4 :
-                  (n <= 0x000fffff)? 5 : 6;
-         }
        continue;
        }
      }
  #endif
+   c = *p++;
+   yield += pchar(c, f);
+   }
-    /* Not UTF-8, or malformed UTF-8  */
+ return yield;
+ }
+ #endif
-   c = *p++;
-   if (PRINTHEX(c))
-     {
+ #ifdef SUPPORT_PCRE16
-     if (f != NULL) fprintf(f, "%c", c);
+ /*************************************************
-     yield++;
+ *    Find length of 0-terminated 16-bit string   *
-     }
+ *************************************************/
-   else
+ static int strlen16(PCRE_SPTR16 p)
+ {
+ int len = 0;
+ while (*p++ != 0) len++;
+ return len;
+ }
+ #endif  /* SUPPORT_PCRE16 */
+ #ifdef SUPPORT_PCRE16
+ /*************************************************
+ *           Print 16-bit character string        *
+ *************************************************/
+ /* Must handle UTF-16 strings in utf mode. Yields number of characters printed.
+ If handed a NULL file, just counts chars without printing. */
+ static int pchars16(PCRE_SPTR16 p, int length, FILE *f)
+ {
+ int yield = 0;
+ if (length < 0)
+   length = strlen16(p);
+ while (length-- > 0)
+   {
+   int c = *p++ & 0xffff;
+ #if !defined NOUTF
+   if (use_utf && c >= 0xD800 && c < 0xDC00 && length > 0)
      {
-     if (f != NULL) fprintf(f, "\\x%02x", c);
+     int d = *p & 0xffff;
-     yield += 4;
+     if (d >= 0xDC00 && d < 0xDFFF)
+       {
+       c = ((c & 0x3ff) << 10) + (d & 0x3ff) + 0x10000;
+       length--;
+       p++;
+       }
      }
+ #endif
+   yield += pchar(c, f);
    }
  return yield;
  }
+ #endif  /* SUPPORT_PCRE16 */
+ #ifdef SUPPORT_PCRE8
+ /*************************************************
+ *     Read a capture name (8-bit) and check it   *
+ *************************************************/
+ static pcre_uint8 *
+ read_capture_name8(pcre_uint8 *p, pcre_uint8 **pp, pcre *re)
+ {
+ pcre_uint8 *npp = *pp;
+ while (isalnum(*p)) *npp++ = *p++;
+ *npp++ = 0;
+ *npp = 0;
+ if (pcre_get_stringnumber(re, (char *)(*pp)) < 0)
+   {
+   fprintf(outfile, "no parentheses with name \"");
+   PCHARSV(*pp, 0, -1, outfile);
+   fprintf(outfile, "\"\n");
+   }
+ *pp = npp;
+ return p;
+ }
+ #endif  /* SUPPORT_PCRE8 */
+ #ifdef SUPPORT_PCRE16
+ /*************************************************
+ *     Read a capture name (16-bit) and check it  *
+ *************************************************/
+ /* Note that the text being read is 8-bit. */
+ static pcre_uint8 *
+ read_capture_name16(pcre_uint8 *p, pcre_uint16 **pp, pcre *re)
+ {
+ pcre_uint16 *npp = *pp;
+ while (isalnum(*p)) *npp++ = *p++;
+ *npp++ = 0;
+ *npp = 0;
+ if (pcre16_get_stringnumber(re, (PCRE_SPTR16)(*pp)) < 0)
+   {
+   fprintf(outfile, "no parentheses with name \"");
+   PCHARSV(*pp, 0, -1, outfile);
+   fprintf(outfile, "\"\n");
+   }
+ *pp = npp;
+ return p;
+ }
+ #endif  /* SUPPORT_PCRE16 */
-Line 452 
 if (callout_extra)
+Line 1549 
 if (callout_extra)
      else
        {
        fprintf(f, "%2d: ", i/2);
-       (void)pchars((unsigned char *)cb->subject + cb->offset_vector[i],
+       PCHARSV(cb->subject, cb->offset_vector[i],
          cb->offset_vector[i+1] - cb->offset_vector[i], f);
        fprintf(f, "\n");
        }
-Line 465 
 printed lengths of the substrings. */
+Line 1562 
 printed lengths of the substrings. */
  if (f != NULL) fprintf(f, "--->");
- pre_start = pchars((unsigned char *)cb->subject, cb->start_match, f);
+ PCHARS(pre_start, cb->subject, 0, cb->start_match, f);
- post_start = pchars((unsigned char *)(cb->subject + cb->start_match),
+ PCHARS(post_start, cb->subject, cb->start_match,
    cb->current_position - cb->start_match, f);
- subject_length = pchars((unsigned char *)cb->subject, cb->subject_length, NULL);
+ PCHARS(subject_length, cb->subject, 0, cb->subject_length, NULL);
- (void)pchars((unsigned char *)(cb->subject + cb->current_position),
+ PCHARSV(cb->subject, cb->current_position,
    cb->subject_length - cb->current_position, f);
  if (f != NULL) fprintf(f, "\n");
-Line 508 
 fprintf(outfile, "%.*s", (cb->next_item_
+Line 1605 
 fprintf(outfile, "%.*s", (cb->next_item_
  fprintf(outfile, "\n");
  first_callout = 0;
+ if (cb->mark != last_callout_mark)
+   {
+   if (cb->mark == NULL)
+     fprintf(outfile, "Latest Mark: <unset>\n");
+   else
+     {
+     fprintf(outfile, "Latest Mark: ");
+     PCHARSV(cb->mark, 0, -1, outfile);
+     putc('\n', outfile);
+     }
+   last_callout_mark = cb->mark;
+   }
  if (cb->callout_data != NULL)
    {
    int callout_data = *((int *)(cb->callout_data));
-Line 527 
 return (cb->callout_number != callout_fa
+Line 1637 
 return (cb->callout_number != callout_fa
  *            Local malloc functions              *
  *************************************************/
- /* Alternative malloc function, to test functionality and show the size of the
+ /* Alternative malloc function, to test functionality and save the size of a
- compiled re. */
+ compiled re, which is the first store request that pcre_compile() makes. The
+ show_malloc variable is set only during matching. */
  static void *new_malloc(size_t size)
  {
  void *block = malloc(size);
  gotten_store = size;
+ if (first_gotten_store == 0) first_gotten_store = size;
  if (show_malloc)
    fprintf(outfile, "malloc       %3d %p\n", (int)size, block);
  return block;
-Line 546 
 if (show_malloc)
+Line 1658 
 if (show_malloc)
  free(block);
  }
  /* For recursion malloc/free, to test stacking calls */
  static void *stack_malloc(size_t size)
-Line 569 
 free(block);
+Line 1680 
 free(block);
  *          Call pcre_fullinfo()                  *
  *************************************************/
- /* Get one piece of information from the pcre_fullinfo() function */
+ /* Get one piece of information from the pcre_fullinfo() function. When only
+ one of 8-bit or 16-bit is supported, use_pcre16 should always have the correct
+ value, but the code is defensive.
+ Arguments:
+   re        compiled regex
+   study     study data
+   option    PCRE_INFO_xxx option
+   ptr       where to put the data
- static void new_info(pcre *re, pcre_extra *study, int option, void *ptr)
+ Returns:    0 when OK, < 0 on error
+ */
+ static int
+ new_info(pcre *re, pcre_extra *study, int option, void *ptr)
  {
  int rc;
- if ((rc = pcre_fullinfo(re, study, option, ptr)) < 0)
-   fprintf(outfile, "Error %d from pcre_fullinfo(%d)\n", rc, option);
+ if (use_pcre16)
+ #ifdef SUPPORT_PCRE16
+   rc = pcre16_fullinfo(re, study, option, ptr);
+ #else
+   rc = PCRE_ERROR_BADMODE;
+ #endif
+ else
+ #ifdef SUPPORT_PCRE8
+   rc = pcre_fullinfo(re, study, option, ptr);
+ #else
+   rc = PCRE_ERROR_BADMODE;
+ #endif
+ if (rc < 0)
+   {
+   fprintf(outfile, "Error %d from pcre%s_fullinfo(%d)\n", rc,
+     use_pcre16? "16" : "", option);
+   if (rc == PCRE_ERROR_BADMODE)
+     fprintf(outfile, "Running in %s-bit mode but pattern was compiled in "
+       "%s-bit mode\n", use_pcre16? "16":"8", use_pcre16? "8":"16");
+   }
+ return rc;
  }
  /*************************************************
- *         Byte flipping function                 *
+ *             Swap byte functions                *
  *************************************************/
- static unsigned long int
+ /* The following functions swap the bytes of a pcre_uint16 and pcre_uint32
- byteflip(unsigned long int value, int n)
+ value, respectively.
+ Arguments:
+   value        any number
+ Returns:       the byte swapped value
+ */
+ static pcre_uint32
+ swap_uint32(pcre_uint32 value)
  {
- if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
  return ((value & 0x000000ff) << 24) |
         ((value & 0x0000ff00) <<  8) |
         ((value & 0x00ff0000) >>  8) |
-        ((value & 0xff000000) >> 24);
+        (value >> 24);
+ }
+ static pcre_uint16
+ swap_uint16(pcre_uint16 value)
+ {
+ return (value >> 8) | (value << 8);
  }
+ /*************************************************
+ *        Flip bytes in a compiled pattern        *
+ *************************************************/
+ /* This function is called if the 'F' option was present on a pattern that is
+ to be written to a file. We flip the bytes of all the integer fields in the
+ regex data block and the study block. In 16-bit mode this also flips relevant
+ bytes in the pattern itself. This is to make it possible to test PCRE's
+ ability to reload byte-flipped patterns, e.g. those compiled on a different
+ architecture. */
+ static void
+ regexflip(pcre *ere, pcre_extra *extra)
+ {
+ real_pcre *re = (real_pcre *)ere;
+ #ifdef SUPPORT_PCRE16
+ int op;
+ pcre_uint16 *ptr = (pcre_uint16 *)re + re->name_table_offset;
+ int length = re->name_count * re->name_entry_size;
+ #ifdef SUPPORT_UTF
+ BOOL utf = (re->options & PCRE_UTF16) != 0;
+ BOOL utf16_char = FALSE;
+ #endif /* SUPPORT_UTF */
+ #endif /* SUPPORT_PCRE16 */
+ /* Always flip the bytes in the main data block and study blocks. */
+ re->magic_number = REVERSED_MAGIC_NUMBER;
+ re->size = swap_uint32(re->size);
+ re->options = swap_uint32(re->options);
+ re->flags = swap_uint16(re->flags);
+ re->top_bracket = swap_uint16(re->top_bracket);
+ re->top_backref = swap_uint16(re->top_backref);
+ re->first_char = swap_uint16(re->first_char);
+ re->req_char = swap_uint16(re->req_char);
+ re->name_table_offset = swap_uint16(re->name_table_offset);
+ re->name_entry_size = swap_uint16(re->name_entry_size);
+ re->name_count = swap_uint16(re->name_count);
+ if (extra != NULL)
+   {
+   pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
+   rsd->size = swap_uint32(rsd->size);
+   rsd->flags = swap_uint32(rsd->flags);
+   rsd->minlength = swap_uint32(rsd->minlength);
+   }
+ /* In 8-bit mode, that is all we need to do. In 16-bit mode we must swap bytes
+ in the name table, if present, and then in the pattern itself. */
+ #ifdef SUPPORT_PCRE16
+ if (!use_pcre16) return;
+ while(TRUE)
+   {
+   /* Swap previous characters. */
+   while (length-- > 0)
+     {
+     *ptr = swap_uint16(*ptr);
+     ptr++;
+     }
+ #ifdef SUPPORT_UTF
+   if (utf16_char)
+     {
+     if ((ptr[-1] & 0xfc00) == 0xd800)
+       {
+       /* We know that there is only one extra character in UTF-16. */
+       *ptr = swap_uint16(*ptr);
+       ptr++;
+       }
+     }
+   utf16_char = FALSE;
+ #endif /* SUPPORT_UTF */
+   /* Get next opcode. */
+   length = 0;
+   op = *ptr;
+   *ptr++ = swap_uint16(op);
+   switch (op)
+     {
+     case OP_END:
+     return;
+ #ifdef SUPPORT_UTF
+     case OP_CHAR:
+     case OP_CHARI:
+     case OP_NOT:
+     case OP_NOTI:
+     case OP_STAR:
+     case OP_MINSTAR:
+     case OP_PLUS:
+     case OP_MINPLUS:
+     case OP_QUERY:
+     case OP_MINQUERY:
+     case OP_UPTO:
+     case OP_MINUPTO:
+     case OP_EXACT:
+     case OP_POSSTAR:
+     case OP_POSPLUS:
+     case OP_POSQUERY:
+     case OP_POSUPTO:
+     case OP_STARI:
+     case OP_MINSTARI:
+     case OP_PLUSI:
+     case OP_MINPLUSI:
+     case OP_QUERYI:
+     case OP_MINQUERYI:
+     case OP_UPTOI:
+     case OP_MINUPTOI:
+     case OP_EXACTI:
+     case OP_POSSTARI:
+     case OP_POSPLUSI:
+     case OP_POSQUERYI:
+     case OP_POSUPTOI:
+     case OP_NOTSTAR:
+     case OP_NOTMINSTAR:
+     case OP_NOTPLUS:
+     case OP_NOTMINPLUS:
+     case OP_NOTQUERY:
+     case OP_NOTMINQUERY:
+     case OP_NOTUPTO:
+     case OP_NOTMINUPTO:
+     case OP_NOTEXACT:
+     case OP_NOTPOSSTAR:
+     case OP_NOTPOSPLUS:
+     case OP_NOTPOSQUERY:
+     case OP_NOTPOSUPTO:
+     case OP_NOTSTARI:
+     case OP_NOTMINSTARI:
+     case OP_NOTPLUSI:
+     case OP_NOTMINPLUSI:
+     case OP_NOTQUERYI:
+     case OP_NOTMINQUERYI:
+     case OP_NOTUPTOI:
+     case OP_NOTMINUPTOI:
+     case OP_NOTEXACTI:
+     case OP_NOTPOSSTARI:
+     case OP_NOTPOSPLUSI:
+     case OP_NOTPOSQUERYI:
+     case OP_NOTPOSUPTOI:
+     if (utf) utf16_char = TRUE;
+ #endif
+     /* Fall through. */
+     default:
+     length = OP_lengths16[op] - 1;
+     break;
+     case OP_CLASS:
+     case OP_NCLASS:
+     /* Skip the character bit map. */
+     ptr += 32/sizeof(pcre_uint16);
+     length = 0;
+     break;
+     case OP_XCLASS:
+     /* Reverse the size of the XCLASS instance. */
+     ptr++;
+     *ptr = swap_uint16(*ptr);
+     if (LINK_SIZE > 1)
+       {
+       /* LINK_SIZE can be 1 or 2 in 16 bit mode. */
+       ptr++;
+       *ptr = swap_uint16(*ptr);
+       }
+     ptr++;
+     if (LINK_SIZE > 1)
+       length = ((ptr[-LINK_SIZE] << 16) | ptr[-LINK_SIZE + 1]) -
+         (1 + LINK_SIZE + 1);
+     else
+       length = ptr[-LINK_SIZE] - (1 + LINK_SIZE + 1);
+     op = *ptr;
+     *ptr = swap_uint16(op);
+     if ((op & XCL_MAP) != 0)
+       {
+       /* Skip the character bit map. */
+       ptr += 32/sizeof(pcre_uint16);
+       length -= 32/sizeof(pcre_uint16);
+       }
+     break;
+     }
+   }
+ /* Control should never reach here in 16 bit mode. */
+ #endif /* SUPPORT_PCRE16 */
+ }
  /*************************************************
  *        Check match or recursion limit          *
  *************************************************/
  static int
- check_match_limit(pcre *re, pcre_extra *extra, uschar *bptr, int len,
+ check_match_limit(pcre *re, pcre_extra *extra, pcre_uint8 *bptr, int len,
    int start_offset, int options, int *use_offsets, int use_size_offsets,
    int flag, unsigned long int *limit, int errnumber, const char *msg)
  {
-Line 617 
 for (;;)
+Line 1967 
 for (;;)
    {
    *limit = mid;
-   count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options,
+   PCRE_EXEC(count, re, extra, bptr, len, start_offset, options,
      use_offsets, use_size_offsets);
    if (count == errnumber)
-Line 649 
 return count;
+Line 1999 
 return count;
  /*************************************************
+ *         Case-independent strncmp() function    *
+ *************************************************/
+ /*
+ Arguments:
+   s         first string
+   t         second string
+   n         number of characters to compare
+ Returns:    < 0, = 0, or > 0, according to the comparison
+ */
+ static int
+ strncmpic(pcre_uint8 *s, pcre_uint8 *t, int n)
+ {
+ while (n--)
+   {
+   int c = tolower(*s++) - tolower(*t++);
+   if (c) return c;
+   }
+ return 0;
+ }
+ /*************************************************
  *         Check newline indicator                *
  *************************************************/
- /* This is used both at compile and run-time to check for <xxx> escapes, where
+ /* This is used both at compile and run-time to check for <xxx> escapes. Print
- xxx is LF, CR, CRLF, or ANY. Print a message and return 0 if there is no match.
+ a message and return 0 if there is no match.
  Arguments:
    p           points after the leading '<'
-Line 663 
 Returns:      appropriate PCRE_NEWLINE_x
+Line 2039 
 Returns:      appropriate PCRE_NEWLINE_x
  */
  static int
- check_newline(uschar *p, FILE *f)
+ check_newline(pcre_uint8 *p, FILE *f)
  {
- if (strncmp((char *)p, "cr>", 3) == 0) return PCRE_NEWLINE_CR;
+ if (strncmpic(p, (pcre_uint8 *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
- if (strncmp((char *)p, "lf>", 3) == 0) return PCRE_NEWLINE_LF;
+ if (strncmpic(p, (pcre_uint8 *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
- if (strncmp((char *)p, "crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
+ if (strncmpic(p, (pcre_uint8 *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
- if (strncmp((char *)p, "any>", 4) == 0) return PCRE_NEWLINE_ANY;
+ if (strncmpic(p, (pcre_uint8 *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
+ if (strncmpic(p, (pcre_uint8 *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
+ if (strncmpic(p, (pcre_uint8 *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
+ if (strncmpic(p, (pcre_uint8 *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
  fprintf(f, "Unknown newline type at: <%s\n", p);
  return 0;
  }
-Line 682 
 return 0;
+Line 2061 
 return 0;
  static void
  usage(void)
  {
- printf("Usage:     pcretest [options] [<input> [<output>]]\n");
+ printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
+ printf("Input and output default to stdin and stdout.\n");
+ #ifdef SUPPORT_LIBREADLINE
+ printf("If input is a terminal, readline() is used to read from it.\n");
+ #else
+ printf("This version of pcretest is not linked with readline().\n");
+ #endif
+ printf("\nOptions:\n");
+ #ifdef SUPPORT_PCRE16
+ printf("  -16      use 16-bit interface\n");
+ #endif
  printf("  -b       show compiled code (bytecode)\n");
  printf("  -C       show PCRE compile-time options and exit\n");
+ printf("  -C arg   show a specific compile-time option\n");
+ printf("           and exit with its value. The arg can be:\n");
+ printf("     linksize     internal link size [2, 3, 4]\n");
+ printf("     pcre8        8 bit library support enabled [0, 1]\n");
+ printf("     pcre16       16 bit library support enabled [0, 1]\n");
+ printf("     utf          Unicode Transformation Format supported [0, 1]\n");
+ printf("     ucp          Unicode Properties supported [0, 1]\n");
+ printf("     jit          Just-in-time compiler supported [0, 1]\n");
  printf("  -d       debug: show compiled code and information (-b and -i)\n");
  #if !defined NODFA
  printf("  -dfa     force DFA matching for all subjects\n");
  #endif
  printf("  -help    show usage information\n");
  printf("  -i       show information about compiled patterns\n"
+        "  -M       find MATCH_LIMIT minimum for each subject\n"
         "  -m       output memory used information\n"
         "  -o <n>   set size of offsets vector to <n>\n");
  #if !defined NOPOSIX
-Line 698 
 printf("  -p       use POSIX interface\n
+Line 2096 
 printf("  -p       use POSIX interface\n
  #endif
  printf("  -q       quiet: do not output PCRE version number at start\n");
  printf("  -S <n>   set stack size to <n> megabytes\n");
- printf("  -s       output store (memory) used information\n"
+ printf("  -s       force each pattern to be studied at basic level\n"
+        "  -s+      force each pattern to be studied, using JIT if available\n"
         "  -t       time compilation and execution\n");
  printf("  -t <n>   time compilation and execution, repeating <n> times\n");
  printf("  -tm      time execution (matching) only\n");
-Line 718 
 options, followed by a set of test data,
+Line 2117 
 options, followed by a set of test data,
  int main(int argc, char **argv)
  {
  FILE *infile = stdin;
+ const char *version;
  int options = 0;
  int study_options = 0;
+ int default_find_match_limit = FALSE;
  int op = 1;
  int timeit = 0;
  int timeitm = 0;
  int showinfo = 0;
  int showstore = 0;
+ int force_study = -1;
+ int force_study_options = 0;
  int quiet = 0;
  int size_offsets = 45;
  int size_offsets_max;
-Line 738 
 int all_use_dfa = 0;
+Line 2141 
 int all_use_dfa = 0;
  int yield = 0;
  int stack_size;
- /* These vectors store, end-to-end, a list of captured substring names. Assume
+ pcre_jit_stack *jit_stack = NULL;
- that 1024 is plenty long enough for the few names we'll be testing. */
- uschar copynames[1024];
- uschar getnames[1024];
- uschar *copynamesptr;
- uschar *getnamesptr;
- /* Get buffers from malloc() so that Electric Fence will check their misuse
+ /* These vectors store, end-to-end, a list of zero-terminated captured
- when I am debugging. They grow automatically when very long lines are read. */
+ substring names, each list itself being terminated by an empty name. Assume
+ that 1024 is plenty long enough for the few names we'll be testing. It is
- buffer = (unsigned char *)malloc(buffer_size);
+ easiest to keep separate 8-bit and 16-bit versions, using the 16-bit version
- dbuffer = (unsigned char *)malloc(buffer_size);
+ for the actual memory, to ensure alignment. By defining these variables always
- pbuffer = (unsigned char *)malloc(buffer_size);
+ (whether or not 8-bit or 16-bit is supported), we avoid too much mess with
+ #ifdefs in the code. */
+ pcre_uint16 copynames[1024];
+ pcre_uint16 getnames[1024];
+ pcre_uint16 *cn16ptr;
+ pcre_uint16 *gn16ptr;
+ pcre_uint8 *copynames8 = (pcre_uint8 *)copynames;
+ pcre_uint8 *getnames8 = (pcre_uint8 *)getnames;
+ pcre_uint8 *cn8ptr;
+ pcre_uint8 *gn8ptr;
+ /* Get buffers from malloc() so that valgrind will check their misuse when
+ debugging. They grow automatically when very long lines are read. The 16-bit
+ buffer (buffer16) is obtained only if needed. */
+ buffer = (pcre_uint8 *)malloc(buffer_size);
+ dbuffer = (pcre_uint8 *)malloc(buffer_size);
+ pbuffer = (pcre_uint8 *)malloc(buffer_size);
  /* The outfile variable is static so that new_malloc can use it. */
-Line 767 
 it set 0x8000, but then I was advised th
+Line 2183 
 it set 0x8000, but then I was advised th
  _setmode( _fileno( stdout ), _O_BINARY );
  #endif
+ /* Get the version number: both pcre_version() and pcre16_version() give the
+ same answer. We just need to ensure that we call one that is available. */
+ #ifdef SUPPORT_PCRE8
+ version = pcre_version();
+ #else
+ version = pcre16_version();
+ #endif
  /* Scan options */
  while (argc > 1 && argv[op][0] == '-')
    {
-   unsigned char *endptr;
+   pcre_uint8 *endptr;
-   if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
+   if (strcmp(argv[op], "-m") == 0) showstore = 1;
-     showstore = 1;
+   else if (strcmp(argv[op], "-s") == 0) force_study = 0;
+   else if (strcmp(argv[op], "-s+") == 0)
+     {
+     force_study = 1;
+     force_study_options = PCRE_STUDY_JIT_COMPILE;
+     }
+   else if (strcmp(argv[op], "-16") == 0)
+     {
+ #ifdef SUPPORT_PCRE16
+     use_pcre16 = 1;
+ #else
+     printf("** This version of PCRE was built without 16-bit support\n");
+     exit(1);
+ #endif
+     }
    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
    else if (strcmp(argv[op], "-b") == 0) debug = 1;
    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
+   else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;
  #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((unsigned char *)argv[op+1], &endptr)),
+       ((size_offsets = get_value((pcre_uint8 *)argv[op+1], &endptr)),
          *endptr == 0))
      {
      op++;
-Line 793 
 while (argc > 1 && argv[op][0] == '-')
+Line 2233 
 while (argc > 1 && argv[op][0] == '-')
      {
      int both = argv[op][2] == 0;
      int temp;
-     if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
+     if (argc > 2 && (temp = get_value((pcre_uint8 *)argv[op+1], &endptr),
                       *endptr == 0))
        {
        timeitm = temp;
-Line 804 
 while (argc > 1 && argv[op][0] == '-')
+Line 2244 
 while (argc > 1 && argv[op][0] == '-')
      if (both) timeit = timeitm;
      }
    else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
-       ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
+       ((stack_size = get_value((pcre_uint8 *)argv[op+1], &endptr)),
          *endptr == 0))
      {
- #if defined(_WIN32) || defined(WIN32)
+ #if defined(_WIN32) || defined(WIN32) || defined(__minix)
      printf("PCRE: -S not supported on this OS\n");
      exit(1);
  #else
-Line 831 
 while (argc > 1 && argv[op][0] == '-')
+Line 2271 
 while (argc > 1 && argv[op][0] == '-')
    else if (strcmp(argv[op], "-C") == 0)
      {
      int rc;
-     printf("PCRE version %s\n", pcre_version());
+     unsigned long int lrc;
+     if (argc > 2)
+       {
+       if (strcmp(argv[op + 1], "linksize") == 0)
+         {
+         (void)PCRE_CONFIG(PCRE_CONFIG_LINK_SIZE, &rc);
+         printf("%d\n", rc);
+         yield = rc;
+         goto EXIT;
+         }
+       if (strcmp(argv[op + 1], "pcre8") == 0)
+         {
+ #ifdef SUPPORT_PCRE8
+         printf("1\n");
+         yield = 1;
+ #else
+         printf("0\n");
+         yield = 0;
+ #endif
+         goto EXIT;
+         }
+       if (strcmp(argv[op + 1], "pcre16") == 0)
+         {
+ #ifdef SUPPORT_PCRE16
+         printf("1\n");
+         yield = 1;
+ #else
+         printf("0\n");
+         yield = 0;
+ #endif
+         goto EXIT;
+         }
+       if (strcmp(argv[op + 1], "utf") == 0)
+         {
+ #ifdef SUPPORT_PCRE8
+         (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
+         printf("%d\n", rc);
+         yield = rc;
+ #else
+         (void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
+         printf("%d\n", rc);
+         yield = rc;
+ #endif
+         goto EXIT;
+         }
+       if (strcmp(argv[op + 1], "ucp") == 0)
+         {
+         (void)PCRE_CONFIG(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
+         printf("%d\n", rc);
+         yield = rc;
+         goto EXIT;
+         }
+       if (strcmp(argv[op + 1], "jit") == 0)
+         {
+         (void)PCRE_CONFIG(PCRE_CONFIG_JIT, &rc);
+         printf("%d\n", rc);
+         yield = rc;
+         goto EXIT;
+         }
+       printf("Unknown option: %s\n", argv[op + 1]);
+       goto EXIT;
+       }
+     printf("PCRE version %s\n", version);
      printf("Compiled with\n");
+ /* At least one of SUPPORT_PCRE8 and SUPPORT_PCRE16 will be set. If both
+ are set, either both UTFs are supported or both are not supported. */
+ #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
+     printf("  8-bit and 16-bit support\n");
+     (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
+     if (rc)
+       printf("  UTF-8 and UTF-16 support\n");
+     else
+       printf("  No UTF-8 or UTF-16 support\n");
+ #elif defined SUPPORT_PCRE8
+     printf("  8-bit support only\n");
      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
      printf("  %sUTF-8 support\n", rc? "" : "No ");
-     (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
+ #else
+     printf("  16-bit support only\n");
+     (void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
+     printf("  %sUTF-16 support\n", rc? "" : "No ");
+ #endif
+     (void)PCRE_CONFIG(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
      printf("  %sUnicode properties support\n", rc? "" : "No ");
-     (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
+     (void)PCRE_CONFIG(PCRE_CONFIG_JIT, &rc);
-     printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :
+     if (rc)
-       (rc == '\n')? "LF" : (rc == ('\r'<<8 | '\n'))? "CRLF" :
+       printf("  Just-in-time compiler support\n");
+     else
+       printf("  No just-in-time compiler support\n");
+     (void)PCRE_CONFIG(PCRE_CONFIG_NEWLINE, &rc);
+     /* Note that these values are always the ASCII values, even
+     in EBCDIC environments. CR is 13 and NL is 10. */
+     printf("  Newline sequence is %s\n", (rc == 13)? "CR" :
+       (rc == 10)? "LF" : (rc == (13<<8 | 10))? "CRLF" :
+       (rc == -2)? "ANYCRLF" :
        (rc == -1)? "ANY" : "???");
-     (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
+     (void)PCRE_CONFIG(PCRE_CONFIG_BSR, &rc);
+     printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
+                                      "all Unicode newlines");
+     (void)PCRE_CONFIG(PCRE_CONFIG_LINK_SIZE, &rc);
      printf("  Internal link size = %d\n", rc);
-     (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
+     (void)PCRE_CONFIG(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
      printf("  POSIX malloc threshold = %d\n", rc);
-     (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
+     (void)PCRE_CONFIG(PCRE_CONFIG_MATCH_LIMIT, &lrc);
-     printf("  Default match limit = %d\n", rc);
+     printf("  Default match limit = %ld\n", lrc);
-     (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);
+     (void)PCRE_CONFIG(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
-     printf("  Default recursion depth limit = %d\n", rc);
+     printf("  Default recursion depth limit = %ld\n", lrc);
-     (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
+     (void)PCRE_CONFIG(PCRE_CONFIG_STACKRECURSE, &rc);
      printf("  Match recursion uses %s\n", rc? "stack" : "heap");
-     exit(0);
+     goto EXIT;
      }
    else if (strcmp(argv[op], "-help") == 0 ||
             strcmp(argv[op], "--help") == 0)
-Line 877 
 offsets = (int *)malloc(size_offsets_max
+Line 2411 
 offsets = (int *)malloc(size_offsets_max
  if (offsets == NULL)
    {
    printf("** Failed to get %d bytes of memory for offsets vector\n",
-     size_offsets_max * sizeof(int));
+     (int)(size_offsets_max * sizeof(int)));
    yield = 1;
    goto EXIT;
    }
-Line 908 
 if (argc > 2)
+Line 2442 
 if (argc > 2)
  /* Set alternative malloc function */
+ #ifdef SUPPORT_PCRE8
  pcre_malloc = new_malloc;
  pcre_free = new_free;
  pcre_stack_malloc = stack_malloc;
  pcre_stack_free = stack_free;
+ #endif
+ #ifdef SUPPORT_PCRE16
+ pcre16_malloc = new_malloc;
+ pcre16_free = new_free;
+ pcre16_stack_malloc = stack_malloc;
+ pcre16_stack_free = stack_free;
+ #endif
  /* Heading line unless quiet, then prompt for first regex if stdin */
- if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());
+ if (!quiet) fprintf(outfile, "PCRE version %s\n\n", version);
  /* Main loop */
-Line 930 
 while (!done)
+Line 2473 
 while (!done)
  #endif
    const char *error;
-   unsigned char *p, *pp, *ppp;
+   pcre_uint8 *markptr;
-   unsigned char *to_file = NULL;
+   pcre_uint8 *p, *pp, *ppp;
-   const unsigned char *tables = NULL;
+   pcre_uint8 *to_file = NULL;
+   const pcre_uint8 *tables = NULL;
    unsigned long int true_size, true_study_size = 0;
    size_t size, regex_gotten_store;
+   int do_allcaps = 0;
+   int do_mark = 0;
    int do_study = 0;
+   int no_force_study = 0;
    int do_debug = debug;
    int do_G = 0;
    int do_g = 0;
    int do_showinfo = showinfo;
    int do_showrest = 0;
+   int do_showcaprest = 0;
    int do_flip = 0;
    int erroroffset, len, delimiter, poffset;
-   use_utf8 = 0;
+   use_utf = 0;
+   debug_lengths = 1;
-   if (infile == stdin) printf("  re> ");
+   if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
-   if (extend_inputline(infile, buffer) == NULL) break;
    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
    fflush(outfile);
-Line 960 
 while (!done)
+Line 2508 
 while (!done)
    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
      {
      unsigned long int magic, get_options;
-     uschar sbuf[8];
+     pcre_uint8 sbuf[8];
      FILE *f;
      p++;
-Line 983 
 while (!done)
+Line 2531 
 while (!done)
        (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];
      re = (real_pcre *)new_malloc(true_size);
-     regex_gotten_store = gotten_store;
+     regex_gotten_store = first_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)
+       if (swap_uint32(magic) == MAGIC_NUMBER)
          {
          do_flip = 1;
          }
-Line 1002 
 while (!done)
+Line 2550 
 while (!done)
          }
        }
-     fprintf(outfile, "Compiled regex%s loaded from %s\n",
+     fprintf(outfile, "Compiled pattern%s loaded from %s\n",
        do_flip? " (byte-inverted)" : "", p);
-     /* Need to know if UTF-8 for printing data strings */
+     /* Now see if there is any following study data. */
-     new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
-     use_utf8 = (get_options & PCRE_UTF8) != 0;
-     /* Now see if there is any following study data */
      if (true_study_size != 0)
        {
-Line 1026 
 while (!done)
+Line 2569 
 while (!done)
          {
          FAIL_READ:
          fprintf(outfile, "Failed to read data from %s\n", p);
-         if (extra != NULL) new_free(extra);
+         if (extra != NULL)
+           {
+           PCRE_FREE_STUDY(extra);
+           }
          if (re != NULL) new_free(re);
          fclose(f);
          continue;
-Line 1036 
 while (!done)
+Line 2582 
 while (!done)
        }
      else fprintf(outfile, "No study data\n");
+     /* Flip the necessary bytes. */
+     if (do_flip)
+       {
+       PCRE_PATTERN_TO_HOST_BYTE_ORDER(re, extra, NULL);
+       }
+     /* Need to know if UTF-8 for printing data strings. */
+     if (new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options) < 0) continue;
+     use_utf = (get_options & PCRE_UTF8) != 0;
      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. */
+   the pattern; if it isn't complete, read more. */
    delimiter = *p++;
    if (isalnum(delimiter) || delimiter == '\\')
      {
-     fprintf(outfile, "** Delimiter must not be alphameric or \\\n");
+     fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
      goto SKIP_DATA;
      }
    pp = p;
-   poffset = p - buffer;
+   poffset = (int)(p - buffer);
    for(;;)
      {
-Line 1063 
 while (!done)
+Line 2620 
 while (!done)
        pp++;
        }
      if (*pp != 0) break;
-     if (infile == stdin) printf("    > ");
+     if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
-     if ((pp = extend_inputline(infile, pp)) == NULL)
        {
        fprintf(outfile, "** Unexpected EOF\n");
        done = 1;
-Line 1107 
 while (!done)
+Line 2663 
 while (!done)
        case 's': options |= PCRE_DOTALL; break;
        case 'x': options |= PCRE_EXTENDED; break;
-       case '+': do_showrest = 1; break;
+       case '+':
+       if (do_showrest) do_showcaprest = 1; else do_showrest = 1;
+       break;
+       case '=': do_allcaps = 1; break;
        case 'A': options |= PCRE_ANCHORED; break;
        case 'B': do_debug = 1; break;
        case 'C': options |= PCRE_AUTO_CALLOUT; break;
-Line 1117 
 while (!done)
+Line 2677 
 while (!done)
        case 'G': do_G = 1; break;
        case 'I': do_showinfo = 1; break;
        case 'J': options |= PCRE_DUPNAMES; break;
+       case 'K': do_mark = 1; break;
        case 'M': log_store = 1; break;
        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
-Line 1124 
 while (!done)
+Line 2685 
 while (!done)
        case 'P': do_posix = 1; break;
  #endif
-       case 'S': do_study = 1; break;
+       case 'S':
+       if (do_study == 0)
+         {
+         do_study = 1;
+         if (*pp == '+')
+           {
+           study_options |= PCRE_STUDY_JIT_COMPILE;
+           pp++;
+           }
+         }
+       else
+         {
+         do_study = 0;
+         no_force_study = 1;
+         }
+       break;
        case 'U': options |= PCRE_UNGREEDY; break;
+       case 'W': options |= PCRE_UCP; break;
        case 'X': options |= PCRE_EXTRA; break;
-       case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
+       case 'Y': options |= PCRE_NO_START_OPTIMISE; break;
+       case 'Z': debug_lengths = 0; break;
+       case '8': options |= PCRE_UTF8; use_utf = 1; break;
        case '?': options |= PCRE_NO_UTF8_CHECK; break;
+       case 'T':
+       switch (*pp++)
+         {
+         case '0': tables = tables0; break;
+         case '1': tables = tables1; break;
+         case '\r':
+         case '\n':
+         case ' ':
+         case 0:
+         fprintf(outfile, "** Missing table number after /T\n");
+         goto SKIP_DATA;
+         default:
+         fprintf(outfile, "** Bad table number \"%c\" after /T\n", pp[-1]);
+         goto SKIP_DATA;
+         }
+       break;
        case 'L':
        ppp = pp;
        /* The '\r' test here is so that it works on Windows. */
-Line 1142 
 while (!done)
+Line 2741 
 while (!done)
          goto SKIP_DATA;
          }
        locale_set = 1;
-       tables = pcre_maketables();
+       tables = PCRE_MAKETABLES;
        pp = ppp;
        break;
-Line 1155 
 while (!done)
+Line 2754 
 while (!done)
        case '<':
          {
-         int x = check_newline(pp, outfile);
+         if (strncmpic(pp, (pcre_uint8 *)"JS>", 3) == 0)
-         if (x == 0) goto SKIP_DATA;
+           {
-         options |= x;
+           options |= PCRE_JAVASCRIPT_COMPAT;
-         while (*pp++ != '>');
+           pp += 3;
+           }
+         else
+           {
+           int x = check_newline(pp, outfile);
+           if (x == 0) goto SKIP_DATA;
+           options |= x;
+           while (*pp++ != '>');
+           }
          }
        break;
-Line 1175 
 while (!done)
+Line 2782 
 while (!done)
    /* Handle compiling via the POSIX interface, which doesn't support the
    timing, showing, or debugging options, nor the ability to pass over
-   local character tables. */
+   local character tables. Neither does it have 16-bit support. */
  #if !defined NOPOSIX
    if (posix || do_posix)
-Line 1188 
 while (!done)
+Line 2795 
 while (!done)
      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
+     if ((options & PCRE_UCP) != 0) cflags |= REG_UCP;
+     if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;
+     first_gotten_store = 0;
      rc = regcomp(&preg, (char *)p, cflags);
      /* Compilation failed; go back for another re, skipping to blank line
-Line 1208 
 while (!done)
+Line 2818 
 while (!done)
  #endif  /* !defined NOPOSIX */
      {
+     unsigned long int get_options;
+     /* In 16-bit mode, convert the input. */
+ #ifdef SUPPORT_PCRE16
+     if (use_pcre16)
+       {
+       switch(to16(FALSE, p, options & PCRE_UTF8, (int)strlen((char *)p)))
+         {
+         case -1:
+         fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
+           "converted to UTF-16\n");
+         goto SKIP_DATA;
+         case -2:
+         fprintf(outfile, "**Failed: character value greater than 0x10ffff "
+           "cannot be converted to UTF-16\n");
+         goto SKIP_DATA;
+         case -3: /* "Impossible error" when to16 is called arg1 FALSE */
+         fprintf(outfile, "**Failed: character value greater than 0xffff "
+           "cannot be converted to 16-bit in non-UTF mode\n");
+         goto SKIP_DATA;
+         default:
+         break;
+         }
+       p = (pcre_uint8 *)buffer16;
+       }
+ #endif
+     /* Compile many times when timing */
      if (timeit > 0)
        {
        register int i;
-Line 1215 
 while (!done)
+Line 2858 
 while (!done)
        clock_t start_time = clock();
        for (i = 0; i < timeit; i++)
          {
-         re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
+         PCRE_COMPILE(re, p, options, &error, &erroroffset, tables);
          if (re != NULL) free(re);
          }
        time_taken = clock() - start_time;
-Line 1224 
 while (!done)
+Line 2867 
 while (!done)
            (double)CLOCKS_PER_SEC);
        }
-     re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
+     first_gotten_store = 0;
+     PCRE_COMPILE(re, p, options, &error, &erroroffset, tables);
      /* Compilation failed; go back for another re, skipping to blank line
      if non-interactive. */
-Line 1237 
 while (!done)
+Line 2881 
 while (!done)
          {
          for (;;)
            {
-           if (extend_inputline(infile, buffer) == NULL)
+           if (extend_inputline(infile, buffer, NULL) == NULL)
              {
              done = 1;
              goto CONTINUE;
-Line 1251 
 while (!done)
+Line 2895 
 while (!done)
        goto CONTINUE;
        }
-     /* Compilation succeeded; print data if required. There are now two
+     /* Compilation succeeded. It is now possible to set the UTF-8 option from
-     info-returning functions. The old one has a limited interface and
+     within the regex; check for this so that we know how to process the data
-     returns only limited data. Check that it agrees with the newer one. */
+     lines. */
-     if (log_store)
+     if (new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options) < 0)
-       fprintf(outfile, "Memory allocation (code space): %d\n",
+       goto SKIP_DATA;
-         (int)(gotten_store -
+     if ((get_options & PCRE_UTF8) != 0) use_utf = 1;
-               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;
+     regex_gotten_store = first_gotten_store;
+     /* Output code size information if requested */
+     if (log_store)
+       fprintf(outfile, "Memory allocation (code space): %d\n",
+         (int)(first_gotten_store -
+               sizeof(real_pcre) -
+               ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));
-     /* If /S was present, study the regexp to generate additional info to
+     /* If -s or /S was present, study the regex to generate additional info to
-     help with the matching. */
+     help with the matching, unless the pattern has the SS option, which
+     suppresses the effect of /S (used for a few test patterns where studying is
+     never sensible). */
-     if (do_study)
+     if (do_study || (force_study >= 0 && !no_force_study))
        {
        if (timeit > 0)
          {
-Line 1278 
 while (!done)
+Line 2930 
 while (!done)
          clock_t time_taken;
          clock_t start_time = clock();
          for (i = 0; i < timeit; i++)
-           extra = pcre_study(re, study_options, &error);
+           {
+           PCRE_STUDY(extra, re, study_options | force_study_options, &error);
+           }
          time_taken = clock() - start_time;
-         if (extra != NULL) free(extra);
+         if (extra != NULL)
+           {
+           PCRE_FREE_STUDY(extra);
+           }
          fprintf(outfile, "  Study time %.4f milliseconds\n",
            (((double)time_taken * 1000.0) / (double)timeit) /
              (double)CLOCKS_PER_SEC);
          }
-       extra = pcre_study(re, study_options, &error);
+       PCRE_STUDY(extra, re, study_options | force_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 (log_store)
+           {
+           size_t jitsize;
+           if (new_info(re, extra, PCRE_INFO_JITSIZE, &jitsize) == 0 &&
+               jitsize != 0)
+             fprintf(outfile, "Memory allocation (JIT code): %d\n", (int)jitsize);
+           }
+         }
        }
-     /* If the 'F' option was present, we flip the bytes of all the integer
+     /* If /K was present, we set up for handling MARK data. */
-     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)
+     if (do_mark)
        {
-       real_pcre *rre = (real_pcre *)re;
+       if (extra == NULL)
-       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);
+         extra = (pcre_extra *)malloc(sizeof(pcre_extra));
-         rsd->size = byteflip(rsd->size, sizeof(rsd->size));
+         extra->flags = 0;
-         rsd->options = byteflip(rsd->options, sizeof(rsd->options));
          }
+       extra->mark = &markptr;
+       extra->flags |= PCRE_EXTRA_MARK;
        }
-     /* Extract information from the compiled data if required */
+     /* Extract and display information from the compiled data if required. */
      SHOW_INFO:
      if (do_debug)
        {
        fprintf(outfile, "------------------------------------------------------------------\n");
-       pcre_printint(re, outfile);
+       PCRE_PRINTINT(re, outfile, debug_lengths);
        }
+     /* We already have the options in get_options (see above) */
      if (do_showinfo)
        {
-       unsigned long int get_options, all_options;
+       unsigned long int all_options;
- #if !defined NOINFOCHECK
+       int count, backrefmax, first_char, need_char, okpartial, jchanged,
-       int old_first_char, old_options, old_count;
+         hascrorlf;
- #endif
-       int count, backrefmax, first_char, need_char;
        int nameentrysize, namecount;
-       const uschar *nametable;
+       const pcre_uint8 *nametable;
-       new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
+       if (new_info(re, NULL, PCRE_INFO_SIZE, &size) +
-       new_info(re, NULL, PCRE_INFO_SIZE, &size);
+           new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count) +
-       new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
+           new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax) +
-       new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);
+           new_info(re, NULL, PCRE_INFO_FIRSTBYTE, &first_char) +
-       new_info(re, NULL, PCRE_INFO_FIRSTBYTE, &first_char);
+           new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char) +
-       new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);
+           new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize) +
-       new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
+           new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount) +
-       new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
+           new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable) +
-       new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
+           new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial) +
+           new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged) +
- #if !defined NOINFOCHECK
+           new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf)
-       old_count = pcre_info(re, &old_options, &old_first_char);
+           != 0)
-       if (count < 0) fprintf(outfile,
+         goto SKIP_DATA;
-         "Error %d from pcre_info()\n", count);
-       else
-         {
-         if (old_count != count) fprintf(outfile,
-           "Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count,
-             old_count);
-         if (old_first_char != first_char) fprintf(outfile,
-           "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n",
-             first_char, old_first_char);
-         if (old_options != (int)get_options) fprintf(outfile,
-           "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
-             get_options, old_options);
-         }
- #endif
        if (size != regex_gotten_store) fprintf(outfile,
          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
-Line 1384 
 while (!done)
+Line 3018 
 while (!done)
          fprintf(outfile, "Named capturing subpatterns:\n");
          while (namecount-- > 0)
            {
-           fprintf(outfile, "  %s %*s%3d\n", nametable + 2,
+ #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
-             nameentrysize - 3 - (int)strlen((char *)nametable + 2), "",
+           int imm2_size = use_pcre16 ? 1 : 2;
-             GET2(nametable, 0));
+ #else
+           int imm2_size = IMM2_SIZE;
+ #endif
+           int length = (int)STRLEN(nametable + imm2_size);
+           fprintf(outfile, "  ");
+           PCHARSV(nametable, imm2_size, length, outfile);
+           while (length++ < nameentrysize - imm2_size) putc(' ', outfile);
+ #if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
+           fprintf(outfile, "%3d\n", use_pcre16?
+              (int)(((PCRE_SPTR16)nametable)[0])
+             :((int)nametable[0] << 8) | (int)nametable[1]);
+           nametable += nameentrysize * (use_pcre16 ? 2 : 1);
+ #else
+           fprintf(outfile, "%3d\n", GET2(nametable, 0));
+ #ifdef SUPPORT_PCRE8
            nametable += nameentrysize;
+ #else
+           nametable += nameentrysize * 2;
+ #endif
+ #endif
            }
          }
-       /* The NOPARTIAL bit is a private bit in the options, so we have
+       if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
-       to fish it out via out back door */
+       if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
        all_options = ((real_pcre *)re)->options;
-       if (do_flip)
+       if (do_flip) all_options = swap_uint32(all_options);
-         {
-         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%s%s%s%s\n",
+         else fprintf(outfile, "Options:%s%s%s%s%s%s%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_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
+           ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
            ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
            ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
            ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
            ((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
-           ((get_options & PCRE_UTF8) != 0)? " utf8" : "",
+           ((get_options & PCRE_UTF8) != 0)? " utf" : "",
-           ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
+           ((get_options & PCRE_UCP) != 0)? " ucp" : "",
+           ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf_check" : "",
+           ((get_options & PCRE_NO_START_OPTIMIZE) != 0)? " no_start_optimize" : "",
            ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
+       if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
        switch (get_options & PCRE_NEWLINE_BITS)
          {
          case PCRE_NEWLINE_CR:
-Line 1433 
 while (!done)
+Line 3085 
 while (!done)
          fprintf(outfile, "Forced newline sequence: CRLF\n");
          break;
+         case PCRE_NEWLINE_ANYCRLF:
+         fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
+         break;
          case PCRE_NEWLINE_ANY:
          fprintf(outfile, "Forced newline sequence: ANY\n");
          break;
-Line 1451 
 while (!done)
+Line 3107 
 while (!done)
          }
        else
          {
-         int ch = first_char & 255;
+         const char *caseless =
-         const char *caseless = ((first_char & REQ_CASELESS) == 0)?
+           ((((real_pcre *)re)->flags & PCRE_FCH_CASELESS) == 0)?
            "" : " (caseless)";
-         if (PRINTHEX(ch))
-           fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
+         if (PRINTOK(first_char))
+           fprintf(outfile, "First char = \'%c\'%s\n", first_char, caseless);
          else
-           fprintf(outfile, "First char = %d%s\n", ch, caseless);
+           {
+           fprintf(outfile, "First char = ");
+           pchar(first_char, outfile);
+           fprintf(outfile, "%s\n", caseless);
+           }
          }
        if (need_char < 0)
-Line 1466 
 while (!done)
+Line 3127 
 while (!done)
          }
        else
          {
-         int ch = need_char & 255;
+         const char *caseless =
-         const char *caseless = ((need_char & REQ_CASELESS) == 0)?
+           ((((real_pcre *)re)->flags & PCRE_RCH_CASELESS) == 0)?
            "" : " (caseless)";
-         if (PRINTHEX(ch))
-           fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
+         if (PRINTOK(need_char))
+           fprintf(outfile, "Need char = \'%c\'%s\n", need_char, caseless);
          else
-           fprintf(outfile, "Need char = %d%s\n", ch, caseless);
+           {
+           fprintf(outfile, "Need char = ");
+           pchar(need_char, outfile);
+           fprintf(outfile, "%s\n", caseless);
+           }
          }
        /* Don't output study size; at present it is in any case a fixed
        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.) */
+       flipped.) If study was forced by an external -s, don't show this
+       information unless -i or -d was also present. This means that, except
+       when auto-callouts are involved, the output from runs with and without
+       -s should be identical. */
-       if (do_study)
+       if (do_study || (force_study >= 0 && showinfo && !no_force_study))
          {
          if (extra == NULL)
            fprintf(outfile, "Study returned NULL\n");
          else
            {
-           uschar *start_bits = NULL;
+           pcre_uint8 *start_bits = NULL;
-           new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
+           int minlength;
-           if (start_bits == NULL)
+           if (new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength) == 0)
-             fprintf(outfile, "No starting byte set\n");
+             fprintf(outfile, "Subject length lower bound = %d\n", minlength);
-           else
+           if (new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits) == 0)
              {
-             int i;
+             if (start_bits == NULL)
-             int c = 24;
+               fprintf(outfile, "No set of starting bytes\n");
-             fprintf(outfile, "Starting byte set: ");
+             else
-             for (i = 0; i < 256; i++)
                {
-               if ((start_bits[i/8] & (1<<(i&7))) != 0)
+               int i;
+               int c = 24;
+               fprintf(outfile, "Starting byte set: ");
+               for (i = 0; i < 256; i++)
                  {
-                 if (c > 75)
+                 if ((start_bits[i/8] & (1<<(i&7))) != 0)
-                   {
-                   fprintf(outfile, "\n  ");
-                   c = 2;
-                   }
-                 if (PRINTHEX(i) && i != ' ')
                    {
-                   fprintf(outfile, "%c ", i);
+                   if (c > 75)
-                   c += 2;
+                     {
-                   }
+                     fprintf(outfile, "\n  ");
-                 else
+                     c = 2;
-                   {
+                     }
-                   fprintf(outfile, "\\x%02x ", i);
+                   if (PRINTOK(i) && i != ' ')
-                   c += 5;
+                     {
+                     fprintf(outfile, "%c ", i);
+                     c += 2;
+                     }
+                   else
+                     {
+                     fprintf(outfile, "\\x%02x ", i);
+                     c += 5;
+                     }
                    }
                  }
+               fprintf(outfile, "\n");
                }
-             fprintf(outfile, "\n");
+             }
+           }
+         /* Show this only if the JIT was set by /S, not by -s. */
+         if ((study_options & PCRE_STUDY_JIT_COMPILE) != 0)
+           {
+           int jit;
+           if (new_info(re, extra, PCRE_INFO_JIT, &jit) == 0)
+             {
+             if (jit)
+               fprintf(outfile, "JIT study was successful\n");
+             else
+ #ifdef SUPPORT_JIT
+               fprintf(outfile, "JIT study was not successful\n");
+ #else
+               fprintf(outfile, "JIT support is not available in this version of PCRE\n");
+ #endif
              }
            }
          }
-Line 1536 
 while (!done)
+Line 3229 
 while (!done)
          }
        else
          {
-         uschar sbuf[8];
+         pcre_uint8 sbuf[8];
-         sbuf[0] = (true_size >> 24)  & 255;
-         sbuf[1] = (true_size >> 16)  & 255;
+         if (do_flip) regexflip(re, extra);
-         sbuf[2] = (true_size >>  8)  & 255;
+         sbuf[0] = (pcre_uint8)((true_size >> 24) & 255);
-         sbuf[3] = (true_size)  & 255;
+         sbuf[1] = (pcre_uint8)((true_size >> 16) & 255);
+         sbuf[2] = (pcre_uint8)((true_size >>  8) & 255);
-         sbuf[4] = (true_study_size >> 24)  & 255;
+         sbuf[3] = (pcre_uint8)((true_size) & 255);
-         sbuf[5] = (true_study_size >> 16)  & 255;
+         sbuf[4] = (pcre_uint8)((true_study_size >> 24) & 255);
-         sbuf[6] = (true_study_size >>  8)  & 255;
+         sbuf[5] = (pcre_uint8)((true_study_size >> 16) & 255);
-         sbuf[7] = (true_study_size)  & 255;
+         sbuf[6] = (pcre_uint8)((true_study_size >>  8) & 255);
+         sbuf[7] = (pcre_uint8)((true_study_size) & 255);
          if (fwrite(sbuf, 1, 8, f) < 8 ||
              fwrite(re, 1, true_size, f) < true_size)
-Line 1554 
 while (!done)
+Line 3248 
 while (!done)
            }
          else
            {
-           fprintf(outfile, "Compiled regex written to %s\n", to_file);
+           fprintf(outfile, "Compiled pattern written to %s\n", to_file);
+           /* If there is study data, write it. */
            if (extra != NULL)
              {
              if (fwrite(extra->study_data, 1, true_study_size, f) <
-Line 1564 
 while (!done)
+Line 3261 
 while (!done)
                  strerror(errno));
                }
              else fprintf(outfile, "Study data written to %s\n", to_file);
              }
            }
          fclose(f);
          }
        new_free(re);
-       if (extra != NULL) new_free(extra);
+       if (extra != NULL)
-       if (tables != NULL) new_free((void *)tables);
+         {
+         PCRE_FREE_STUDY(extra);
+         }
+       if (locale_set)
+         {
+         new_free((void *)tables);
+         setlocale(LC_CTYPE, "C");
+         locale_set = 0;
+         }
        continue;  /* With next regex */
        }
      }        /* End of non-POSIX compile */
-Line 1581 
 while (!done)
+Line 3285 
 while (!done)
    for (;;)
      {
-     uschar *q;
+     pcre_uint8 *q;
-     uschar *bptr = dbuffer;
+     pcre_uint8 *bptr;
      int *use_offsets = offsets;
      int use_size_offsets = size_offsets;
      int callout_data = 0;
      int callout_data_set = 0;
      int count, c;
      int copystrings = 0;
-     int find_match_limit = 0;
+     int find_match_limit = default_find_match_limit;
      int getstrings = 0;
      int getlist = 0;
      int gmatched = 0;
      int start_offset = 0;
+     int start_offset_sign = 1;
      int g_notempty = 0;
      int use_dfa = 0;
-     options = 0;
      *copynames = 0;
      *getnames = 0;
-     copynamesptr = copynames;
+     cn16ptr = copynames;
-     getnamesptr = getnames;
+     gn16ptr = getnames;
+     cn8ptr = copynames8;
+     gn8ptr = getnames8;
-     pcre_callout = callout;
+     SET_PCRE_CALLOUT(callout);
      first_callout = 1;
+     last_callout_mark = NULL;
      callout_extra = 0;
      callout_count = 0;
      callout_fail_count = 999999;
      callout_fail_id = -1;
      show_malloc = 0;
+     options = 0;
      if (extra != NULL) extra->flags &=
        ~(PCRE_EXTRA_MATCH_LIMIT|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
-Line 1619 
 while (!done)
+Line 3326 
 while (!done)
      len = 0;
      for (;;)
        {
-       if (infile == stdin) printf("data> ");
+       if (extend_inputline(infile, buffer + len, "data> ") == NULL)
-       if (extend_inputline(infile, buffer + len) == NULL)
          {
-         if (len > 0) break;
+         if (len > 0)    /* Reached EOF without hitting a newline */
+           {
+           fprintf(outfile, "\n");
+           break;
+           }
          done = 1;
          goto CONTINUE;
          }
-Line 1638 
 while (!done)
+Line 3348 
 while (!done)
      p = buffer;
      while (isspace(*p)) p++;
-     q = dbuffer;
+     bptr = q = dbuffer;
      while ((c = *p++) != 0)
        {
        int i = 0;
        int n = 0;
-       if (c == '\\') switch ((c = *p++))
+       /* In UTF mode, input can be UTF-8, so just copy all non-backslash bytes.
+       In non-UTF mode, allow the value of the byte to fall through to later,
+       where values greater than 127 are turned into UTF-8 when running in
+-bit mode. */
+       if (c != '\\')
+         {
+         if (use_utf)
+           {
+           *q++ = c;
+           continue;
+           }
+         }
+       /* Handle backslash escapes */
+       else switch ((c = *p++))
          {
          case 'a': c =    7; break;
          case 'b': c = '\b'; break;
-Line 1660 
 while (!done)
+Line 3386 
 while (!done)
          c -= '0';
          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
            c = c * 8 + *p++ - '0';
- #if !defined NOUTF8
-         if (use_utf8 && c > 255)
-           {
-           unsigned char buff8[8];
-           int ii, utn;
-           utn = ord2utf8(c, buff8);
-           for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
-           c = buff8[ii];   /* Last byte */
-           }
- #endif
          break;
          case 'x':
-         /* Handle \x{..} specially - new Perl thing for utf8 */
- #if !defined NOUTF8
          if (*p == '{')
            {
-           unsigned char *pt = p;
+           pcre_uint8 *pt = p;
            c = 0;
-           while (isxdigit(*(++pt)))
-             c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'W');
+           /* We used to have "while (isxdigit(*(++pt)))" here, but it fails
+           when isxdigit() is a macro that refers to its argument more than
+           once. This is banned by the C Standard, but apparently happens in at
+           least one MacOS environment. */
+           for (pt++; isxdigit(*pt); pt++)
+             c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'a' - 10);
            if (*pt == '}')
              {
-             unsigned char buff8[8];
-             int ii, utn;
-             utn = ord2utf8(c, buff8);
-             for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
-             c = buff8[ii];   /* Last byte */
              p = pt + 1;
              break;
              }
-           /* Not correct form; fall through */
+           /* Not correct form for \x{...}; fall through */
            }
- #endif
-         /* Ordinary \x */
+         /* \x without {} always defines just one byte in 8-bit mode. This
+         allows UTF-8 characters to be constructed byte by byte, and also allows
+         invalid UTF-8 sequences to be made. Just copy the byte in UTF mode.
+         Otherwise, pass it down to later code so that it can be turned into
+         UTF-8 when running in 16-bit mode. */
          c = 0;
          while (i++ < 2 && isxdigit(*p))
            {
-           c = c * 16 + tolower(*p) - ((isdigit(*p))? '0' : 'W');
+           c = c * 16 + tolower(*p) - ((isdigit(*p))? '0' : 'a' - 10);
            p++;
            }
+         if (use_utf)
+           {
+           *q++ = c;
+           continue;
+           }
          break;
          case 0:   /* \ followed by EOF allows for an empty line */
-Line 1713 
 while (!done)
+Line 3433 
 while (!done)
          continue;
          case '>':
+         if (*p == '-')
+           {
+           start_offset_sign = -1;
+           p++;
+           }
          while(isdigit(*p)) start_offset = start_offset * 10 + *p++ - '0';
+         start_offset *= start_offset_sign;
          continue;
          case 'A':  /* Option setting */
-Line 1732 
 while (!done)
+Line 3458 
 while (!done)
            }
          else if (isalnum(*p))
            {
-           uschar *npp = copynamesptr;
+           READ_CAPTURE_NAME(p, &cn8ptr, &cn16ptr, re);
-           while (isalnum(*p)) *npp++ = *p++;
-           *npp++ = 0;
-           *npp = 0;
-           n = pcre_get_stringnumber(re, (char *)copynamesptr);
-           if (n < 0)
-             fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
-           copynamesptr = npp;
            }
          else if (*p == '+')
            {
-Line 1748 
 while (!done)
+Line 3467 
 while (!done)
            }
          else if (*p == '-')
            {
-           pcre_callout = NULL;
+           SET_PCRE_CALLOUT(NULL);
            p++;
            }
          else if (*p == '!')
-Line 1786 
 while (!done)
+Line 3505 
 while (!done)
  #endif
            use_dfa = 1;
          continue;
+ #endif
+ #if !defined NODFA
          case 'F':
          options |= PCRE_DFA_SHORTEST;
          continue;
-Line 1800 
 while (!done)
+Line 3521 
 while (!done)
            }
          else if (isalnum(*p))
            {
-           uschar *npp = getnamesptr;
+           READ_CAPTURE_NAME(p, &gn8ptr, &gn16ptr, re);
-           while (isalnum(*p)) *npp++ = *p++;
+           }
-           *npp++ = 0;
+         continue;
-           *npp = 0;
-           n = pcre_get_stringnumber(re, (char *)getnamesptr);
+         case 'J':
-           if (n < 0)
+         while(isdigit(*p)) n = n * 10 + *p++ - '0';
-             fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
+         if (extra != NULL
-           getnamesptr = npp;
+             && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0
+             && extra->executable_jit != NULL)
+           {
+           if (jit_stack != NULL) PCRE_JIT_STACK_FREE(jit_stack);
+           jit_stack = PCRE_JIT_STACK_ALLOC(1, n * 1024);
+           PCRE_ASSIGN_JIT_STACK(extra, jit_callback, jit_stack);
            }
          continue;
-Line 1820 
 while (!done)
+Line 3546 
 while (!done)
          continue;
          case 'N':
-         options |= PCRE_NOTEMPTY;
+         if ((options & PCRE_NOTEMPTY) != 0)
+           options = (options & ~PCRE_NOTEMPTY) | PCRE_NOTEMPTY_ATSTART;
+         else
+           options |= PCRE_NOTEMPTY;
          continue;
          case 'O':
-Line 1833 
 while (!done)
+Line 3562 
 while (!done)
            if (offsets == NULL)
              {
              printf("** Failed to get %d bytes of memory for offsets vector\n",
-               size_offsets_max * sizeof(int));
+               (int)(size_offsets_max * sizeof(int)));
              yield = 1;
              goto EXIT;
              }
-Line 1843 
 while (!done)
+Line 3572 
 while (!done)
          continue;
          case 'P':
-         options |= PCRE_PARTIAL;
+         options |= ((options & PCRE_PARTIAL_SOFT) == 0)?
+           PCRE_PARTIAL_SOFT : PCRE_PARTIAL_HARD;
          continue;
          case 'Q':
-Line 1878 
 while (!done)
+Line 3608 
 while (!done)
          show_malloc = 1;
          continue;
+         case 'Y':
+         options |= PCRE_NO_START_OPTIMIZE;
+         continue;
          case 'Z':
          options |= PCRE_NOTEOL;
          continue;
-Line 1895 
 while (!done)
+Line 3629 
 while (!done)
            }
          continue;
          }
-       *q++ = c;
+       /* We now have a character value in c that may be greater than 255. In
+-bit mode, we always convert characters to UTF-8 so that values greater
+       than 255 can be passed to non-UTF 16-bit strings. In 8-bit mode we
+       convert to UTF-8 if we are in UTF mode. Values greater than 127 in UTF
+       mode must have come from \x{...} or octal constructs because values from
+       \x.. get this far only in non-UTF mode. */
+       if (use_pcre16 || use_utf)
+         {
+         pcre_uint8 buff8[8];
+         int ii, utn;
+         utn = ord2utf8(c, buff8);
+         for (ii = 0; ii < utn; ii++) *q++ = buff8[ii];
+         }
+       else
+         {
+         if (c > 255)
+           {
+           fprintf(outfile, "** Character \\x{%x} is greater than 255 "
+             "and UTF-8 mode is not enabled.\n", c);
+           fprintf(outfile, "** Truncation will probably give the wrong "
+             "result.\n");
+           }
+         *q++ = c;
+         }
        }
+     /* Reached end of subject string */
      *q = 0;
-     len = q - dbuffer;
+     len = (int)(q - dbuffer);
+     /* Move the data to the end of the buffer so that a read over the end of
+     the buffer will be seen by valgrind, even if it doesn't cause a crash. If
+     we are using the POSIX interface, we must include the terminating zero. */
+ #if !defined NOPOSIX
+     if (posix || do_posix)
+       {
+       memmove(bptr + buffer_size - len - 1, bptr, len + 1);
+       bptr += buffer_size - len - 1;
+       }
+     else
+ #endif
+       {
+       memmove(bptr + buffer_size - len, bptr, len);
+       bptr += buffer_size - len;
+       }
      if ((all_use_dfa || use_dfa) && find_match_limit)
        {
-Line 1919 
 while (!done)
+Line 3698 
 while (!done)
          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;
+       if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
        rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
-Line 1940 
 while (!done)
+Line 3720 
 while (!done)
            if (pmatch[i].rm_so >= 0)
              {
              fprintf(outfile, "%2d: ", (int)i);
-             (void)pchars(dbuffer + pmatch[i].rm_so,
+             PCHARSV(dbuffer, pmatch[i].rm_so,
                pmatch[i].rm_eo - pmatch[i].rm_so, outfile);
              fprintf(outfile, "\n");
-             if (i == 0 && do_showrest)
+             if (do_showcaprest || (i == 0 && do_showrest))
                {
-               fprintf(outfile, " 0+ ");
+               fprintf(outfile, "%2d+ ", (int)i);
-               (void)pchars(dbuffer + pmatch[i].rm_eo, len - pmatch[i].rm_eo,
+               PCHARSV(dbuffer, pmatch[i].rm_eo, len - pmatch[i].rm_eo,
                  outfile);
                fprintf(outfile, "\n");
                }
-Line 1954 
 while (!done)
+Line 3734 
 while (!done)
            }
          }
        free(pmatch);
+       goto NEXT_DATA;
        }
+ #endif  /* !defined NOPOSIX */
      /* Handle matching via the native interface - repeats for /g and /G */
-     else
+ #ifdef SUPPORT_PCRE16
- #endif  /* !defined NOPOSIX */
+     if (use_pcre16)
+       {
+       len = to16(TRUE, bptr, (((real_pcre *)re)->options) & PCRE_UTF8, len);
+       switch(len)
+         {
+         case -1:
+         fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
+           "converted to UTF-16\n");
+         goto NEXT_DATA;
+         case -2:
+         fprintf(outfile, "**Failed: character value greater than 0x10ffff "
+           "cannot be converted to UTF-16\n");
+         goto NEXT_DATA;
+         case -3:
+         fprintf(outfile, "**Failed: character value greater than 0xffff "
+           "cannot be converted to 16-bit in non-UTF mode\n");
+         goto NEXT_DATA;
+         default:
+         break;
+         }
+       bptr = (pcre_uint8 *)buffer16;
+       }
+ #endif
      for (;; gmatched++)    /* Loop for /g or /G */
        {
+       markptr = NULL;
        if (timeitm > 0)
          {
          register int i;
-Line 1974 
 while (!done)
+Line 3784 
 while (!done)
            {
            int workspace[1000];
            for (i = 0; i < timeitm; i++)
-             count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
+             {
-               options | g_notempty, use_offsets, use_size_offsets, workspace,
+             PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,
-               sizeof(workspace)/sizeof(int));
+               (options | g_notempty), use_offsets, use_size_offsets, workspace,
+               (sizeof(workspace)/sizeof(int)));
+             }
            }
          else
  #endif
          for (i = 0; i < timeitm; i++)
-           count = pcre_exec(re, extra, (char *)bptr, len,
+           {
-             start_offset, options | g_notempty, use_offsets, use_size_offsets);
+           PCRE_EXEC(count, re, extra, bptr, len, start_offset,
+             (options | g_notempty), use_offsets, use_size_offsets);
+           }
          time_taken = clock() - start_time;
          fprintf(outfile, "Execute time %.4f milliseconds\n",
            (((double)time_taken * 1000.0) / (double)timeitm) /
-Line 1993 
 while (!done)
+Line 3806 
 while (!done)
        /* If find_match_limit is set, we want to do repeated matches with
        varying limits in order to find the minimum value for the match limit and
-       for the recursion limit. */
+       for the recursion limit. The match limits are relevant only to the normal
+       running of pcre_exec(), so disable the JIT optimization. This makes it
+       possible to run the same set of tests with and without JIT externally
+       requested. */
        if (find_match_limit)
          {
-Line 2002 
 while (!done)
+Line 3818 
 while (!done)
            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
            extra->flags = 0;
            }
+         else extra->flags &= ~PCRE_EXTRA_EXECUTABLE_JIT;
          (void)check_match_limit(re, extra, bptr, len, start_offset,
            options|g_notempty, use_offsets, use_size_offsets,
-Line 2025 
 while (!done)
+Line 3842 
 while (!done)
            }
          extra->flags |= PCRE_EXTRA_CALLOUT_DATA;
          extra->callout_data = &callout_data;
-         count = pcre_exec(re, extra, (char *)bptr, len, start_offset,
+         PCRE_EXEC(count, re, extra, bptr, len, start_offset,
            options | g_notempty, use_offsets, use_size_offsets);
          extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;
          }
-Line 2037 
 while (!done)
+Line 3854 
 while (!done)
        else if (all_use_dfa || use_dfa)
          {
          int workspace[1000];
-         count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
+         PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,
-           options | g_notempty, use_offsets, use_size_offsets, workspace,
+           (options | g_notempty), use_offsets, use_size_offsets, workspace,
-           sizeof(workspace)/sizeof(int));
+           (sizeof(workspace)/sizeof(int)));
          if (count == 0)
            {
            fprintf(outfile, "Matched, but too many subsidiary matches\n");
-Line 2050 
 while (!done)
+Line 3867 
 while (!done)
        else
          {
-         count = pcre_exec(re, extra, (char *)bptr, len,
+         PCRE_EXEC(count, re, extra, bptr, len, start_offset,
-           start_offset, options | g_notempty, use_offsets, use_size_offsets);
+           options | g_notempty, use_offsets, use_size_offsets);
          if (count == 0)
            {
            fprintf(outfile, "Matched, but too many substrings\n");
-Line 2064 
 while (!done)
+Line 3881 
 while (!done)
        if (count >= 0)
          {
          int i, maxcount;
+         void *cnptr, *gnptr;
  #if !defined NODFA