embedaddon/pcre/pcretest.c - diff

Return to pcretest.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/pcretest.c between versions 1.1 and 1.1.1.5

-version 1.1, 2012/02/21 23:05:51
+version 1.1.1.5, 2014/06/15 19:46:03
  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 all of the 8-bit, 16-bit, and
+-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 two modes are enabled, for example, pcre_compile.c is compiled
+ twice. 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, COMPILE_PCRE16, or COMPILE_PCRE32. It does, however, make use of
+ SUPPORT_PCRE8, SUPPORT_PCRE16, and SUPPORT_PCRE32 to ensure that it calls only
+ supported library functions. */
  #ifdef HAVE_CONFIG_H
  #include "config.h"
- Line 48  POSSIBILITY OF SUCH DAMAGE.
+ Line 58  POSSIBILITY OF SUCH DAMAGE.
  #include <locale.h>
  #include <errno.h>
-#ifdef SUPPORT_LIBREADLINE
+/* Both libreadline and libedit are optionally supported. The user-supplied
+original patch uses readline/readline.h for libedit, but in at least one system
+it is installed as editline/readline.h, so the configuration code now looks for
+that first, falling back to readline/readline.h. */
+#if defined(SUPPORT_LIBREADLINE) || defined(SUPPORT_LIBEDIT)
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
+ #if defined(SUPPORT_LIBREADLINE)
  #include <readline/readline.h>
  #include <readline/history.h>
+ #else
+ #if defined(HAVE_EDITLINE_READLINE_H)
+ #include <editline/readline.h>
+ #else
+ #include <readline/readline.h>
  #endif
+ #endif
+ #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
  environments, so it was added for release 5.0 to both the input and output. (It
- Line 90  input mode under Windows. */
+ Line 112  input mode under Windows. */
  #else
  #include <sys/time.h>          /* These two includes are needed */
  #include <sys/resource.h>      /* for setrlimit(). */
+ #if defined NATIVE_ZOS         /* z/OS uses non-binary I/O */
+ #define INPUT_MODE   "r"
+ #define OUTPUT_MODE  "w"
+ #else
  #define INPUT_MODE   "rb"
  #define OUTPUT_MODE  "wb"
  #endif
+ #endif
+ #ifdef __VMS
+ #include <ssdef.h>
+ void vms_setsymbol( char *, char *, int );
+ #endif
+ #define PRIV(name) name
  /* 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
  internal macros, structures, and other internal data values; pcretest has
- Line 107  appropriately for an application, not for building PCR
+ Line 141  appropriately for an application, not for building PCR
  #include "pcre.h"
  #include "pcre_internal.h"
+ /* The pcre_printint() function, which prints the internal form of a compiled
+ regex, is held in a separate file so that (a) it can be compiled in either
+-, 16- or 32-bit mode, and (b) it can be #included directly in pcre_compile.c
+ when that is compiled in debug mode. */
+ #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
+ #ifdef SUPPORT_PCRE32
+ void pcre32_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
+to keep two copies, we include the source files here, changing the names of the
  external symbols to prevent clashes. */
-#define _pcre_ucp_gentype      ucp_gentype
+#define PCRE_INCLUDED
-#define _pcre_ucp_typerange    ucp_typerange
-#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_utf8_char_sizes  utf8_char_sizes
-#define _pcre_utt              utt
-#define _pcre_utt_size         utt_size
-#define _pcre_utt_names        utt_names
-#define _pcre_OP_lengths       OP_lengths
  #include "pcre_tables.c"
+ #include "pcre_ucd.c"
- /* We also need the pcre_printint() function for printing out compiled
- 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. It needs to
- know which case is being compiled. */
- #define COMPILING_PCRETEST
- #include "pcre_printint.src"
  /* 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 the printint.src file. We uses it here also, in cases when the
+the same as in the printint.src file. We uses it here in cases when the locale
-locale has not been explicitly changed, so as to get consistent output from
+has not been explicitly changed, so as to get consistent output from systems
-systems that differ in their output from isprint() even in the "C" locale. */
+that differ in their output from isprint() even in the "C" locale. */
-#define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
+#ifdef EBCDIC
+#define PRINTABLE(c) ((c) >= 64 && (c) < 255)
+#else
+#define PRINTABLE(c) ((c) >= 32 && (c) < 127)
+#endif
+ #define PRINTOK(c) (locale_set? isprint(c) : PRINTABLE(c))
+ /* Posix support is disabled in 16 or 32 bit only mode. */
+ #if !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
  Makefile. */
- Line 150  Makefile. */
+ Line 192  Makefile. */
  #include "pcreposix.h"
  #endif
-/* It is also possible, for the benefit of the version currently imported into
+/* It is also possible, originally for the benefit of a version that was
-Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
+imported into Exim, to build pcretest without support for UTF8 or UTF16 (define
-interface to the DFA matcher (NODFA), and without the doublecheck of the old
+NOUTF), without the interface to the DFA matcher (NODFA). In fact, we
-"info" function (define NOINFOCHECK). In fact, we automatically cut out the
+automatically cut out the UTF support if PCRE is built without it. */
-UTF8 support if PCRE is built without it. */
-#ifndef SUPPORT_UTF8
+#ifndef SUPPORT_UTF
-#ifndef NOUTF8
+#ifndef NOUTF
-#define NOUTF8
+#define NOUTF
  #endif
  #endif
+ /* To make the code a bit tidier for 8/16/32-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, cn32, re) \
+   p = read_capture_name8(p, cn8, re)
+ #define STRLEN8(p) ((int)strlen((char *)p))
+ #define SET_PCRE_CALLOUT8(callout) \
+   pcre_callout = callout
+ #define PCRE_ASSIGN_JIT_STACK8(extra, callback, userdata) \
+    pcre_assign_jit_stack(extra, callback, userdata)
+ #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(rc, re, extra, tables) \
+   rc = 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)
+ #define PCRE_JIT_STACK_ALLOC8(startsize, maxsize) \
+   pcre_jit_stack_alloc(startsize, maxsize)
+ #define PCRE_JIT_STACK_FREE8(stack) \
+   pcre_jit_stack_free(stack)
+ #define pcre8_maketables pcre_maketables
+ #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, cn32, re) \
+   p = read_capture_name16(p, cn16, re)
+ #define STRLEN16(p) ((int)strlen16((PCRE_SPTR16)p))
+ #define SET_PCRE_CALLOUT16(callout) \
+   pcre16_callout = (int (*)(pcre16_callout_block *))callout
+ #define PCRE_ASSIGN_JIT_STACK16(extra, callback, userdata) \
+   pcre16_assign_jit_stack((pcre16_extra *)extra, \
+     (pcre16_jit_callback)callback, userdata)
+ #define PCRE_COMPILE16(re, pat, options, error, erroffset, tables) \
+   re = (pcre *)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((pcre16 *)re, (PCRE_SPTR16)bptr, offsets, \
+     count, (PCRE_SPTR16)namesptr, (PCRE_UCHAR16 *)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_UCHAR16 *)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((pcre16 *)re, (pcre16_extra *)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((pcre16 *)re, (pcre16_extra *)extra, (PCRE_SPTR16)bptr, \
+     len, start_offset, options, offsets, size_offsets)
+ #define PCRE_FREE_STUDY16(extra) \
+   pcre16_free_study((pcre16_extra *)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((pcre16 *)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(rc, re, extra, tables) \
+   rc = pcre16_pattern_to_host_byte_order((pcre16 *)re, (pcre16_extra *)extra, \
+     tables)
+ #define PCRE_PRINTINT16(re, outfile, debug_lengths) \
+   pcre16_printint(re, outfile, debug_lengths)
+ #define PCRE_STUDY16(extra, re, options, error) \
+   extra = (pcre_extra *)pcre16_study((pcre16 *)re, options, error)
+ #define PCRE_JIT_STACK_ALLOC16(startsize, maxsize) \
+   (pcre_jit_stack *)pcre16_jit_stack_alloc(startsize, maxsize)
+ #define PCRE_JIT_STACK_FREE16(stack) \
+   pcre16_jit_stack_free((pcre16_jit_stack *)stack)
+ #endif /* SUPPORT_PCRE16 */
+ /* -----------------------------------------------------------*/
+ #ifdef SUPPORT_PCRE32
+ #define PCHARS32(lv, p, offset, len, f) \
+   lv = pchars32((PCRE_SPTR32)(p) + offset, len, use_utf, f)
+ #define PCHARSV32(p, offset, len, f)                \
+   (void)pchars32((PCRE_SPTR32)(p) + offset, len, use_utf, f)
+ #define READ_CAPTURE_NAME32(p, cn8, cn16, cn32, re) \
+   p = read_capture_name32(p, cn32, re)
+ #define STRLEN32(p) ((int)strlen32((PCRE_SPTR32)p))
+ #define SET_PCRE_CALLOUT32(callout) \
+   pcre32_callout = (int (*)(pcre32_callout_block *))callout
+ #define PCRE_ASSIGN_JIT_STACK32(extra, callback, userdata) \
+   pcre32_assign_jit_stack((pcre32_extra *)extra, \
+     (pcre32_jit_callback)callback, userdata)
+ #define PCRE_COMPILE32(re, pat, options, error, erroffset, tables) \
+   re = (pcre *)pcre32_compile((PCRE_SPTR32)pat, options, error, erroffset, \
+     tables)
+ #define PCRE_COPY_NAMED_SUBSTRING32(rc, re, bptr, offsets, count, \
+     namesptr, cbuffer, size) \
+   rc = pcre32_copy_named_substring((pcre32 *)re, (PCRE_SPTR32)bptr, offsets, \
+     count, (PCRE_SPTR32)namesptr, (PCRE_UCHAR32 *)cbuffer, size/2)
+ #define PCRE_COPY_SUBSTRING32(rc, bptr, offsets, count, i, cbuffer, size) \
+   rc = pcre32_copy_substring((PCRE_SPTR32)bptr, offsets, count, i, \
+     (PCRE_UCHAR32 *)cbuffer, size/2)
+ #define PCRE_DFA_EXEC32(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets, workspace, size_workspace) \
+   count = pcre32_dfa_exec((pcre32 *)re, (pcre32_extra *)extra, \
+     (PCRE_SPTR32)bptr, len, start_offset, options, offsets, size_offsets, \
+     workspace, size_workspace)
+ #define PCRE_EXEC32(count, re, extra, bptr, len, start_offset, options, \
+     offsets, size_offsets) \
+   count = pcre32_exec((pcre32 *)re, (pcre32_extra *)extra, (PCRE_SPTR32)bptr, \
+     len, start_offset, options, offsets, size_offsets)
+ #define PCRE_FREE_STUDY32(extra) \
+   pcre32_free_study((pcre32_extra *)extra)
+ #define PCRE_FREE_SUBSTRING32(substring) \
+   pcre32_free_substring((PCRE_SPTR32)substring)
+ #define PCRE_FREE_SUBSTRING_LIST32(listptr) \
+   pcre32_free_substring_list((PCRE_SPTR32 *)listptr)
+ #define PCRE_GET_NAMED_SUBSTRING32(rc, re, bptr, offsets, count, \
+     getnamesptr, subsptr) \
+   rc = pcre32_get_named_substring((pcre32 *)re, (PCRE_SPTR32)bptr, offsets, \
+     count, (PCRE_SPTR32)getnamesptr, (PCRE_SPTR32 *)(void*)subsptr)
+ #define PCRE_GET_STRINGNUMBER32(n, rc, ptr) \
+   n = pcre32_get_stringnumber(re, (PCRE_SPTR32)ptr)
+ #define PCRE_GET_SUBSTRING32(rc, bptr, offsets, count, i, subsptr) \
+   rc = pcre32_get_substring((PCRE_SPTR32)bptr, offsets, count, i, \
+     (PCRE_SPTR32 *)(void*)subsptr)
+ #define PCRE_GET_SUBSTRING_LIST32(rc, bptr, offsets, count, listptr) \
+   rc = pcre32_get_substring_list((PCRE_SPTR32)bptr, offsets, count, \
+     (PCRE_SPTR32 **)(void*)listptr)
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER32(rc, re, extra, tables) \
+   rc = pcre32_pattern_to_host_byte_order((pcre32 *)re, (pcre32_extra *)extra, \
+     tables)
+ #define PCRE_PRINTINT32(re, outfile, debug_lengths) \
+   pcre32_printint(re, outfile, debug_lengths)
+ #define PCRE_STUDY32(extra, re, options, error) \
+   extra = (pcre_extra *)pcre32_study((pcre32 *)re, options, error)
+ #define PCRE_JIT_STACK_ALLOC32(startsize, maxsize) \
+   (pcre_jit_stack *)pcre32_jit_stack_alloc(startsize, maxsize)
+ #define PCRE_JIT_STACK_FREE32(stack) \
+   pcre32_jit_stack_free((pcre32_jit_stack *)stack)
+ #endif /* SUPPORT_PCRE32 */
+ /* ----- More than one mode is supported; a runtime test is needed, except for
+ pcre_config(), and the JIT stack functions, when it doesn't matter which
+ available version is called. ----- */
+ enum {
+   PCRE8_MODE,
+   PCRE16_MODE,
+   PCRE32_MODE
+ };
+ #if (defined (SUPPORT_PCRE8) + defined (SUPPORT_PCRE16) + \
+      defined (SUPPORT_PCRE32)) >= 2
+ #define CHAR_SIZE (1 << pcre_mode)
+ /* There doesn't seem to be an easy way of writing these macros that can cope
+ with the 3 pairs of bit sizes plus all three bit sizes. So just handle all the
+ cases separately. */
+ /* ----- All three modes supported ----- */
+ #if defined(SUPPORT_PCRE8) && defined(SUPPORT_PCRE16) && defined(SUPPORT_PCRE32)
+ #define PCHARS(lv, p, offset, len, f) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCHARS32(lv, p, offset, len, f); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCHARS16(lv, p, offset, len, f); \
+   else \
+     PCHARS8(lv, p, offset, len, f)
+ #define PCHARSV(p, offset, len, f) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCHARSV32(p, offset, len, f); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCHARSV16(p, offset, len, f); \
+   else \
+     PCHARSV8(p, offset, len, f)
+ #define READ_CAPTURE_NAME(p, cn8, cn16, cn32, re) \
+   if (pcre_mode == PCRE32_MODE) \
+     READ_CAPTURE_NAME32(p, cn8, cn16, cn32, re); \
+   else if (pcre_mode == PCRE16_MODE) \
+     READ_CAPTURE_NAME16(p, cn8, cn16, cn32, re); \
+   else \
+     READ_CAPTURE_NAME8(p, cn8, cn16, cn32, re)
+ #define SET_PCRE_CALLOUT(callout) \
+   if (pcre_mode == PCRE32_MODE) \
+     SET_PCRE_CALLOUT32(callout); \
+   else if (pcre_mode == PCRE16_MODE) \
+     SET_PCRE_CALLOUT16(callout); \
+   else \
+     SET_PCRE_CALLOUT8(callout)
+ #define STRLEN(p) (pcre_mode == PCRE32_MODE ? STRLEN32(p) : pcre_mode == PCRE16_MODE ? STRLEN16(p) : STRLEN8(p))
+ #define PCRE_ASSIGN_JIT_STACK(extra, callback, userdata) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_ASSIGN_JIT_STACK32(extra, callback, userdata); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_ASSIGN_JIT_STACK16(extra, callback, userdata); \
+   else \
+     PCRE_ASSIGN_JIT_STACK8(extra, callback, userdata)
+ #define PCRE_COMPILE(re, pat, options, error, erroffset, tables) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_COMPILE32(re, pat, options, error, erroffset, tables); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_COPY_NAMED_SUBSTRING32(rc, re, bptr, offsets, count, \
+       namesptr, cbuffer, size); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_COPY_SUBSTRING32(rc, bptr, offsets, count, i, cbuffer, size); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_DFA_EXEC32(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets, workspace, size_workspace); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_EXEC32(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_FREE_STUDY32(extra); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_FREE_STUDY16(extra); \
+   else \
+     PCRE_FREE_STUDY8(extra)
+ #define PCRE_FREE_SUBSTRING(substring) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_FREE_SUBSTRING32(substring); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_FREE_SUBSTRING16(substring); \
+   else \
+     PCRE_FREE_SUBSTRING8(substring)
+ #define PCRE_FREE_SUBSTRING_LIST(listptr) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_FREE_SUBSTRING_LIST32(listptr); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_FREE_SUBSTRING_LIST16(listptr); \
+   else \
+     PCRE_FREE_SUBSTRING_LIST8(listptr)
+ #define PCRE_GET_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
+     getnamesptr, subsptr) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_GET_NAMED_SUBSTRING32(rc, re, bptr, offsets, count, \
+       getnamesptr, subsptr); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_GET_STRINGNUMBER32(n, rc, ptr); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_GET_SUBSTRING32(rc, bptr, use_offsets, count, i, subsptr); \
+   else if (pcre_mode == PCRE16_MODE) \
+     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 (pcre_mode == PCRE32_MODE) \
+     PCRE_GET_SUBSTRING_LIST32(rc, bptr, offsets, count, listptr); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_GET_SUBSTRING_LIST16(rc, bptr, offsets, count, listptr); \
+   else \
+     PCRE_GET_SUBSTRING_LIST8(rc, bptr, offsets, count, listptr)
+ #define PCRE_JIT_STACK_ALLOC(startsize, maxsize) \
+   (pcre_mode == PCRE32_MODE ? \
+      PCRE_JIT_STACK_ALLOC32(startsize, maxsize) \
+     : pcre_mode == PCRE16_MODE ? \
+       PCRE_JIT_STACK_ALLOC16(startsize, maxsize) \
+       : PCRE_JIT_STACK_ALLOC8(startsize, maxsize))
+ #define PCRE_JIT_STACK_FREE(stack) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_JIT_STACK_FREE32(stack); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_JIT_STACK_FREE16(stack); \
+   else \
+     PCRE_JIT_STACK_FREE8(stack)
+ #define PCRE_MAKETABLES \
+   (pcre_mode == PCRE32_MODE ? pcre32_maketables() : pcre_mode == PCRE16_MODE ? pcre16_maketables() : pcre_maketables())
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER(rc, re, extra, tables) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_PATTERN_TO_HOST_BYTE_ORDER32(rc, re, extra, tables); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_PATTERN_TO_HOST_BYTE_ORDER16(rc, re, extra, tables); \
+   else \
+     PCRE_PATTERN_TO_HOST_BYTE_ORDER8(rc, re, extra, tables)
+ #define PCRE_PRINTINT(re, outfile, debug_lengths) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_PRINTINT32(re, outfile, debug_lengths); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_PRINTINT16(re, outfile, debug_lengths); \
+   else \
+     PCRE_PRINTINT8(re, outfile, debug_lengths)
+ #define PCRE_STUDY(extra, re, options, error) \
+   if (pcre_mode == PCRE32_MODE) \
+     PCRE_STUDY32(extra, re, options, error); \
+   else if (pcre_mode == PCRE16_MODE) \
+     PCRE_STUDY16(extra, re, options, error); \
+   else \
+     PCRE_STUDY8(extra, re, options, error)
+ /* ----- Two out of three modes are supported ----- */
+ #else
+ /* We can use some macro trickery to make a single set of definitions work in
+ the three different cases. */
+ /* ----- 32-bit and 16-bit but not 8-bit supported ----- */
+ #if defined(SUPPORT_PCRE32) && defined(SUPPORT_PCRE16)
+ #define BITONE 32
+ #define BITTWO 16
+ /* ----- 32-bit and 8-bit but not 16-bit supported ----- */
+ #elif defined(SUPPORT_PCRE32) && defined(SUPPORT_PCRE8)
+ #define BITONE 32
+ #define BITTWO 8
+ /* ----- 16-bit and 8-bit but not 32-bit supported ----- */
+ #else
+ #define BITONE 16
+ #define BITTWO 8
+ #endif
+ #define glue(a,b) a##b
+ #define G(a,b) glue(a,b)
+ /* ----- Common macros for two-mode cases ----- */
+ #define PCHARS(lv, p, offset, len, f) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCHARS,BITONE)(lv, p, offset, len, f); \
+   else \
+     G(PCHARS,BITTWO)(lv, p, offset, len, f)
+ #define PCHARSV(p, offset, len, f) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCHARSV,BITONE)(p, offset, len, f); \
+   else \
+     G(PCHARSV,BITTWO)(p, offset, len, f)
+ #define READ_CAPTURE_NAME(p, cn8, cn16, cn32, re) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(READ_CAPTURE_NAME,BITONE)(p, cn8, cn16, cn32, re); \
+   else \
+     G(READ_CAPTURE_NAME,BITTWO)(p, cn8, cn16, cn32, re)
+ #define SET_PCRE_CALLOUT(callout) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(SET_PCRE_CALLOUT,BITONE)(callout); \
+   else \
+     G(SET_PCRE_CALLOUT,BITTWO)(callout)
+ #define STRLEN(p) ((pcre_mode == G(G(PCRE,BITONE),_MODE)) ? \
+   G(STRLEN,BITONE)(p) : G(STRLEN,BITTWO)(p))
+ #define PCRE_ASSIGN_JIT_STACK(extra, callback, userdata) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_ASSIGN_JIT_STACK,BITONE)(extra, callback, userdata); \
+   else \
+     G(PCRE_ASSIGN_JIT_STACK,BITTWO)(extra, callback, userdata)
+ #define PCRE_COMPILE(re, pat, options, error, erroffset, tables) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_COMPILE,BITONE)(re, pat, options, error, erroffset, tables); \
+   else \
+     G(PCRE_COMPILE,BITTWO)(re, pat, options, error, erroffset, tables)
+ #define PCRE_CONFIG G(G(pcre,BITONE),_config)
+ #define PCRE_COPY_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
+     namesptr, cbuffer, size) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_COPY_NAMED_SUBSTRING,BITONE)(rc, re, bptr, offsets, count, \
+       namesptr, cbuffer, size); \
+   else \
+     G(PCRE_COPY_NAMED_SUBSTRING,BITTWO)(rc, re, bptr, offsets, count, \
+       namesptr, cbuffer, size)
+ #define PCRE_COPY_SUBSTRING(rc, bptr, offsets, count, i, cbuffer, size) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_COPY_SUBSTRING,BITONE)(rc, bptr, offsets, count, i, cbuffer, size); \
+   else \
+     G(PCRE_COPY_SUBSTRING,BITTWO)(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 (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_DFA_EXEC,BITONE)(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets, workspace, size_workspace); \
+   else \
+     G(PCRE_DFA_EXEC,BITTWO)(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 (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_EXEC,BITONE)(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets); \
+   else \
+     G(PCRE_EXEC,BITTWO)(count, re, extra, bptr, len, start_offset, options, \
+       offsets, size_offsets)
+ #define PCRE_FREE_STUDY(extra) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_FREE_STUDY,BITONE)(extra); \
+   else \
+     G(PCRE_FREE_STUDY,BITTWO)(extra)
+ #define PCRE_FREE_SUBSTRING(substring) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_FREE_SUBSTRING,BITONE)(substring); \
+   else \
+     G(PCRE_FREE_SUBSTRING,BITTWO)(substring)
+ #define PCRE_FREE_SUBSTRING_LIST(listptr) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_FREE_SUBSTRING_LIST,BITONE)(listptr); \
+   else \
+     G(PCRE_FREE_SUBSTRING_LIST,BITTWO)(listptr)
+ #define PCRE_GET_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
+     getnamesptr, subsptr) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_GET_NAMED_SUBSTRING,BITONE)(rc, re, bptr, offsets, count, \
+       getnamesptr, subsptr); \
+   else \
+     G(PCRE_GET_NAMED_SUBSTRING,BITTWO)(rc, re, bptr, offsets, count, \
+       getnamesptr, subsptr)
+ #define PCRE_GET_STRINGNUMBER(n, rc, ptr) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_GET_STRINGNUMBER,BITONE)(n, rc, ptr); \
+   else \
+     G(PCRE_GET_STRINGNUMBER,BITTWO)(n, rc, ptr)
+ #define PCRE_GET_SUBSTRING(rc, bptr, use_offsets, count, i, subsptr) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_GET_SUBSTRING,BITONE)(rc, bptr, use_offsets, count, i, subsptr); \
+   else \
+     G(PCRE_GET_SUBSTRING,BITTWO)(rc, bptr, use_offsets, count, i, subsptr)
+ #define PCRE_GET_SUBSTRING_LIST(rc, bptr, offsets, count, listptr) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_GET_SUBSTRING_LIST,BITONE)(rc, bptr, offsets, count, listptr); \
+   else \
+     G(PCRE_GET_SUBSTRING_LIST,BITTWO)(rc, bptr, offsets, count, listptr)
+ #define PCRE_JIT_STACK_ALLOC(startsize, maxsize) \
+   (pcre_mode == G(G(PCRE,BITONE),_MODE)) ? \
+      G(PCRE_JIT_STACK_ALLOC,BITONE)(startsize, maxsize) \
+     : G(PCRE_JIT_STACK_ALLOC,BITTWO)(startsize, maxsize)
+ #define PCRE_JIT_STACK_FREE(stack) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_JIT_STACK_FREE,BITONE)(stack); \
+   else \
+     G(PCRE_JIT_STACK_FREE,BITTWO)(stack)
+ #define PCRE_MAKETABLES \
+   (pcre_mode == G(G(PCRE,BITONE),_MODE)) ? \
+     G(G(pcre,BITONE),_maketables)() : G(G(pcre,BITTWO),_maketables)()
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER(rc, re, extra, tables) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_PATTERN_TO_HOST_BYTE_ORDER,BITONE)(rc, re, extra, tables); \
+   else \
+     G(PCRE_PATTERN_TO_HOST_BYTE_ORDER,BITTWO)(rc, re, extra, tables)
+ #define PCRE_PRINTINT(re, outfile, debug_lengths) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_PRINTINT,BITONE)(re, outfile, debug_lengths); \
+   else \
+     G(PCRE_PRINTINT,BITTWO)(re, outfile, debug_lengths)
+ #define PCRE_STUDY(extra, re, options, error) \
+   if (pcre_mode == G(G(PCRE,BITONE),_MODE)) \
+     G(PCRE_STUDY,BITONE)(extra, re, options, error); \
+   else \
+     G(PCRE_STUDY,BITTWO)(extra, re, options, error)
+ #endif  /* Two out of three modes */
+ /* ----- End of cases where more than one mode is supported ----- */
+ /* ----- 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_STACK8
+ #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_ALLOC8
+ #define PCRE_JIT_STACK_FREE       PCRE_JIT_STACK_FREE8
+ #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 ----- */
+ #elif defined SUPPORT_PCRE16
+ #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     PCRE_ASSIGN_JIT_STACK16
+ #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      PCRE_JIT_STACK_ALLOC16
+ #define PCRE_JIT_STACK_FREE       PCRE_JIT_STACK_FREE16
+ #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
+ /* ----- Only 32-bit mode is supported ----- */
+ #elif defined SUPPORT_PCRE32
+ #define CHAR_SIZE                 4
+ #define PCHARS                    PCHARS32
+ #define PCHARSV                   PCHARSV32
+ #define READ_CAPTURE_NAME         READ_CAPTURE_NAME32
+ #define SET_PCRE_CALLOUT          SET_PCRE_CALLOUT32
+ #define STRLEN                    STRLEN32
+ #define PCRE_ASSIGN_JIT_STACK     PCRE_ASSIGN_JIT_STACK32
+ #define PCRE_COMPILE              PCRE_COMPILE32
+ #define PCRE_CONFIG               pcre32_config
+ #define PCRE_COPY_NAMED_SUBSTRING PCRE_COPY_NAMED_SUBSTRING32
+ #define PCRE_COPY_SUBSTRING       PCRE_COPY_SUBSTRING32
+ #define PCRE_DFA_EXEC             PCRE_DFA_EXEC32
+ #define PCRE_EXEC                 PCRE_EXEC32
+ #define PCRE_FREE_STUDY           PCRE_FREE_STUDY32
+ #define PCRE_FREE_SUBSTRING       PCRE_FREE_SUBSTRING32
+ #define PCRE_FREE_SUBSTRING_LIST  PCRE_FREE_SUBSTRING_LIST32
+ #define PCRE_GET_NAMED_SUBSTRING  PCRE_GET_NAMED_SUBSTRING32
+ #define PCRE_GET_STRINGNUMBER     PCRE_GET_STRINGNUMBER32
+ #define PCRE_GET_SUBSTRING        PCRE_GET_SUBSTRING32
+ #define PCRE_GET_SUBSTRING_LIST   PCRE_GET_SUBSTRING_LIST32
+ #define PCRE_JIT_STACK_ALLOC      PCRE_JIT_STACK_ALLOC32
+ #define PCRE_JIT_STACK_FREE       PCRE_JIT_STACK_FREE32
+ #define PCRE_MAKETABLES           pcre32_maketables()
+ #define PCRE_PATTERN_TO_HOST_BYTE_ORDER PCRE_PATTERN_TO_HOST_BYTE_ORDER32
+ #define PCRE_PRINTINT             PCRE_PRINTINT32
+ #define PCRE_STUDY                PCRE_STUDY32
+ #endif
+ /* ----- End of mode-specific function call macros ----- */
  /* Other parameters */
  #ifndef CLOCKS_PER_SEC
- Line 173  UTF8 support if PCRE is built without it. */
+ Line 994  UTF8 support if PCRE is built without it. */
  #endif
  #endif
+ #if !defined NODFA
+ #define DFA_WS_DIMENSION 1000
+ #endif
  /* This is the default loop count for timing. */
  #define LOOPREPEAT 500000
- Line 187  static int callout_fail_count;
+ Line 1012  static int callout_fail_count;
  static int callout_fail_id;
  static int debug_lengths;
  static int first_callout;
+ static int jit_was_used;
  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 *pbuffer = NULL;
-static uschar *pbuffer = NULL;
+ /* Just as a safety check, make sure that COMPILE_PCRE[16|32] are *not* set. */
+ #ifdef COMPILE_PCRE16
+ #error COMPILE_PCRE16 must not be set when compiling pcretest.c
+ #endif
+ #ifdef COMPILE_PCRE32
+ #error COMPILE_PCRE32 must not be set when compiling pcretest.c
+ #endif
+ /* We need buffers for building 16/32-bit strings, and the tables of operator
+ lengths that are used for 16/32-bit compiling, in order to swap bytes in a
+ pattern for saving/reloading testing. Luckily, the data for these tables is
+ defined as a macro. However, we must ensure that LINK_SIZE and IMM2_SIZE (which
+ are used in the tables) are adjusted appropriately for the 16/32-bit world.
+ LINK_SIZE is also used later in this program. */
+ #ifdef SUPPORT_PCRE16
+ #undef IMM2_SIZE
+ #define IMM2_SIZE 1
+ #if LINK_SIZE == 2
+ #undef LINK_SIZE
+ #define LINK_SIZE 1
+ #elif LINK_SIZE == 3 || LINK_SIZE == 4
+ #undef LINK_SIZE
+ #define LINK_SIZE 2
+ #else
+ #error LINK_SIZE must be either 2, 3, or 4
+ #endif
+ static int buffer16_size = 0;
+ static pcre_uint16 *buffer16 = NULL;
+ static const pcre_uint16 OP_lengths16[] = { OP_LENGTHS };
+ #endif  /* SUPPORT_PCRE16 */
+ #ifdef SUPPORT_PCRE32
+ #undef IMM2_SIZE
+ #define IMM2_SIZE 1
+ #undef LINK_SIZE
+ #define LINK_SIZE 1
+ static int buffer32_size = 0;
+ static pcre_uint32 *buffer32 = NULL;
+ static const pcre_uint32 OP_lengths32[] = { OP_LENGTHS };
+ #endif  /* SUPPORT_PCRE32 */
+ /* If we have 8-bit support, default to it; if there is also 16-or 32-bit
+ support, it can be changed by an option. If there is no 8-bit support, there
+ must be 16-or 32-bit support, so default it to 1. */
+ #if defined SUPPORT_PCRE8
+ static int pcre_mode = PCRE8_MODE;
+ #elif defined SUPPORT_PCRE16
+ static int pcre_mode = PCRE16_MODE;
+ #elif defined SUPPORT_PCRE32
+ static int pcre_mode = PCRE32_MODE;
+ #endif
+ /* JIT study options for -s+n and /S+n where '1' <= n <= '7'. */
+ static int jit_study_bits[] =
+   {
+   PCRE_STUDY_JIT_COMPILE,
+   PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE,
+   PCRE_STUDY_JIT_COMPILE + PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE,
+   PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE,
+   PCRE_STUDY_JIT_COMPILE + PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE,
+   PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE + PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE,
+   PCRE_STUDY_JIT_COMPILE + PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE +
+     PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE
+ };
+ #define PCRE_STUDY_ALLJIT (PCRE_STUDY_JIT_COMPILE | \
+   PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE | PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE)
  /* Textual explanations for runtime error codes */
  static const char *errtexts[] = {
- Line 214  static const char *errtexts[] = {
+ Line 1113  static const char *errtexts[] = {
    NULL,  /* never returned by pcre_exec() or pcre_dfa_exec() */
    "match limit exceeded",
    "callout error code",
-  NULL,  /* BADUTF8 is handled specially */
+  NULL,  /* BADUTF8/16 is handled specially */
-  "bad UTF-8 offset",
+  NULL,  /* BADUTF8/16 offset is handled specially */
    NULL,  /* PARTIAL is handled specially */
    "not used - internal error",
    "internal error - pattern overwritten?",
- Line 229  static const char *errtexts[] = {
+ Line 1128  static const char *errtexts[] = {
    "not used - internal error",
    "invalid combination of newline options",
    "bad offset value",
-  NULL,  /* SHORTUTF8 is handled specially */
+  NULL,  /* SHORTUTF8/16 is handled specially */
    "nested recursion at the same subject position",
-  "JIT stack limit reached"
+  "JIT stack limit reached",
+  "pattern compiled in wrong mode: 8-bit/16-bit error",
+  "pattern compiled with other endianness",
+  "invalid data in workspace for DFA restart",
+  "bad JIT option",
+  "bad length"
  };
- Line 247  the L (locale) option also adjusts the tables. */
+ Line 1151  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 unsigned char tables0[] = {
+static const pcre_uint8 tables0[] = {
  /* This table is a lower casing table. */
- Line 384  graph, print, punct, and cntrl. Other classes are buil
+ Line 1288  graph, print, punct, and cntrl. Other classes are buil
  */
 x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
+x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00, /*   8- 15 */
 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, /*    - '  */
- Line 416  graph, print, punct, and cntrl. Other classes are buil
+ Line 1320  graph, print, punct, and cntrl. Other classes are buil
 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
+/* This is a set of tables that came originally from a Windows user. It seems
-be at least an approximation of ISO 8859. In particular, there are characters
+to be at least an approximation of ISO 8859. In particular, there are
-greater than 128 that are marked as spaces, letters, etc. */
+characters greater than 128 that are marked as spaces, letters, etc. */
-static const unsigned char tables1[] = {
+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,
- Line 583  return sys_errlist[n];
+ Line 1487  return sys_errlist[n];
  #endif /* HAVE_STRERROR */
  /*************************************************
+ *       Print newline configuration              *
+ *************************************************/
+ /*
+ Arguments:
+   rc         the return code from PCRE_CONFIG_NEWLINE
+   isc        TRUE if called from "-C newline"
+ Returns:     nothing
+ */
+ static void
+ print_newline_config(int rc, BOOL isc)
+ {
+ const char *s = NULL;
+ if (!isc) printf("  Newline sequence is ");
+ switch(rc)
+   {
+   case CHAR_CR: s = "CR"; break;
+   case CHAR_LF: s = "LF"; break;
+   case (CHAR_CR<<8 | CHAR_LF): s = "CRLF"; break;
+   case -1: s = "ANY"; break;
+   case -2: s = "ANYCRLF"; break;
+   default:
+   printf("a non-standard value: 0x%04x\n", rc);
+   return;
+   }
+ printf("%s\n", s);
+ }
+ /*************************************************
  *         JIT memory callback                    *
  *************************************************/
  static pcre_jit_stack* jit_callback(void *arg)
  {
+ jit_was_used = TRUE;
  return (pcre_jit_stack *)arg;
  }
+ #if !defined NOUTF || defined SUPPORT_PCRE16 || defined SUPPORT_PCRE32
  /*************************************************
+ *            Convert UTF-8 string to value       *
+ *************************************************/
+ /* This function takes one or more bytes that represents a UTF-8 character,
+ and returns the value of the character.
+ Argument:
+   utf8bytes   a pointer to the byte vector
+   vptr        a pointer to an int to receive the value
+ Returns:      >  0 => the number of bytes consumed
+               -6 to 0 => malformed UTF-8 character at offset = (-return)
+ */
+ static int
+ utf82ord(pcre_uint8 *utf8bytes, pcre_uint32 *vptr)
+ {
+ pcre_uint32 c = *utf8bytes++;
+ pcre_uint32 d = c;
+ int i, j, s;
+ for (i = -1; i < 6; i++)               /* i is number of additional bytes */
+   {
+   if ((d & 0x80) == 0) break;
+   d <<= 1;
+   }
+ if (i == -1) { *vptr = c; return 1; }  /* ascii character */
+ if (i == 0 || i == 6) return 0;        /* invalid UTF-8 */
+ /* i now has a value in the range 1-5 */
+ s = 6*i;
+ d = (c & utf8_table3[i]) << s;
+ for (j = 0; j < i; j++)
+   {
+   c = *utf8bytes++;
+   if ((c & 0xc0) != 0x80) return -(j+1);
+   s -= 6;
+   d |= (c & 0x3f) << s;
+   }
+ /* Check that encoding was the correct unique one */
+ for (j = 0; j < utf8_table1_size; j++)
+   if (d <= (pcre_uint32)utf8_table1[j]) break;
+ if (j != i) return -(i+1);
+ /* Valid value */
+ *vptr = d;
+ return i+1;
+ }
+ #endif /* NOUTF || SUPPORT_PCRE16 */
+ #if defined SUPPORT_PCRE8 && !defined NOUTF
+ /*************************************************
+ *       Convert character value to UTF-8         *
+ *************************************************/
+ /* This function takes an integer value in the range 0 - 0x7fffffff
+ and encodes it as a UTF-8 character in 0 to 6 bytes.
+ Arguments:
+   cvalue     the character value
+   utf8bytes  pointer to buffer for result - at least 6 bytes long
+ Returns:     number of characters placed in the buffer
+ */
+ static int
+ ord2utf8(pcre_uint32 cvalue, pcre_uint8 *utf8bytes)
+ {
+ register int i, j;
+ if (cvalue > 0x7fffffffu)
+   return -1;
+ for (i = 0; i < utf8_table1_size; i++)
+   if (cvalue <= (pcre_uint32)utf8_table1[i]) break;
+ utf8bytes += i;
+ for (j = i; j > 0; j--)
+  {
+  *utf8bytes-- = 0x80 | (cvalue & 0x3f);
+  cvalue >>= 6;
+  }
+ *utf8bytes = utf8_table2[i] | cvalue;
+ return i + 1;
+ }
+ #endif
+ #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
+   {
+   pcre_uint32 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
+ #ifdef SUPPORT_PCRE32
+ /*************************************************
+ *         Convert a string to 32-bit             *
+ *************************************************/
+ /* In non-UTF mode, the space needed for a 32-bit string is exactly four times the
+-bit size. For a UTF-8 string, the size needed for UTF-32 is no more than four
+ times, because up to 0xffff uses no more than 3 bytes in UTF-8 but possibly 4
+ in UTF-32. Higher values use 4 bytes in UTF-8 and up to 4 bytes in UTF-32. The
+ result is always left in buffer32.
+ Note that this function does not object to surrogate values. This is
+ deliberate; it makes it possible to construct UTF-32 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-32)
+   len        number of bytes in the string (excluding trailing zero)
+ Returns:     number of 32-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 an ill-formed value is encountered (i.e. a surrogate)
+ */
+ static int
+ to32(int data, pcre_uint8 *p, int utf, int len)
+ {
+ pcre_uint32 *pp;
+ if (buffer32_size < 4*len + 4)
+   {
+   if (buffer32 != NULL) free(buffer32);
+   buffer32_size = 4*len + 4;
+   buffer32 = (pcre_uint32 *)malloc(buffer32_size);
+   if (buffer32 == NULL)
+     {
+     fprintf(stderr, "pcretest: malloc(%d) failed for buffer32\n", buffer32_size);
+     exit(1);
+     }
+   }
+ pp = buffer32;
+ if (!utf && !data)
+   {
+   while (len-- > 0) *pp++ = *p++;
+   }
+ else
+   {
+   pcre_uint32 c = 0;
+   while (len > 0)
+     {
+     int chlen = utf82ord(p, &c);
+     if (chlen <= 0) return -1;
+     if (utf)
+       {
+       if (c > 0x10ffff) return -2;
+       if (!data && (c & 0xfffff800u) == 0xd800u) return -3;
+       }
+     p += chlen;
+     len -= chlen;
+     *pp++ = c;
+     }
+   }
+ *pp = 0;
+ return pp - buffer32;
+ }
+ /* Check that a 32-bit character string is valid UTF-32.
+ Arguments:
+   string       points to the string
+   length       length of string, or -1 if the string is zero-terminated
+ Returns:       TRUE  if the string is a valid UTF-32 string
+                FALSE otherwise
+ */
+ #ifdef NEVER   /* Not used */
+ #ifdef SUPPORT_UTF
+ static BOOL
+ valid_utf32(pcre_uint32 *string, int length)
+ {
+ register pcre_uint32 *p;
+ register pcre_uint32 c;
+ for (p = string; length-- > 0; p++)
+   {
+   c = *p;
+   if (c > 0x10ffffu) return FALSE;                 /* Too big */
+   if ((c & 0xfffff800u) == 0xd800u) return FALSE;  /* Surrogate */
+   }
+ return TRUE;
+ }
+ #endif /* SUPPORT_UTF */
+ #endif /* NEVER */
+ #endif /* SUPPORT_PCRE32 */
+ /*************************************************
  *        Read or extend an input line            *
  *************************************************/
- Line 616  Returns:       pointer to the start of new data
+ Line 1839  Returns:       pointer to the start of new data
                 NULL if no data read and EOF reached
  */
-static uschar *
+static pcre_uint8 *
-extend_inputline(FILE *f, uschar *start, const char *prompt)
+extend_inputline(FILE *f, pcre_uint8 *start, const char *prompt)
  {
-uschar *here = start;
+pcre_uint8 *here = start;
  for (;;)
    {
-  int rlen = (int)(buffer_size - (here - buffer));
+  size_t rlen = (size_t)(buffer_size - (here - buffer));
    if (rlen > 1000)
      {
      int dlen;
-    /* If libreadline support is required, use readline() to read a line if the
+    /* If libreadline or libedit support is required, use readline() to read a
-    input is a terminal. Note that readline() removes the trailing newline, so
+    line if the input is a terminal. Note that readline() removes the trailing
-    we must put it back again, to be compatible with fgets(). */
+    newline, so we must put it back again, to be compatible with fgets(). */
-#ifdef SUPPORT_LIBREADLINE
+#if defined(SUPPORT_LIBREADLINE) || defined(SUPPORT_LIBEDIT)
      if (isatty(fileno(f)))
        {
        size_t len;
- Line 666  for (;;)
+ Line 1889  for (;;)
    else
      {
      int new_buffer_size = 2*buffer_size;
-    uschar *new_buffer = (unsigned char *)malloc(new_buffer_size);
+    pcre_uint8 *new_buffer = (pcre_uint8 *)malloc(new_buffer_size);
-    uschar *new_dbuffer = (unsigned char *)malloc(new_buffer_size);
+    pcre_uint8 *new_pbuffer = (pcre_uint8 *)malloc(new_buffer_size);
-    uschar *new_pbuffer = (unsigned char *)malloc(new_buffer_size);
-    if (new_buffer == NULL || new_dbuffer == NULL || new_pbuffer == NULL)
+    if (new_buffer == NULL || new_pbuffer == NULL)
        {
        fprintf(stderr, "pcretest: malloc(%d) failed\n", new_buffer_size);
        exit(1);
- Line 685  for (;;)
+ Line 1907  for (;;)
      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 */
+/* Control never gets here */
  }
  /*************************************************
  *          Read number from string               *
  *************************************************/
- Line 719  Returns:        the unsigned long
+ Line 1935  Returns:        the unsigned long
  */
  static int
-get_value(unsigned char *str, unsigned char **endptr)
+get_value(pcre_uint8 *str, pcre_uint8 **endptr)
  {
  int result = 0;
  while(*str != 0 && isspace(*str)) str++;
- Line 730  return(result);
+ Line 1946  return(result);
  /*************************************************
-*            Convert UTF-8 string to value       *
+*             Print one character                *
  *************************************************/
-/* This function takes one or more bytes that represents a UTF-8 character,
+/* Print a single character either literally, or as a hex escape. */
-and returns the value of the character.
-Argument:
+static int pchar(pcre_uint32 c, FILE *f)
-  utf8bytes   a pointer to the byte vector
-  vptr        a pointer to an int to receive the value
-Returns:      >  0 => the number of bytes consumed
-              -6 to 0 => malformed UTF-8 character at offset = (-return)
-*/
-#if !defined NOUTF8
 static int
-utf82ord(unsigned char *utf8bytes, int *vptr)
  {
-int c = *utf8bytes++;
+int n = 0;
-int d = c;
+if (PRINTOK(c))
-int i, j, s;
+  {
+  if (f != NULL) fprintf(f, "%c", c);
+  return 1;
+  }
-for (i = -1; i < 6; i++)               /* i is number of additional bytes */
+if (c < 0x100)
    {
-  if ((d & 0x80) == 0) break;
+  if (use_utf)
-  d <<= 1;
+    {
+    if (f != NULL) fprintf(f, "\\x{%02x}", c);
+    return 6;
+    }
+  else
+    {
+    if (f != NULL) fprintf(f, "\\x%02x", c);
+    return 4;
+    }
    }
-if (i == -1) { *vptr = c; return 1; }  /* ascii character */
+if (f != NULL) n = fprintf(f, "\\x{%02x}", c);
-if (i == 0 || i == 6) return 0;        /* invalid UTF-8 */
+return n >= 0 ? n : 0;
+}
- /* i now has a value in the range 1-5 */
- s = 6*i;
- d = (c & utf8_table3[i]) << s;
-for (j = 0; j < i; j++)
+#ifdef SUPPORT_PCRE8
-  {
+/*************************************************
-  c = *utf8bytes++;
+*         Print 8-bit character string           *
-  if ((c & 0xc0) != 0x80) return -(j+1);
+*************************************************/
-  s -= 6;
-  d |= (c & 0x3f) << s;
-  }
-/* Check that encoding was the correct unique one */
+/* Must handle UTF-8 strings in utf8 mode. Yields number of characters printed.
+If handed a NULL file, just counts chars without printing. */
-for (j = 0; j < utf8_table1_size; j++)
+static int pchars(pcre_uint8 *p, int length, FILE *f)
-  if (d <= utf8_table1[j]) break;
+{
-if (j != i) return -(i+1);
+pcre_uint32 c = 0;
+int yield = 0;
-/* Valid value */
+if (length < 0)
+  length = strlen((char *)p);
-*vptr = d;
+while (length-- > 0)
-return i+1;
+  {
-}
+#if !defined NOUTF
+  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;
+      yield += pchar(c, f);
+      continue;
+      }
+    }
+#endif
+  c = *p++;
+  yield += pchar(c, f);
+  }
+ return yield;
+ }
  #endif
+ #ifdef SUPPORT_PCRE16
  /*************************************************
-*       Convert character value to UTF-8         *
+*    Find length of 0-terminated 16-bit string   *
  *************************************************/
-/* This function takes an integer value in the range 0 - 0x7fffffff
+static int strlen16(PCRE_SPTR16 p)
-and encodes it as a UTF-8 character in 0 to 6 bytes.
+{
+PCRE_SPTR16 pp = p;
+while (*pp != 0) pp++;
+return (int)(pp - p);
+}
+#endif  /* SUPPORT_PCRE16 */
- Arguments:
-   cvalue     the character value
-   utf8bytes  pointer to buffer for result - at least 6 bytes long
- Returns:     number of characters placed in the buffer
- */
-#if !defined NOUTF8
+#ifdef SUPPORT_PCRE32
+/*************************************************
+*    Find length of 0-terminated 32-bit string   *
+*************************************************/
-static int
+static int strlen32(PCRE_SPTR32 p)
-ord2utf8(int cvalue, uschar *utf8bytes)
  {
-register int i, j;
+PCRE_SPTR32 pp = p;
-for (i = 0; i < utf8_table1_size; i++)
+while (*pp != 0) pp++;
-  if (cvalue <= utf8_table1[i]) break;
+return (int)(pp - p);
-utf8bytes += i;
-for (j = i; j > 0; j--)
- {
- *utf8bytes-- = 0x80 | (cvalue & 0x3f);
- cvalue >>= 6;
- }
-*utf8bytes = utf8_table2[i] | cvalue;
-return i + 1;
  }
+ #endif  /* SUPPORT_PCRE32 */
- #endif
+#ifdef SUPPORT_PCRE16
  /*************************************************
-*             Print character string             *
+*           Print 16-bit character string        *
  *************************************************/
-/* Character string printing function. Must handle UTF-8 strings in utf8
+/* Must handle UTF-16 strings in utf mode. Yields number of characters printed.
-mode. Yields number of characters printed. If handed a NULL file, just counts
+If handed a NULL file, just counts chars without printing. */
-chars without printing. */
-static int pchars(unsigned char *p, int length, FILE *f)
+static int pchars16(PCRE_SPTR16 p, int length, FILE *f)
  {
- int c = 0;
  int yield = 0;
+ if (length < 0)
+   length = strlen16(p);
  while (length-- > 0)
    {
-#if !defined NOUTF8
+  pcre_uint32 c = *p++ & 0xffff;
-  if (use_utf8)
+#if !defined NOUTF
+  if (use_utf && c >= 0xD800 && c < 0xDC00 && length > 0)
      {
-    int rc = utf82ord(p, &c);
+    int d = *p & 0xffff;
     if (d >= 0xDC00 && d <= 0xDFFF)
-    if (rc > 0 && rc <= length + 1)   /* Mustn't run over the end */
        {
-      length -= rc - 1;
+      c = ((c & 0x3ff) << 10) + (d & 0x3ff) + 0x10000;
-      p += rc;
+      length--;
-      if (PRINTHEX(c))
+      p++;
-        {
-        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
+   yield += pchar(c, f);
+   }
-   /* Not UTF-8, or malformed UTF-8  */
+return yield;
+}
+#endif  /* SUPPORT_PCRE16 */
-  c = *p++;
-  if (PRINTHEX(c))
-    {
+#ifdef SUPPORT_PCRE32
-    if (f != NULL) fprintf(f, "%c", c);
+/*************************************************
-    yield++;
+*           Print 32-bit character string        *
-    }
+*************************************************/
-  else
-    {
+/* Must handle UTF-32 strings in utf mode. Yields number of characters printed.
-    if (f != NULL) fprintf(f, "\\x%02x", c);
+If handed a NULL file, just counts chars without printing. */
-    yield += 4;
-    }
+static int pchars32(PCRE_SPTR32 p, int length, BOOL utf, FILE *f)
+{
+int yield = 0;
+(void)(utf);  /* Avoid compiler warning */
+if (length < 0)
+  length = strlen32(p);
+while (length-- > 0)
+  {
+  pcre_uint32 c = *p++;
+  yield += pchar(c, f);
    }
  return yield;
  }
+ #endif  /* SUPPORT_PCRE32 */
+ #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((pcre16 *)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 */
+ #ifdef SUPPORT_PCRE32
+ /*************************************************
+ *     Read a capture name (32-bit) and check it  *
+ *************************************************/
+ /* Note that the text being read is 8-bit. */
+ static pcre_uint8 *
+ read_capture_name32(pcre_uint8 *p, pcre_uint32 **pp, pcre *re)
+ {
+ pcre_uint32 *npp = *pp;
+ while (isalnum(*p)) *npp++ = *p++;
+ *npp++ = 0;
+ *npp = 0;
+ if (pcre32_get_stringnumber((pcre32 *)re, (PCRE_SPTR32)(*pp)) < 0)
+   {
+   fprintf(outfile, "no parentheses with name \"");
+   PCHARSV(*pp, 0, -1, outfile);
+   fprintf(outfile, "\"\n");
+   }
+ *pp = npp;
+ return p;
+ }
+ #endif  /* SUPPORT_PCRE32 */
+ /*************************************************
  *              Callout function                  *
  *************************************************/
- Line 917  if (callout_extra)
+ Line 2225  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 930  printed lengths of the substrings. */
+ Line 2238  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 975  first_callout = 0;
+ Line 2283  first_callout = 0;
  if (cb->mark != last_callout_mark)
    {
-  fprintf(outfile, "Latest Mark: %s\n",
+  if (cb->mark == NULL)
-    (cb->mark == NULL)? "<unset>" : (char *)(cb->mark));
+    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;
    }
- Line 1006  show_malloc variable is set only during matching. */
+ Line 2320  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 1042  free(block);
+ Line 2354  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-, 16- or 32-bit is supported, pcre_mode should always have the correct
+value, but the code is defensive.
-static void new_info(pcre *re, pcre_extra *study, int option, void *ptr)
+Arguments:
+  re        compiled regex
+  study     study data
+  option    PCRE_INFO_xxx option
+  ptr       where to put the data
+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 (pcre_mode == PCRE32_MODE)
+#ifdef SUPPORT_PCRE32
+  rc = pcre32_fullinfo((pcre32 *)re, (pcre32_extra *)study, option, ptr);
+#else
+  rc = PCRE_ERROR_BADMODE;
+#endif
+else if (pcre_mode == PCRE16_MODE)
+#ifdef SUPPORT_PCRE16
+  rc = pcre16_fullinfo((pcre16 *)re, (pcre16_extra *)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 && rc != PCRE_ERROR_UNSET)
+  fprintf(outfile, "Error %d from pcre%s_fullinfo(%d)\n", rc,
+    pcre_mode == PCRE32_MODE ? "32" : pcre_mode == PCRE16_MODE ? "16" : "", option);
+  if (rc == PCRE_ERROR_BADMODE)
+    fprintf(outfile, "Running in %d-bit mode but pattern was compiled in "
+      "%d-bit mode\n", 8 * CHAR_SIZE,
+* (REAL_PCRE_FLAGS(re) & PCRE_MODE_MASK));
+  }
+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. */
+ #if defined SUPPORT_PCRE8 || defined SUPPORT_PCRE16
+ static void
+ regexflip8_or_16(pcre *ere, pcre_extra *extra)
+ {
+ real_pcre8_or_16 *re = (real_pcre8_or_16 *)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_uint32(re->flags);
+ re->limit_match = swap_uint32(re->limit_match);
+ re->limit_recursion = swap_uint32(re->limit_recursion);
+ re->first_char = swap_uint16(re->first_char);
+ re->req_char = swap_uint16(re->req_char);
+ re->max_lookbehind = swap_uint16(re->max_lookbehind);
+ re->top_bracket = swap_uint16(re->top_bracket);
+ re->top_backref = swap_uint16(re->top_backref);
+ 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);
+ re->ref_count = swap_uint16(re->ref_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 (pcre_mode != PCRE16_MODE) 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:
+     /* LINK_SIZE can be 1 or 2 in 16 bit mode. */
+     if (LINK_SIZE > 1)
+       length = (int)((((unsigned int)(ptr[0]) << 16) | (unsigned int)(ptr[1]))
+         - (1 + LINK_SIZE + 1));
+     else
+       length = (int)((unsigned int)(ptr[0]) - (1 + LINK_SIZE + 1));
+     /* Reverse the size of the XCLASS instance. */
+     *ptr = swap_uint16(*ptr);
+     ptr++;
+     if (LINK_SIZE > 1)
+       {
+       *ptr = swap_uint16(*ptr);
+       ptr++;
+       }
+     op = *ptr;
+     *ptr = swap_uint16(op);
+     ptr++;
+     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 */
+ }
+ #endif /* SUPPORT_PCRE[8|16] */
+ #if defined SUPPORT_PCRE32
+ static void
+ regexflip_32(pcre *ere, pcre_extra *extra)
+ {
+ real_pcre32 *re = (real_pcre32 *)ere;
+ int op;
+ pcre_uint32 *ptr = (pcre_uint32 *)re + re->name_table_offset;
+ int length = re->name_count * re->name_entry_size;
+ /* 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_uint32(re->flags);
+ re->limit_match = swap_uint32(re->limit_match);
+ re->limit_recursion = swap_uint32(re->limit_recursion);
+ re->first_char = swap_uint32(re->first_char);
+ re->req_char = swap_uint32(re->req_char);
+ re->max_lookbehind = swap_uint16(re->max_lookbehind);
+ re->top_bracket = swap_uint16(re->top_bracket);
+ re->top_backref = swap_uint16(re->top_backref);
+ 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);
+ re->ref_count = swap_uint16(re->ref_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 32-bit mode we must swap bytes in the name table, if present, and then in
+ the pattern itself. */
+ while(TRUE)
+   {
+   /* Swap previous characters. */
+   while (length-- > 0)
+     {
+     *ptr = swap_uint32(*ptr);
+     ptr++;
+     }
+   /* Get next opcode. */
+   length = 0;
+   op = *ptr;
+   *ptr++ = swap_uint32(op);
+   switch (op)
+     {
+     case OP_END:
+     return;
+     default:
+     length = OP_lengths32[op] - 1;
+     break;
+     case OP_CLASS:
+     case OP_NCLASS:
+     /* Skip the character bit map. */
+     ptr += 32/sizeof(pcre_uint32);
+     length = 0;
+     break;
+     case OP_XCLASS:
+     /* LINK_SIZE can only be 1 in 32-bit mode. */
+     length = (int)((unsigned int)(ptr[0]) - (1 + LINK_SIZE + 1));
+     /* Reverse the size of the XCLASS instance. */
+     *ptr = swap_uint32(*ptr);
+     ptr++;
+     op = *ptr;
+     *ptr = swap_uint32(op);
+     ptr++;
+     if ((op & XCL_MAP) != 0)
+       {
+       /* Skip the character bit map. */
+       ptr += 32/sizeof(pcre_uint32);
+       length -= 32/sizeof(pcre_uint32);
+       }
+     break;
+     }
+   }
+ /* Control should never reach here in 32 bit mode. */
+ }
+ #endif /* SUPPORT_PCRE32 */
+ static void
+ regexflip(pcre *ere, pcre_extra *extra)
+ {
+ #if defined SUPPORT_PCRE32
+   if (REAL_PCRE_FLAGS(ere) & PCRE_MODE32)
+     regexflip_32(ere, extra);
+ #endif
+ #if defined SUPPORT_PCRE8 || defined SUPPORT_PCRE16
+   if (REAL_PCRE_FLAGS(ere) & (PCRE_MODE8 | PCRE_MODE16))
+     regexflip8_or_16(ere, extra);
+ #endif
+ }
+ /*************************************************
  *        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 1090  for (;;)
+ Line 2765  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 1135  Returns:    < 0, = 0, or > 0, according to the compari
+ Line 2810  Returns:    < 0, = 0, or > 0, according to the compari
  */
  static int
-strncmpic(uschar *s, uschar *t, int n)
+strncmpic(pcre_uint8 *s, pcre_uint8 *t, int n)
  {
  while (n--)
    {
- Line 1148  return 0;
+ Line 2823  return 0;
  /*************************************************
-*         Check newline indicator                *
+*         Check multicharacter option            *
  *************************************************/
  /* This is used both at compile and run-time to check for <xxx> escapes. Print
- Line 1157  a message and return 0 if there is no match.
+ Line 2832  a message and return 0 if there is no match.
  Arguments:
    p           points after the leading '<'
    f           file for error message
+   nl          TRUE to check only for newline settings
+   stype       "modifier" or "escape sequence"
  Returns:      appropriate PCRE_NEWLINE_xxx flags, or 0
  */
  static int
-check_newline(uschar *p, FILE *f)
+check_mc_option(pcre_uint8 *p, FILE *f, BOOL nl, const char *stype)
  {
-if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
+if (strncmpic(p, (pcre_uint8 *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
-if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
+if (strncmpic(p, (pcre_uint8 *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
-if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
+if (strncmpic(p, (pcre_uint8 *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
-if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
+if (strncmpic(p, (pcre_uint8 *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
-if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
+if (strncmpic(p, (pcre_uint8 *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
-if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
+if (strncmpic(p, (pcre_uint8 *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
-if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
+if (strncmpic(p, (pcre_uint8 *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
-fprintf(f, "Unknown newline type at: <%s\n", p);
+if (!nl)
+  {
+  if (strncmpic(p, (pcre_uint8 *)"JS>", 3) == 0) return PCRE_JAVASCRIPT_COMPAT;
+fprintf(f, "Unknown %s at: <%s\n", stype, p);
  return 0;
  }
- Line 1186  usage(void)
+ Line 2869  usage(void)
  {
  printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
  printf("Input and output default to stdin and stdout.\n");
-#ifdef SUPPORT_LIBREADLINE
+#if defined(SUPPORT_LIBREADLINE) || defined(SUPPORT_LIBEDIT)
  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");
-printf("  -b       show compiled code (bytecode)\n");
+#ifdef SUPPORT_PCRE16
+printf("  -16      use the 16-bit library\n");
+#endif
+#ifdef SUPPORT_PCRE32
+printf("  -32      use the 32-bit library\n");
+#endif
+printf("  -b       show compiled code\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("     pcre32       32 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("     newline      Newline type [CR, LF, CRLF, ANYCRLF, ANY, ???]\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");
- Line 1202  printf("  -help    show usage information\n");
+ Line 2901  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       set PCRE_NO_AUTO_POSSESS on each pattern\n"
         "  -o <n>   set size of offsets vector to <n>\n");
  #if !defined NOPOSIX
  printf("  -p       use POSIX interface\n");
- Line 1210  printf("  -q       quiet: do not output PCRE version n
+ Line 2910  printf("  -q       quiet: do not output PCRE version n
  printf("  -S <n>   set stack size to <n> megabytes\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"
+        "  -s++     ditto, verifying when JIT was actually used\n"
+        "  -s+n     force each pattern to be studied, using JIT if available,\n"
+        "             where 1 <= n <= 7 selects JIT options\n"
+        "  -s++n    ditto, verifying when JIT was actually used\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");
  printf("  -tm <n>  time execution (matching) only, repeating <n> times\n");
+ printf("  -T       same as -t, but show total times at the end\n");
+ printf("  -TM      same as -tm, but show total time at the end\n");
  }
- Line 1229  options, followed by a set of test data, terminated by
+ Line 2935  options, followed by a set of test data, terminated by
  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;
+ pcre_uint32 default_options = 0;
  int op = 1;
  int timeit = 0;
  int timeitm = 0;
+ int showtotaltimes = 0;
  int showinfo = 0;
  int showstore = 0;
  int force_study = -1;
- Line 1243  int quiet = 0;
+ Line 2952  int quiet = 0;
  int size_offsets = 45;
  int size_offsets_max;
  int *offsets = NULL;
- #if !defined NOPOSIX
- int posix = 0;
- #endif
  int debug = 0;
  int done = 0;
  int all_use_dfa = 0;
+ int verify_jit = 0;
  int yield = 0;
  int stack_size;
+ pcre_uint8 *dbuffer = NULL;
+ pcre_uint8 lockout[24] = { 0 };
+ size_t dbuffer_size = 1u << 14;
+ clock_t total_compile_time = 0;
+ clock_t total_study_time = 0;
+ clock_t total_match_time = 0;
+ #if !defined NOPOSIX
+ int posix = 0;
+ #endif
+ #if !defined NODFA
+ int *dfa_workspace = NULL;
+ #endif
  pcre_jit_stack *jit_stack = NULL;
+ /* These vectors store, end-to-end, a list of zero-terminated captured
+ 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
+ easiest to keep separate 8-, 16- and 32-bit versions, using the 32-bit version
+ for the actual memory, to ensure alignment. */
-/* These vectors store, end-to-end, a list of captured substring names. Assume
+pcre_uint32 copynames[1024];
-that 1024 is plenty long enough for the few names we'll be testing. */
+pcre_uint32 getnames[1024];
-uschar copynames[1024];
+#ifdef SUPPORT_PCRE32
-uschar getnames[1024];
+pcre_uint32 *cn32ptr;
+pcre_uint32 *gn32ptr;
+#endif
-uschar *copynamesptr;
+#ifdef SUPPORT_PCRE16
-uschar *getnamesptr;
+pcre_uint16 *copynames16 = (pcre_uint16 *)copynames;
+pcre_uint16 *getnames16 = (pcre_uint16 *)getnames;
+pcre_uint16 *cn16ptr;
+pcre_uint16 *gn16ptr;
+#endif
-/* Get buffers from malloc() so that Electric Fence will check their misuse
+#ifdef SUPPORT_PCRE8
-when I am debugging. They grow automatically when very long lines are read. */
+pcre_uint8 *copynames8 = (pcre_uint8 *)copynames;
+pcre_uint8 *getnames8 = (pcre_uint8 *)getnames;
+pcre_uint8 *cn8ptr;
+pcre_uint8 *gn8ptr;
+#endif
-buffer = (unsigned char *)malloc(buffer_size);
+/* Get buffers from malloc() so that valgrind will check their misuse when
-dbuffer = (unsigned char *)malloc(buffer_size);
+debugging. They grow automatically when very long lines are read. The 16-
-pbuffer = (unsigned char *)malloc(buffer_size);
+and 32-bit buffers (buffer16, buffer32) are obtained only if needed. */
+ buffer = (pcre_uint8 *)malloc(buffer_size);
+ pbuffer = (pcre_uint8 *)malloc(buffer_size);
  /* The outfile variable is static so that new_malloc can use it. */
  outfile = stdout;
- Line 1284  it set 0x8000, but then I was advised that _O_BINARY w
+ Line 3022  it set 0x8000, but then I was advised that _O_BINARY w
  _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. */
+ #if defined SUPPORT_PCRE8
+ version = pcre_version();
+ #elif defined SUPPORT_PCRE16
+ version = pcre16_version();
+ #elif defined SUPPORT_PCRE32
+ version = pcre32_version();
+ #endif
  /* Scan options */
  while (argc > 1 && argv[op][0] == '-')
    {
-  unsigned char *endptr;
+  pcre_uint8 *endptr;
+  char *arg = argv[op];
-  if (strcmp(argv[op], "-m") == 0) showstore = 1;
+  if (strcmp(arg, "-m") == 0) showstore = 1;
-  else if (strcmp(argv[op], "-s") == 0) force_study = 0;
+  else if (strcmp(arg, "-s") == 0) force_study = 0;
-  else if (strcmp(argv[op], "-s+") == 0)
+  else if (strncmp(arg, "-s+", 3) == 0)
      {
+     arg += 3;
+     if (*arg == '+') { arg++; verify_jit = TRUE; }
      force_study = 1;
-    force_study_options = PCRE_STUDY_JIT_COMPILE;
+    if (*arg == 0)
+      force_study_options = jit_study_bits[6];
+    else if (*arg >= '1' && *arg <= '7')
+      force_study_options = jit_study_bits[*arg - '1'];
+    else goto BAD_ARG;
      }
-  else if (strcmp(argv[op], "-q") == 0) quiet = 1;
+  else if (strcmp(arg, "-8") == 0)
-  else if (strcmp(argv[op], "-b") == 0) debug = 1;
+    {
-  else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
+#ifdef SUPPORT_PCRE8
-  else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
+    pcre_mode = PCRE8_MODE;
-  else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;
+#else
+    printf("** This version of PCRE was built without 8-bit support\n");
+    exit(1);
+#endif
+    }
+  else if (strcmp(arg, "-16") == 0)
+    {
+#ifdef SUPPORT_PCRE16
+    pcre_mode = PCRE16_MODE;
+#else
+    printf("** This version of PCRE was built without 16-bit support\n");
+    exit(1);
+#endif
+    }
+  else if (strcmp(arg, "-32") == 0)
+    {
+#ifdef SUPPORT_PCRE32
+    pcre_mode = PCRE32_MODE;
+#else
+    printf("** This version of PCRE was built without 32-bit support\n");
+    exit(1);
+#endif
+    }
+  else if (strcmp(arg, "-q") == 0) quiet = 1;
+  else if (strcmp(arg, "-b") == 0) debug = 1;
+  else if (strcmp(arg, "-i") == 0) showinfo = 1;
+  else if (strcmp(arg, "-d") == 0) showinfo = debug = 1;
+  else if (strcmp(arg, "-M") == 0) default_find_match_limit = TRUE;
+  else if (strcmp(arg, "-O") == 0) default_options |= PCRE_NO_AUTO_POSSESS;
  #if !defined NODFA
-  else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
+  else if (strcmp(arg, "-dfa") == 0) all_use_dfa = 1;
  #endif
-  else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
+  else if (strcmp(arg, "-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++;
      argc--;
      }
-  else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
+  else if (strcmp(arg, "-t") == 0 || strcmp(arg, "-tm") == 0 ||
+           strcmp(arg, "-T") == 0 || strcmp(arg, "-TM") == 0)
      {
-     int both = argv[op][2] == 0;
      int temp;
-    if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
+    int both = arg[2] == 0;
+    showtotaltimes = arg[1] == 'T';
+    if (argc > 2 && (temp = get_value((pcre_uint8 *)argv[op+1], &endptr),
                       *endptr == 0))
        {
        timeitm = temp;
- Line 1326  while (argc > 1 && argv[op][0] == '-')
+ Line 3113  while (argc > 1 && argv[op][0] == '-')
      else timeitm = LOOPREPEAT;
      if (both) timeit = timeitm;
      }
-  else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
+  else if (strcmp(arg, "-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) || defined(__minix)
+#if defined(_WIN32) || defined(WIN32) || defined(__minix) || defined(NATIVE_ZOS) || defined(__VMS)
      printf("PCRE: -S not supported on this OS\n");
      exit(1);
  #else
- Line 1349  while (argc > 1 && argv[op][0] == '-')
+ Line 3136  while (argc > 1 && argv[op][0] == '-')
  #endif
      }
  #if !defined NOPOSIX
-  else if (strcmp(argv[op], "-p") == 0) posix = 1;
+  else if (strcmp(arg, "-p") == 0) posix = 1;
  #endif
-  else if (strcmp(argv[op], "-C") == 0)
+  else if (strcmp(arg, "-C") == 0)
      {
      int rc;
      unsigned long int lrc;
-    printf("PCRE version %s\n", pcre_version());
+    if (argc > 2)
+      {
+      if (strcmp(argv[op + 1], "linksize") == 0)
+        {
+        (void)PCRE_CONFIG(PCRE_CONFIG_LINK_SIZE, &rc);
+        printf("%d\n", rc);
+        yield = rc;
+#ifdef __VMS
+        vms_setsymbol("LINKSIZE",0,yield );
+#endif
+        }
+      else if (strcmp(argv[op + 1], "pcre8") == 0)
+        {
+#ifdef SUPPORT_PCRE8
+        printf("1\n");
+        yield = 1;
+#else
+        printf("0\n");
+        yield = 0;
+#endif
+#ifdef __VMS
+        vms_setsymbol("PCRE8",0,yield );
+#endif
+        }
+      else if (strcmp(argv[op + 1], "pcre16") == 0)
+        {
+#ifdef SUPPORT_PCRE16
+        printf("1\n");
+        yield = 1;
+#else
+        printf("0\n");
+        yield = 0;
+#endif
+#ifdef __VMS
+        vms_setsymbol("PCRE16",0,yield );
+#endif
+        }
+      else if (strcmp(argv[op + 1], "pcre32") == 0)
+        {
+#ifdef SUPPORT_PCRE32
+        printf("1\n");
+        yield = 1;
+#else
+        printf("0\n");
+        yield = 0;
+#endif
+#ifdef __VMS
+        vms_setsymbol("PCRE32",0,yield );
+#endif
+        }
+      else if (strcmp(argv[op + 1], "utf") == 0)
+        {
+#ifdef SUPPORT_PCRE8
+        if (pcre_mode == PCRE8_MODE)
+          (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
+#endif
+#ifdef SUPPORT_PCRE16
+        if (pcre_mode == PCRE16_MODE)
+          (void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
+#endif
+#ifdef SUPPORT_PCRE32
+        if (pcre_mode == PCRE32_MODE)
+          (void)pcre32_config(PCRE_CONFIG_UTF32, &rc);
+#endif
+        printf("%d\n", rc);
+        yield = rc;
+#ifdef __VMS
+        vms_setsymbol("UTF",0,yield );
+#endif
+        }
+      else if (strcmp(argv[op + 1], "ucp") == 0)
+        {
+        (void)PCRE_CONFIG(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
+        printf("%d\n", rc);
+        yield = rc;
+        }
+      else if (strcmp(argv[op + 1], "jit") == 0)
+        {
+        (void)PCRE_CONFIG(PCRE_CONFIG_JIT, &rc);
+        printf("%d\n", rc);
+        yield = rc;
+        }
+      else if (strcmp(argv[op + 1], "newline") == 0)
+        {
+        (void)PCRE_CONFIG(PCRE_CONFIG_NEWLINE, &rc);
+        print_newline_config(rc, TRUE);
+        }
+      else if (strcmp(argv[op + 1], "ebcdic") == 0)
+        {
+#ifdef EBCDIC
+        printf("1\n");
+        yield = 1;
+#else
+        printf("0\n");
+#endif
+        }
+      else if (strcmp(argv[op + 1], "ebcdic-nl") == 0)
+        {
+#ifdef EBCDIC
+        printf("0x%02x\n", CHAR_LF);
+#else
+        printf("0\n");
+#endif
+        }
+      else
+        {
+        printf("Unknown -C option: %s\n", argv[op + 1]);
+        }
+      goto EXIT;
+      }
+    /* No argument for -C: output all configuration information. */
+    printf("PCRE version %s\n", version);
      printf("Compiled with\n");
+ #ifdef EBCDIC
+     printf("  EBCDIC code support: LF is 0x%02x\n", CHAR_LF);
+ #endif
+ /* 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. */
+ #ifdef SUPPORT_PCRE8
+     printf("  8-bit support\n");
      (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
-    printf("  %sUTF-8 support\n", rc? "" : "No ");
+      printf ("  %sUTF-8 support\n", rc ? "" : "No ");
-    (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
+#endif
+#ifdef SUPPORT_PCRE16
+    printf("  16-bit support\n");
+    (void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
+    printf ("  %sUTF-16 support\n", rc ? "" : "No ");
+#endif
+#ifdef SUPPORT_PCRE32
+    printf("  32-bit support\n");
+    (void)pcre32_config(PCRE_CONFIG_UTF32, &rc);
+    printf ("  %sUTF-32 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_JIT, &rc);
+    (void)PCRE_CONFIG(PCRE_CONFIG_JIT, &rc);
      if (rc)
-      printf("  Just-in-time compiler support\n");
+      {
+      const char *arch;
+      (void)PCRE_CONFIG(PCRE_CONFIG_JITTARGET, (void *)(&arch));
+      printf("  Just-in-time compiler support: %s\n", arch);
+      }
      else
        printf("  No just-in-time compiler support\n");
-    (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
+    (void)PCRE_CONFIG(PCRE_CONFIG_NEWLINE, &rc);
-    /* Note that these values are always the ASCII values, even
+    print_newline_config(rc, FALSE);
-    in EBCDIC environments. CR is 13 and NL is 10. */
+    (void)PCRE_CONFIG(PCRE_CONFIG_BSR, &rc);
-    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_BSR, &rc);
      printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
                                       "all Unicode newlines");
-    (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
+    (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, &lrc);
+    (void)PCRE_CONFIG(PCRE_CONFIG_PARENS_LIMIT, &lrc);
+    printf("  Parentheses nest limit = %ld\n", lrc);
+    (void)PCRE_CONFIG(PCRE_CONFIG_MATCH_LIMIT, &lrc);
      printf("  Default match limit = %ld\n", lrc);
-    (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
+    (void)PCRE_CONFIG(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
      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");
+    printf("  Match recursion uses %s", rc? "stack" : "heap");
+    if (showstore)
+      {
+      PCRE_EXEC(stack_size, NULL, NULL, NULL, -999, -999, 0, NULL, 0);
+      printf(": %sframe size = %d bytes", rc? "approximate " : "", -stack_size);
+      }
+    printf("\n");
      goto EXIT;
      }
-  else if (strcmp(argv[op], "-help") == 0 ||
+  else if (strcmp(arg, "-help") == 0 ||
-           strcmp(argv[op], "--help") == 0)
+           strcmp(arg, "--help") == 0)
      {
      usage();
      goto EXIT;
      }
    else
      {
-    printf("** Unknown or malformed option %s\n", argv[op]);
+    BAD_ARG:
+    printf("** Unknown or malformed option %s\n", arg);
      usage();
      yield = 1;
      goto EXIT;
- Line 1443  if (argc > 2)
+ Line 3375  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
-/* Heading line unless quiet, then prompt for first regex if stdin */
+#ifdef SUPPORT_PCRE16
+pcre16_malloc = new_malloc;
+pcre16_free = new_free;
+pcre16_stack_malloc = stack_malloc;
+pcre16_stack_free = stack_free;
+#endif
-if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());
+#ifdef SUPPORT_PCRE32
+pcre32_malloc = new_malloc;
+pcre32_free = new_free;
+pcre32_stack_malloc = stack_malloc;
+pcre32_stack_free = stack_free;
+#endif
+ /* Heading line unless quiet */
+ if (!quiet) fprintf(outfile, "PCRE version %s\n\n", version);
  /* Main loop */
  while (!done)
- Line 1465  while (!done)
+ Line 3413  while (!done)
  #endif
    const char *error;
-  unsigned char *markptr;
+  pcre_uint8 *markptr;
-  unsigned char *p, *pp, *ppp;
+  pcre_uint8 *p, *pp, *ppp;
-  unsigned char *to_file = NULL;
+  pcre_uint8 *to_file = NULL;
-  const unsigned char *tables = NULL;
+  const pcre_uint8 *tables = NULL;
+  unsigned long int get_options;
    unsigned long int true_size, true_study_size = 0;
-  size_t size, regex_gotten_store;
+  size_t size;
    int do_allcaps = 0;
    int do_mark = 0;
    int do_study = 0;
- Line 1484  while (!done)
+ Line 3433  while (!done)
    int do_flip = 0;
    int erroroffset, len, delimiter, poffset;
-  use_utf8 = 0;
+#if !defined NODFA
+  int dfa_matched = 0;
+#endif
+  use_utf = 0;
    debug_lengths = 1;
    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
- Line 1495  while (!done)
+ Line 3448  while (!done)
    while (isspace(*p)) p++;
    if (*p == 0) continue;
+   /* Handle option lock-out setting */
+   if (*p == '<' && p[1] == ' ')
+     {
+     p += 2;
+     while (isspace(*p)) p++;
+     if (strncmp((char *)p, "forbid ", 7) == 0)
+       {
+       p += 7;
+       while (isspace(*p)) p++;
+       pp = lockout;
+       while (!isspace(*p) && pp < lockout + sizeof(lockout) - 1)
+         *pp++ = *p++;
+       *pp = 0;
+       }
+     else
+       {
+       printf("** Unrecognized special command '%s'\n", p);
+       yield = 1;
+       goto EXIT;
+       }
+     continue;
+     }
    /* See if the pattern is to be loaded pre-compiled from a file. */
    if (*p == '<' && strchr((char *)(p+1), '<') == NULL)
      {
-    unsigned long int magic, get_options;
+    pcre_uint32 magic;
-    uschar sbuf[8];
+    pcre_uint8 sbuf[8];
      FILE *f;
      p++;
+     if (*p == '!')
+       {
+       do_debug = TRUE;
+       do_showinfo = TRUE;
+       p++;
+       }
      pp = p + (int)strlen((char *)p);
      while (isspace(pp[-1])) pp--;
      *pp = 0;
- Line 1514  while (!done)
+ Line 3498  while (!done)
        fprintf(outfile, "Failed to open %s: %s\n", p, strerror(errno));
        continue;
        }
      if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ;
      true_size =
- Line 1522  while (!done)
+ Line 3505  while (!done)
      true_study_size =
        (sbuf[4] << 24) | (sbuf[5] << 16) | (sbuf[6] << 8) | sbuf[7];
-    re = (real_pcre *)new_malloc(true_size);
+    re = (pcre *)new_malloc(true_size);
-    regex_gotten_store = first_gotten_store;
+    if (re == NULL)
+      {
+      printf("** Failed to get %d bytes of memory for pcre object\n",
+        (int)true_size);
+      yield = 1;
+      goto EXIT;
+      }
      if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;
-    magic = ((real_pcre *)re)->magic_number;
+    magic = REAL_PCRE_MAGIC(re);
      if (magic != MAGIC_NUMBER)
        {
-      if (byteflip(magic, sizeof(magic)) == MAGIC_NUMBER)
+      if (swap_uint32(magic) == MAGIC_NUMBER)
          {
          do_flip = 1;
          }
        else
          {
          fprintf(outfile, "Data in %s is not a compiled PCRE regex\n", p);
+         new_free(re);
          fclose(f);
          continue;
          }
        }
+     /* We hide the byte-invert info for little and big endian tests. */
      fprintf(outfile, "Compiled pattern%s loaded from %s\n",
-      do_flip? " (byte-inverted)" : "", p);
+      do_flip && (p[-1] == '<') ? " (byte-inverted)" : "", p);
-     /* Need to know if UTF-8 for printing data strings */
-     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 1566  while (!done)
+ Line 3551  while (!done)
          {
          FAIL_READ:
          fprintf(outfile, "Failed to read data from %s\n", p);
-        if (extra != NULL) pcre_free_study(extra);
+        if (extra != NULL)
         if (re != NULL) new_free(re);
+          PCRE_FREE_STUDY(extra);
+        new_free(re);
          fclose(f);
          continue;
          }
- Line 1576  while (!done)
+ Line 3564  while (!done)
        }
      else fprintf(outfile, "No study data\n");
+     /* Flip the necessary bytes. */
+     if (do_flip)
+       {
+       int rc;
+       PCRE_PATTERN_TO_HOST_BYTE_ORDER(rc, re, extra, NULL);
+       if (rc == PCRE_ERROR_BADMODE)
+         {
+         pcre_uint32 flags_in_host_byte_order;
+         if (REAL_PCRE_MAGIC(re) == MAGIC_NUMBER)
+           flags_in_host_byte_order = REAL_PCRE_FLAGS(re);
+         else
+           flags_in_host_byte_order = swap_uint32(REAL_PCRE_FLAGS(re));
+         /* Simulate the result of the function call below. */
+         fprintf(outfile, "Error %d from pcre%s_fullinfo(%d)\n", rc,
+           pcre_mode == PCRE32_MODE ? "32" : pcre_mode == PCRE16_MODE ? "16" : "",
+           PCRE_INFO_OPTIONS);
+         fprintf(outfile, "Running in %d-bit mode but pattern was compiled in "
+           "%d-bit mode\n", 8 * CHAR_SIZE, 8 * (flags_in_host_byte_order & PCRE_MODE_MASK));
+         new_free(re);
+         fclose(f);
+         continue;
+         }
+       }
+     /* Need to know if UTF-8 for printing data strings. */
+     if (new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options) < 0)
+       {
+       new_free(re);
+       fclose(f);
+       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++;
- Line 1629  while (!done)
+ Line 3651  while (!done)
    *pp++ = 0;
    strcpy((char *)pbuffer, (char *)p);
-  /* Look for options after final delimiter */
+  /* Look for modifiers and options after the final delimiter. */
-  options = 0;
+  options = default_options;
-  study_options = 0;
+  study_options = force_study_options;
    log_store = showstore;  /* default from command line */
    while (*pp != 0)
      {
+     /* Check to see whether this modifier has been locked out for this file.
+     This is complicated for the multi-character options that begin with '<'.
+     If there is no '>' in the lockout string, all multi-character modifiers are
+     locked out. */
+     if (strchr((char *)lockout, *pp) != NULL)
+       {
+       if (*pp == '<' && strchr((char *)lockout, '>') != NULL)
+         {
+         int x = check_mc_option(pp+1, outfile, FALSE, "modifier");
+         if (x == 0) goto SKIP_DATA;
+         for (ppp = lockout; *ppp != 0; ppp++)
+           {
+           if (*ppp == '<')
+             {
+             int y = check_mc_option(ppp+1, outfile, FALSE, "modifier");
+             if (y == 0)
+               {
+               printf("** Error in modifier forbid data - giving up.\n");
+               yield = 1;
+               goto EXIT;
+               }
+             if (x == y)
+               {
+               ppp = pp;
+               while (*ppp != '>') ppp++;
+               printf("** The %.*s modifier is locked out - giving up.\n",
+                 (int)(ppp - pp + 1), pp);
+               yield = 1;
+               goto EXIT;
+               }
+             }
+           }
+         }
+       /* The single-character modifiers are straightforward. */
+       else
+         {
+         printf("** The /%c modifier is locked out - giving up.\n", *pp);
+         yield = 1;
+         goto EXIT;
+         }
+       }
+     /* The modifier is not locked out; handle it. */
      switch (*pp++)
        {
        case 'f': options |= PCRE_FIRSTLINE; break;
- Line 1663  while (!done)
+ Line 3733  while (!done)
        case 'K': do_mark = 1; break;
        case 'M': log_store = 1; break;
        case 'N': options |= PCRE_NO_AUTO_CAPTURE; break;
+       case 'O': options |= PCRE_NO_AUTO_POSSESS; break;
  #if !defined NOPOSIX
        case 'P': do_posix = 1; break;
  #endif
        case 'S':
-      if (do_study == 0)
+      do_study = 1;
+      for (;;)
          {
-        do_study = 1;
+        switch (*pp++)
-        if (*pp == '+')
            {
-          study_options |= PCRE_STUDY_JIT_COMPILE;
+          case 'S':
-          pp++;
+          do_study = 0;
+          no_force_study = 1;
+          break;
+          case '!':
+          study_options |= PCRE_STUDY_EXTRA_NEEDED;
+          break;
+          case '+':
+          if (*pp == '+')
+            {
+            verify_jit = TRUE;
+            pp++;
+          if (*pp >= '1' && *pp <= '7')
+            study_options |= jit_study_bits[*pp++ - '1'];
+          else
+            study_options |= jit_study_bits[6];
+          break;
+          case '-':
+          study_options &= ~PCRE_STUDY_ALLJIT;
+          break;
+          default:
+          pp--;
+          goto ENDLOOP;
            }
          }
-      else
+      ENDLOOP:
-        {
-        do_study = 0;
-        no_force_study = 1;
-        }
        break;
        case 'U': options |= PCRE_UNGREEDY; break;
- Line 1690  while (!done)
+ Line 3783  while (!done)
        case 'X': options |= PCRE_EXTRA; break;
        case 'Y': options |= PCRE_NO_START_OPTIMISE; break;
        case 'Z': debug_lengths = 0; break;
-      case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
+      case '8': options |= PCRE_UTF8; use_utf = 1; break;
+      case '9': options |= PCRE_NEVER_UTF; break;
        case '?': options |= PCRE_NO_UTF8_CHECK; break;
        case 'T':
- Line 1724  while (!done)
+ Line 3818  while (!done)
          goto SKIP_DATA;
          }
        locale_set = 1;
-      tables = pcre_maketables();
+      tables = PCRE_MAKETABLES;
        pp = ppp;
        break;
- Line 1737  while (!done)
+ Line 3831  while (!done)
        case '<':
          {
-        if (strncmpic(pp, (uschar *)"JS>", 3) == 0)
+        int x = check_mc_option(pp, outfile, FALSE, "modifier");
-          {
+        if (x == 0) goto SKIP_DATA;
-          options |= PCRE_JAVASCRIPT_COMPAT;
+        options |= x;
-          pp += 3;
+        while (*pp++ != '>');
-          }
-        else
-          int x = check_newline(pp, outfile);
           if (x == 0) goto SKIP_DATA;
           options |= x;
           while (*pp++ != '>');
          }
        break;
- Line 1758  while (!done)
+ Line 3844  while (!done)
        break;
        default:
-      fprintf(outfile, "** Unknown option '%c'\n", pp[-1]);
+      fprintf(outfile, "** Unknown modifier '%c'\n", pp[-1]);
        goto SKIP_DATA;
        }
      }
    /* 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 1781  while (!done)
+ Line 3867  while (!done)
      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 1801  while (!done)
+ Line 3886  while (!done)
  #endif  /* !defined NOPOSIX */
      {
-    unsigned long int get_options;
+    /* In 16- or 32-bit mode, convert the input. */
+ #ifdef SUPPORT_PCRE16
+     if (pcre_mode == PCRE16_MODE)
+       {
+       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
+ #ifdef SUPPORT_PCRE32
+     if (pcre_mode == PCRE32_MODE)
+       {
+       switch(to32(FALSE, p, options & PCRE_UTF32, (int)strlen((char *)p)))
+         {
+         case -1:
+         fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
+           "converted to UTF-32\n");
+         goto SKIP_DATA;
+         case -2:
+         fprintf(outfile, "**Failed: character value greater than 0x10ffff "
+           "cannot be converted to UTF-32\n");
+         goto SKIP_DATA;
+         case -3:
+         fprintf(outfile, "**Failed: character value is ill-formed UTF-32\n");
+         goto SKIP_DATA;
+         default:
+         break;
+         }
+       p = (pcre_uint8 *)buffer32;
+       }
+ #endif
+     /* Compile many times when timing */
      if (timeit > 0)
        {
        register int i;
- Line 1810  while (!done)
+ Line 3950  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;
+      total_compile_time += (time_taken = clock() - start_time);
        fprintf(outfile, "Compile time %.4f milliseconds\n",
          (((double)time_taken * 1000.0) / (double)timeit) /
            (double)CLOCKS_PER_SEC);
        }
-    first_gotten_store = 0;
+    PCRE_COMPILE(re, p, options, &error, &erroroffset, tables);
-    re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
      /* Compilation failed; go back for another re, skipping to blank line
      if non-interactive. */
- Line 1851  while (!done)
+ Line 3990  while (!done)
      within the regex; check for this so that we know how to process the data
      lines. */
-    new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
+    if (new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options) < 0)
-    if ((get_options & PCRE_UTF8) != 0) use_utf8 = 1;
+      goto SKIP_DATA;
+    if ((get_options & PCRE_UTF8) != 0) use_utf = 1;
      /* Extract the size for possible writing before possibly flipping it,
      and remember the store that was got. */
-    true_size = ((real_pcre *)re)->size;
+    true_size = REAL_PCRE_SIZE(re);
-    regex_gotten_store = first_gotten_store;
      /* Output code size information if requested */
      if (log_store)
+       {
+       int name_count, name_entry_size, real_pcre_size;
+       new_info(re, NULL, PCRE_INFO_NAMECOUNT, &name_count);
+       new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &name_entry_size);
+       real_pcre_size = 0;
+ #ifdef SUPPORT_PCRE8
+       if (REAL_PCRE_FLAGS(re) & PCRE_MODE8)
+         real_pcre_size = sizeof(real_pcre);
+ #endif
+ #ifdef SUPPORT_PCRE16
+       if (REAL_PCRE_FLAGS(re) & PCRE_MODE16)
+         real_pcre_size = sizeof(real_pcre16);
+ #endif
+ #ifdef SUPPORT_PCRE32
+       if (REAL_PCRE_FLAGS(re) & PCRE_MODE32)
+         real_pcre_size = sizeof(real_pcre32);
+ #endif
+       new_info(re, NULL, PCRE_INFO_SIZE, &size);
        fprintf(outfile, "Memory allocation (code space): %d\n",
-        (int)(first_gotten_store -
+        (int)(size - real_pcre_size - name_count * name_entry_size));
               sizeof(real_pcre) -
-              ((real_pcre *)re)->name_count * ((real_pcre *)re)->name_entry_size));
      /* If -s or /S was present, study the regex to generate additional info to
      help with the matching, unless the pattern has the SS option, which
- Line 1881  while (!done)
+ Line 4038  while (!done)
          clock_t time_taken;
          clock_t start_time = clock();
          for (i = 0; i < timeit; i++)
-          extra = pcre_study(re, study_options | force_study_options, &error);
+          {
-        time_taken = clock() - start_time;
+          PCRE_STUDY(extra, re, study_options, &error);
         if (extra != NULL) pcre_free_study(extra);
+        total_study_time = (time_taken = clock() - start_time);
+        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 | force_study_options, &error);
+      PCRE_STUDY(extra, re, study_options, &error);
        if (error != NULL)
          fprintf(outfile, "Failed to study: %s\n", error);
        else if (extra != NULL)
- Line 1897  while (!done)
+ Line 4059  while (!done)
          if (log_store)
            {
            size_t jitsize;
-          new_info(re, extra, PCRE_INFO_JITSIZE, &jitsize);
+          if (new_info(re, extra, PCRE_INFO_JITSIZE, &jitsize) == 0 &&
-          if (jitsize != 0)
+              jitsize != 0)
-            fprintf(outfile, "Memory allocation (JIT code): %d\n", jitsize);
+            fprintf(outfile, "Memory allocation (JIT code): %d\n", (int)jitsize);
            }
          }
        }
- Line 1917  while (!done)
+ Line 4079  while (!done)
        extra->flags |= PCRE_EXTRA_MARK;
        }
-    /* If the 'F' option was present, we flip the bytes of all the integer
+    /* Extract and display information from the compiled data if required. */
-    fields in the regex data block and the study block. This is to make it
-    possible to test PCRE's handling of byte-flipped patterns, e.g. those
-    compiled on a different architecture. */
-     if (do_flip)
-       {
-       real_pcre *rre = (real_pcre *)re;
-       rre->magic_number =
-         byteflip(rre->magic_number, sizeof(rre->magic_number));
-       rre->size = byteflip(rre->size, sizeof(rre->size));
-       rre->options = byteflip(rre->options, sizeof(rre->options));
-       rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
-       rre->top_bracket =
-         (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
-       rre->top_backref =
-         (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
-       rre->first_byte =
-         (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));
-       rre->req_byte =
-         (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));
-       rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
-         sizeof(rre->name_table_offset));
-       rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
-         sizeof(rre->name_entry_size));
-       rre->name_count = (pcre_uint16)byteflip(rre->name_count,
-         sizeof(rre->name_count));
-       if (extra != NULL)
-         {
-         pcre_study_data *rsd = (pcre_study_data *)(extra->study_data);
-         rsd->size = byteflip(rsd->size, sizeof(rsd->size));
-         rsd->flags = byteflip(rsd->flags, sizeof(rsd->flags));
-         rsd->minlength = byteflip(rsd->minlength, sizeof(rsd->minlength));
-         }
-       }
-     /* Extract information from the compiled data if required. There are now
-     two info-returning functions. The old one has a limited interface and
-     returns only limited data. Check that it agrees with the newer one. */
      SHOW_INFO:
      if (do_debug)
        {
        fprintf(outfile, "------------------------------------------------------------------\n");
-      pcre_printint(re, outfile, debug_lengths);
+      PCRE_PRINTINT(re, outfile, debug_lengths);
        }
      /* We already have the options in get_options (see above) */
- Line 1971  while (!done)
+ Line 4094  while (!done)
      if (do_showinfo)
        {
        unsigned long int all_options;
-#if !defined NOINFOCHECK
+      pcre_uint32 first_char, need_char;
-      int old_first_char, old_options, old_count;
+      pcre_uint32 match_limit, recursion_limit;
-#endif
+      int count, backrefmax, first_char_set, need_char_set, okpartial, jchanged,
-      int count, backrefmax, first_char, need_char, okpartial, jchanged,
+        hascrorlf, maxlookbehind, match_empty;
-        hascrorlf;
        int nameentrysize, namecount;
-      const uschar *nametable;
+      const pcre_uint8 *nametable;
-      new_info(re, NULL, PCRE_INFO_SIZE, &size);
+      if (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_FIRSTCHARACTER, &first_char) +
-      new_info(re, NULL, PCRE_INFO_FIRSTBYTE, &first_char);
+          new_info(re, NULL, PCRE_INFO_FIRSTCHARACTERFLAGS, &first_char_set) +
-      new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);
+          new_info(re, NULL, PCRE_INFO_REQUIREDCHAR, &need_char) +
-      new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
+          new_info(re, NULL, PCRE_INFO_REQUIREDCHARFLAGS, &need_char_set) +
-      new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
+          new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize) +
-      new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
+          new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount) +
-      new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
+          new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable) +
-      new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
+          new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial) +
-      new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
+          new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged) +
+          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf) +
+          new_info(re, NULL, PCRE_INFO_MATCH_EMPTY, &match_empty) +
+          new_info(re, NULL, PCRE_INFO_MAXLOOKBEHIND, &maxlookbehind)
+          != 0)
+        goto SKIP_DATA;
-#if !defined NOINFOCHECK
+      fprintf(outfile, "Capturing subpattern count = %d\n", count);
-      old_count = pcre_info(re, &old_options, &old_first_char);
-      if (count < 0) fprintf(outfile,
-        "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,
+      if (backrefmax > 0)
-          "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n",
+        fprintf(outfile, "Max back reference = %d\n", backrefmax);
-            first_char, old_first_char);
-        if (old_options != (int)get_options) fprintf(outfile,
+      if (maxlookbehind > 0)
-          "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
+        fprintf(outfile, "Max lookbehind = %d\n", maxlookbehind);
-            get_options, old_options);
-        }
-#endif
-      if (size != regex_gotten_store) fprintf(outfile,
+      if (new_info(re, NULL, PCRE_INFO_MATCHLIMIT, &match_limit) == 0)
-        "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
+        fprintf(outfile, "Match limit = %u\n", match_limit);
-        (int)size, (int)regex_gotten_store);
-      fprintf(outfile, "Capturing subpattern count = %d\n", count);
+      if (new_info(re, NULL, PCRE_INFO_RECURSIONLIMIT, &recursion_limit) == 0)
-      if (backrefmax > 0)
+        fprintf(outfile, "Recursion limit = %u\n", recursion_limit);
-        fprintf(outfile, "Max back reference = %d\n", backrefmax);
        if (namecount > 0)
          {
          fprintf(outfile, "Named capturing subpatterns:\n");
          while (namecount-- > 0)
            {
-          fprintf(outfile, "  %s %*s%3d\n", nametable + 2,
+          int imm2_size = pcre_mode == PCRE8_MODE ? 2 : 1;
-            nameentrysize - 3 - (int)strlen((char *)nametable + 2), "",
+          int length = (int)STRLEN(nametable + imm2_size);
-            GET2(nametable, 0));
+          fprintf(outfile, "  ");
-          nametable += nameentrysize;
+          PCHARSV(nametable, imm2_size, length, outfile);
+          while (length++ < nameentrysize - imm2_size) putc(' ', outfile);
+#ifdef SUPPORT_PCRE32
+          if (pcre_mode == PCRE32_MODE)
+            fprintf(outfile, "%3d\n", (int)(((PCRE_SPTR32)nametable)[0]));
+#endif
+#ifdef SUPPORT_PCRE16
+          if (pcre_mode == PCRE16_MODE)
+            fprintf(outfile, "%3d\n", (int)(((PCRE_SPTR16)nametable)[0]));
+#endif
+#ifdef SUPPORT_PCRE8
+          if (pcre_mode == PCRE8_MODE)
+            fprintf(outfile, "%3d\n", ((int)nametable[0] << 8) | (int)nametable[1]);
+#endif
+          nametable += nameentrysize * CHAR_SIZE;
            }
          }
-      if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
+      if (!okpartial)  fprintf(outfile, "Partial matching not supported\n");
-      if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
+      if (hascrorlf)   fprintf(outfile, "Contains explicit CR or LF match\n");
+      if (match_empty) fprintf(outfile, "May match empty string\n");
-      all_options = ((real_pcre *)re)->options;
+      all_options = REAL_PCRE_OPTIONS(re);
-      if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
+      if (do_flip) all_options = swap_uint32(all_options);
        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%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%s%s\n",
            ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
            ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
            ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
- Line 2051  while (!done)
+ Line 4179  while (!done)
            ((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_NO_AUTO_POSSESS) != 0)? " no_auto_possessify" : "",
+          ((get_options & PCRE_UTF8) != 0)? " utf" : "",
            ((get_options & PCRE_UCP) != 0)? " ucp" : "",
-          ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
+          ((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" : "");
+          ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "",
+          ((get_options & PCRE_NEVER_UTF) != 0)? " never_utf" : "");
        if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
- Line 2085  while (!done)
+ Line 4215  while (!done)
          break;
          }
-      if (first_char == -1)
+      if (first_char_set == 2)
          {
          fprintf(outfile, "First char at start or follows newline\n");
          }
-      else if (first_char < 0)
+      else if (first_char_set == 1)
          {
-        fprintf(outfile, "No first char\n");
+        const char *caseless =
+          ((REAL_PCRE_FLAGS(re) & PCRE_FCH_CASELESS) == 0)?
+          "" : " (caseless)";
+        if (PRINTOK(first_char))
+          fprintf(outfile, "First char = \'%c\'%s\n", first_char, caseless);
+        else
+          {
+          fprintf(outfile, "First char = ");
+          pchar(first_char, outfile);
+          fprintf(outfile, "%s\n", caseless);
+          }
          }
        else
          {
-        int ch = first_char & 255;
+        fprintf(outfile, "No first char\n");
-        const char *caseless = ((first_char & REQ_CASELESS) == 0)?
-          "" : " (caseless)";
-        if (PRINTHEX(ch))
-          fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
-        else
-          fprintf(outfile, "First char = %d%s\n", ch, caseless);
          }
-      if (need_char < 0)
+      if (need_char_set == 0)
          {
          fprintf(outfile, "No need char\n");
          }
        else
          {
-        int ch = need_char & 255;
+        const char *caseless =
-        const char *caseless = ((need_char & REQ_CASELESS) == 0)?
+          ((REAL_PCRE_FLAGS(re) & 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
- Line 2133  while (!done)
+ Line 4273  while (!done)
            fprintf(outfile, "Study returned NULL\n");
          else
            {
-          uschar *start_bits = NULL;
+          pcre_uint8 *start_bits = NULL;
            int minlength;
-          new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength);
+          if (new_info(re, extra, PCRE_INFO_MINLENGTH, &minlength) == 0)
-          fprintf(outfile, "Subject length lower bound = %d\n", minlength);
+            fprintf(outfile, "Subject length lower bound = %d\n", minlength);
-          new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
+          if (new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits) == 0)
-          if (start_bits == NULL)
-            fprintf(outfile, "No set of starting bytes\n");
-          else
              {
-            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  ");
+                  if (c > 75)
                   c = 2;
+                    fprintf(outfile, "\n  ");
+                    c = 2;
+                  if (PRINTOK(i) && i != ' ')
+                    {
+                    fprintf(outfile, "%c ", i);
+                    c += 2;
+                    }
+                  else
+                    {
+                    fprintf(outfile, "\\x%02x ", i);
+                    c += 5;
+                    }
                    }
-                 if (PRINTHEX(i) && i != ' ')
-                   {
-                   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)
+        if ((study_options & PCRE_STUDY_ALLJIT) != 0 &&
+            (force_study_options & PCRE_STUDY_ALLJIT) == 0)
            {
            int jit;
-          new_info(re, extra, PCRE_INFO_JIT, &jit);
+          if (new_info(re, extra, PCRE_INFO_JIT, &jit) == 0)
           if (jit)
             if (jit)
-          else
+              fprintf(outfile, "JIT study was successful\n");
+            else
  #ifdef SUPPORT_JIT
-            fprintf(outfile, "JIT study was not successful\n");
+              fprintf(outfile, "JIT study was not successful\n");
  #else
-            fprintf(outfile, "JIT support is not available in this version of PCRE\n");
+              fprintf(outfile, "JIT support is not available in this version of PCRE\n");
  #endif
+             }
            }
          }
        }
- Line 2203  while (!done)
+ Line 4348  while (!done)
          }
        else
          {
-        uschar sbuf[8];
+        pcre_uint8 sbuf[8];
-        sbuf[0] = (uschar)((true_size >> 24) & 255);
-        sbuf[1] = (uschar)((true_size >> 16) & 255);
-        sbuf[2] = (uschar)((true_size >>  8) & 255);
-        sbuf[3] = (uschar)((true_size) & 255);
-        sbuf[4] = (uschar)((true_study_size >> 24) & 255);
+        if (do_flip) regexflip(re, extra);
-        sbuf[5] = (uschar)((true_study_size >> 16) & 255);
+        sbuf[0] = (pcre_uint8)((true_size >> 24) & 255);
-        sbuf[6] = (uschar)((true_study_size >>  8) & 255);
+        sbuf[1] = (pcre_uint8)((true_size >> 16) & 255);
-        sbuf[7] = (uschar)((true_study_size) & 255);
+        sbuf[2] = (pcre_uint8)((true_size >>  8) & 255);
+        sbuf[3] = (pcre_uint8)((true_size) & 255);
+        sbuf[4] = (pcre_uint8)((true_study_size >> 24) & 255);
+        sbuf[5] = (pcre_uint8)((true_study_size >> 16) & 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 2240  while (!done)
+ Line 4386  while (!done)
          }
        new_free(re);
-      if (extra != NULL) pcre_free_study(extra);
+      if (extra != NULL)
+        PCRE_FREE_STUDY(extra);
        if (locale_set)
          {
          new_free((void *)tables);
- Line 2255  while (!done)
+ Line 4404  while (!done)
    for (;;)
      {
-    uschar *q;
+#ifdef SUPPORT_PCRE8
-    uschar *bptr;
+    pcre_uint8 *q8;
+#endif
+#ifdef SUPPORT_PCRE16
+    pcre_uint16 *q16;
+#endif
+#ifdef SUPPORT_PCRE32
+    pcre_uint32 *q32;
+#endif
+    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 count;
+    pcre_uint32 c;
      int copystrings = 0;
      int find_match_limit = default_find_match_limit;
      int getstrings = 0;
- Line 2272  while (!done)
+ Line 4430  while (!done)
      int g_notempty = 0;
      int use_dfa = 0;
-     options = 0;
      *copynames = 0;
      *getnames = 0;
-    copynamesptr = copynames;
+#ifdef SUPPORT_PCRE32
-    getnamesptr = getnames;
+    cn32ptr = copynames;
+    gn32ptr = getnames;
+#endif
+#ifdef SUPPORT_PCRE16
+    cn16ptr = copynames16;
+    gn16ptr = getnames16;
+#endif
+#ifdef SUPPORT_PCRE8
+    cn8ptr = copynames8;
+    gn8ptr = getnames8;
+#endif
-    pcre_callout = callout;
+    SET_PCRE_CALLOUT(callout);
      first_callout = 1;
      last_callout_mark = NULL;
      callout_extra = 0;
- Line 2288  while (!done)
+ Line 4454  while (!done)
      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 2317  while (!done)
+ Line 4484  while (!done)
      p = buffer;
      while (isspace(*p)) p++;
-    bptr = q = dbuffer;
+#ifndef NOUTF
+    /* Check that the data is well-formed UTF-8 if we're in UTF mode. To create
+    invalid input to pcre_exec, you must use \x?? or \x{} sequences. */
+    if (use_utf)
+      {
+      pcre_uint8 *q;
+      pcre_uint32 cc;
+      int n = 1;
+      for (q = p; n > 0 && *q; q += n) n = utf82ord(q, &cc);
+      if (n <= 0)
+        {
+        fprintf(outfile, "**Failed: invalid UTF-8 string cannot be used as input in UTF mode\n");
+        goto NEXT_DATA;
+        }
+      }
+#endif
+#ifdef SUPPORT_VALGRIND
+    /* Mark the dbuffer as addressable but undefined again. */
+    if (dbuffer != NULL)
+      {
+      VALGRIND_MAKE_MEM_UNDEFINED(dbuffer, dbuffer_size * CHAR_SIZE);
+      }
+#endif
+    /* Allocate a buffer to hold the data line; len+1 is an upper bound on
+    the number of pcre_uchar units that will be needed. */
+    while (dbuffer == NULL || (size_t)len >= dbuffer_size)
+      {
+      dbuffer_size *= 2;
+      dbuffer = (pcre_uint8 *)realloc(dbuffer, dbuffer_size * CHAR_SIZE);
+      if (dbuffer == NULL)
+        {
+        fprintf(stderr, "pcretest: realloc(%d) failed\n", (int)dbuffer_size);
+        exit(1);
+        }
+      }
+#ifdef SUPPORT_PCRE8
+    q8 = (pcre_uint8 *) dbuffer;
+#endif
+#ifdef SUPPORT_PCRE16
+    q16 = (pcre_uint16 *) dbuffer;
+#endif
+#ifdef SUPPORT_PCRE32
+    q32 = (pcre_uint32 *) dbuffer;
+#endif
      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 or 32-bit mode. */
+      if (c != '\\')
          {
+ #ifndef NOUTF
+         if (use_utf && HASUTF8EXTRALEN(c)) { GETUTF8INC(c, p); }
+ #endif
+         }
+       /* Handle backslash escapes */
+       else switch ((c = *p++))
+         {
          case 'a': c =    7; break;
          case 'b': c = '\b'; break;
          case 'e': c =   27; break;
- Line 2339  while (!done)
+ Line 4571  while (!done)
          c -= '0';
          while (i++ < 2 && isdigit(*p) && *p != '8' && *p != '9')
            c = c * 8 + *p++ - '0';
+         break;
-#if !defined NOUTF8
+        case 'o':
-        if (use_utf8 && c > 255)
+        if (*p == '{')
            {
-          unsigned char buff8[8];
+          pcre_uint8 *pt = p;
-          int ii, utn;
+          c = 0;
-          utn = ord2utf8(c, buff8);
+          for (pt++; isdigit(*pt) && *pt != '8' && *pt != '9'; pt++)
-          for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
+            {
-          c = buff8[ii];   /* Last byte */
+            if (++i == 12)
+              fprintf(outfile, "** Too many octal digits in \\o{...} item; "
+                               "using only the first twelve.\n");
+            else c = c * 8 + *pt - '0';
+            }
+          if (*pt == '}') p = pt + 1;
+            else fprintf(outfile, "** Missing } after \\o{ (assumed)\n");
            }
- #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;
            /* We used to have "while (isxdigit(*(++pt)))" here, but it fails
- Line 2368  while (!done)
+ Line 4602  while (!done)
            least one MacOS environment. */
            for (pt++; isxdigit(*pt); pt++)
-            c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'a' - 10);
+            {
+            if (++i == 9)
+              fprintf(outfile, "** Too many hex digits in \\x{...} item; "
+                               "using only the first eight.\n");
+            else c = c * 16 + tolower(*pt) - ((isdigit(*pt))? '0' : 'a' - 10);
            if (*pt == '}')
              {
-             unsigned char buff8[8];
-             int ii, utn;
-             if (use_utf8)
-               {
-               utn = ord2utf8(c, buff8);
-               for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
-               c = buff8[ii];   /* Last byte */
-               }
-             else
-              {
-              if (c > 255)
-                fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
-                  "UTF-8 mode is not enabled.\n"
-                  "** Truncation will probably give the wrong result.\n", c);
-              }
              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/32-bit mode. */
          c = 0;
          while (i++ < 2 && isxdigit(*p))
- Line 2401  while (!done)
+ Line 4628  while (!done)
            c = c * 16 + tolower(*p) - ((isdigit(*p))? '0' : 'a' - 10);
            p++;
            }
+ #if !defined NOUTF && defined SUPPORT_PCRE8
+         if (use_utf && (pcre_mode == PCRE8_MODE))
+           {
+           *q8++ = c;
+           continue;
+           }
+ #endif
          break;
          case 0:   /* \ followed by EOF allows for an empty line */
- Line 2433  while (!done)
+ Line 4667  while (!done)
            }
          else if (isalnum(*p))
            {
-          uschar *npp = copynamesptr;
+          READ_CAPTURE_NAME(p, &cn8ptr, &cn16ptr, &cn32ptr, 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 2449  while (!done)
+ Line 4676  while (!done)
            }
          else if (*p == '-')
            {
-          pcre_callout = NULL;
+          SET_PCRE_CALLOUT(NULL);
            p++;
            }
          else if (*p == '!')
- Line 2503  while (!done)
+ Line 4730  while (!done)
            }
          else if (isalnum(*p))
            {
-          uschar *npp = getnamesptr;
+          READ_CAPTURE_NAME(p, &gn8ptr, &gn16ptr, &gn32ptr, re);
-          while (isalnum(*p)) *npp++ = *p++;
-          *npp++ = 0;
-          *npp = 0;
-          n = pcre_get_stringnumber(re, (char *)getnamesptr);
-          if (n < 0)
-            fprintf(outfile, "no parentheses with name \"%s\"\n", getnamesptr);
-          getnamesptr = npp;
            }
          continue;
- Line 2520  while (!done)
+ Line 4740  while (!done)
              && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0
              && extra->executable_jit != NULL)
            {
-          if (jit_stack != NULL) pcre_jit_stack_free(jit_stack);
+          if (jit_stack != NULL) { PCRE_JIT_STACK_FREE(jit_stack); }
-          jit_stack = pcre_jit_stack_alloc(1, n * 1024);
+          jit_stack = PCRE_JIT_STACK_ALLOC(1, n * 1024);
-          pcre_assign_jit_stack(extra, jit_callback, jit_stack);
+          PCRE_ASSIGN_JIT_STACK(extra, jit_callback, jit_stack);
            }
          continue;
- Line 2558  while (!done)
+ Line 4778  while (!done)
            }
          use_size_offsets = n;
          if (n == 0) use_offsets = NULL;   /* Ensures it can't write to it */
+           else use_offsets = offsets + size_offsets_max - n;  /* To catch overruns */
          continue;
          case 'P':
- Line 2611  while (!done)
+ Line 4832  while (!done)
          case '<':
            {
-          int x = check_newline(p, outfile);
+          int x = check_mc_option(p, outfile, TRUE, "escape sequence");
            if (x == 0) goto NEXT_DATA;
            options |= x;
            while (*p++ != '>');
            }
          continue;
          }
-      *q++ = c;
+      /* We now have a character value in c that may be greater than 255.
+      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. */
+#ifdef SUPPORT_PCRE8
+      if (pcre_mode == PCRE8_MODE)
+        {
+#ifndef NOUTF
+        if (use_utf)
+          {
+          if (c > 0x7fffffff)
+            {
+            fprintf(outfile, "** Character \\x{%x} is greater than 0x7fffffff "
+              "and so cannot be converted to UTF-8\n", c);
+            goto NEXT_DATA;
+            }
+          q8 += ord2utf8(c, q8);
+          }
+        else
+#endif
+          {
+          if (c > 0xffu)
+            {
+            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");
+            }
+          *q8++ = c;
+        }
+#endif
+#ifdef SUPPORT_PCRE16
+      if (pcre_mode == PCRE16_MODE)
+        {
+#ifndef NOUTF
+        if (use_utf)
+          {
+          if (c > 0x10ffffu)
+            {
+            fprintf(outfile, "** Failed: character \\x{%x} is greater than "
+              "0x10ffff and so cannot be converted to UTF-16\n", c);
+            goto NEXT_DATA;
+            }
+          else if (c >= 0x10000u)
+            {
+            c-= 0x10000u;
+            *q16++ = 0xD800 | (c >> 10);
+            *q16++ = 0xDC00 | (c & 0x3ff);
+            }
+          else
+            *q16++ = c;
+          }
+        else
+#endif
+          {
+          if (c > 0xffffu)
+            {
+            fprintf(outfile, "** Character \\x{%x} is greater than 0xffff "
+              "and UTF-16 mode is not enabled.\n", c);
+            fprintf(outfile, "** Truncation will probably give the wrong "
+              "result.\n");
+            }
+          *q16++ = c;
+          }
+        }
+#endif
+#ifdef SUPPORT_PCRE32
+      if (pcre_mode == PCRE32_MODE)
+        {
+        *q32++ = c;
+        }
+#endif
        }
-     *q = 0;
-     len = (int)(q - dbuffer);
-    /* Move the data to the end of the buffer so that a read over the end of
+    /* Reached end of subject string */
-    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. */
+ #ifdef SUPPORT_PCRE8
+     if (pcre_mode == PCRE8_MODE)
+     {
+       *q8 = 0;
+       len = (int)(q8 - (pcre_uint8 *)dbuffer);
+     }
+ #endif
+ #ifdef SUPPORT_PCRE16
+     if (pcre_mode == PCRE16_MODE)
+     {
+       *q16 = 0;
+       len = (int)(q16 - (pcre_uint16 *)dbuffer);
+     }
+ #endif
+ #ifdef SUPPORT_PCRE32
+     if (pcre_mode == PCRE32_MODE)
+     {
+       *q32 = 0;
+       len = (int)(q32 - (pcre_uint32 *)dbuffer);
+     }
+ #endif
+     /* If we're compiling with explicit valgrind support, Mark the data from after
+     its end to the end of the buffer as unaddressable, 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're not building with valgrind support, at least move the data to the end
+     of the buffer so that it might at least cause a crash.
+     If we are using the POSIX interface, we must include the terminating zero. */
+     bptr = dbuffer;
  #if !defined NOPOSIX
      if (posix || do_posix)
        {
-      memmove(bptr + buffer_size - len - 1, bptr, len + 1);
+#ifdef SUPPORT_VALGRIND
-      bptr += buffer_size - len - 1;
+      VALGRIND_MAKE_MEM_NOACCESS(dbuffer + len + 1, dbuffer_size - (len + 1));
+#else
+      memmove(bptr + dbuffer_size - len - 1, bptr, len + 1);
+      bptr += dbuffer_size - len - 1;
+#endif
        }
      else
  #endif
        {
-      memmove(bptr + buffer_size - len, bptr, len);
+#ifdef SUPPORT_VALGRIND
-      bptr += buffer_size - len;
+      VALGRIND_MAKE_MEM_NOACCESS(dbuffer + len * CHAR_SIZE, (dbuffer_size - len) * CHAR_SIZE);
+#else
+      bptr = memmove(bptr + (dbuffer_size - len) * CHAR_SIZE, bptr, len * CHAR_SIZE);
+#endif
        }
      if ((all_use_dfa || use_dfa) && find_match_limit)
- Line 2668  while (!done)
+ Line 4999  while (!done)
          (void)regerror(rc, &preg, (char *)buffer, buffer_size);
          fprintf(outfile, "No match: POSIX code %d: %s\n", rc, buffer);
          }
-      else if ((((const pcre *)preg.re_pcre)->options & PCRE_NO_AUTO_CAPTURE)
+      else if ((REAL_PCRE_OPTIONS(preg.re_pcre) & PCRE_NO_AUTO_CAPTURE) != 0)
-              != 0)
          {
          fprintf(outfile, "Matched with REG_NOSUB\n");
          }
- Line 2681  while (!done)
+ Line 5011  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 (do_showcaprest || (i == 0 && do_showrest))
                {
                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 2695  while (!done)
+ Line 5025  while (!done)
            }
          }
        free(pmatch);
+       goto NEXT_DATA;
        }
+ #endif  /* !defined NOPOSIX */
      /* Handle matching via the native interface - repeats for /g and /G */
-    else
+    /* Ensure that there is a JIT callback if we want to verify that JIT was
-#endif  /* !defined NOPOSIX */
+    actually used. If jit_stack == NULL, no stack has yet been assigned. */
+     if (verify_jit && jit_stack == NULL && extra != NULL)
+        { PCRE_ASSIGN_JIT_STACK(extra, jit_callback, jit_stack); }
      for (;; gmatched++)    /* Loop for /g or /G */
        {
        markptr = NULL;
+       jit_was_used = FALSE;
        if (timeitm > 0)
          {
- Line 2715  while (!done)
+ Line 5052  while (!done)
  #if !defined NODFA
          if (all_use_dfa || use_dfa)
            {
-          int workspace[1000];
+          if ((options & PCRE_DFA_RESTART) != 0)
+            {
+            fprintf(outfile, "Timing DFA restarts is not supported\n");
+            break;
+            }
+          if (dfa_workspace == NULL)
+            dfa_workspace = (int *)malloc(DFA_WS_DIMENSION*sizeof(int));
            for (i = 0; i < timeitm; i++)
-            count = pcre_dfa_exec(re, extra, (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,
+              dfa_workspace, DFA_WS_DIMENSION);
+            }
            }
          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;
+        total_match_time += (time_taken = clock() - start_time);
          fprintf(outfile, "Execute time %.4f milliseconds\n",
            (((double)time_taken * 1000.0) / (double)timeitm) /
              (double)CLOCKS_PER_SEC);
- Line 2743  while (!done)
+ Line 5089  while (!done)
        if (find_match_limit)
          {
-        if (extra == NULL)
+        if (extra != NULL) { PCRE_FREE_STUDY(extra); }
         extra = (pcre_extra *)malloc(sizeof(pcre_extra));
         extra->flags = 0;
           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 2772  while (!done)
+ Line 5115  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 2783  while (!done)
+ Line 5126  while (!done)
  #if !defined NODFA
        else if (all_use_dfa || use_dfa)
          {
-        int workspace[1000];
+        if (dfa_workspace == NULL)
-        count = pcre_dfa_exec(re, extra, (char *)bptr, len, start_offset,
+          dfa_workspace = (int *)malloc(DFA_WS_DIMENSION*sizeof(int));
-          options | g_notempty, use_offsets, use_size_offsets, workspace,
+        if (dfa_matched++ == 0)
-          sizeof(workspace)/sizeof(int));
+          dfa_workspace[0] = -1;  /* To catch bad restart */
+        PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,
+          (options | g_notempty), use_offsets, use_size_offsets, dfa_workspace,
+          DFA_WS_DIMENSION);
          if (count == 0)
            {
-          fprintf(outfile, "Matched, but too many subsidiary matches\n");
+          fprintf(outfile, "Matched, but offsets vector is too small to show all matches\n");
            count = use_size_offsets/2;
            }
          }
- Line 2797  while (!done)
+ Line 5143  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");
-          count = use_size_offsets/3;
+          /* 2 is a special case; match can be returned */
+          count = (use_size_offsets == 2)? 1 : use_size_offsets/3;
            }
          }
- Line 2811  while (!done)
+ Line 5158  while (!done)
        if (count >= 0)
          {
          int i, maxcount;
+         void *cnptr, *gnptr;
  #if !defined NODFA
          if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
  #endif
-          maxcount = use_size_offsets/3;
+          /* 2 is a special case; match can be returned */
+          maxcount = (use_size_offsets == 2)? 1 : use_size_offsets/3;
          /* This is a check against a lunatic return value. */
- Line 2837  while (!done)
+ Line 5186  while (!done)
          if (do_allcaps)
            {
-          new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
+          if (new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count) < 0)
+            goto SKIP_DATA;
            count++;   /* Allow for full match */
            if (count * 2 > use_size_offsets) count = use_size_offsets/2;
            }
- Line 2859  while (!done)
+ Line 5209  while (!done)
            else
              {
              fprintf(outfile, "%2d: ", i/2);
-            (void)pchars(bptr + use_offsets[i],
+            PCHARSV(bptr, use_offsets[i],
                use_offsets[i+1] - use_offsets[i], outfile);
+             if (verify_jit && jit_was_used) fprintf(outfile, " (JIT)");
              fprintf(outfile, "\n");
              if (do_showcaprest || (i == 0 && do_showrest))
                {
                fprintf(outfile, "%2d+ ", i/2);
-              (void)pchars(bptr + use_offsets[i+1], len - use_offsets[i+1],
+              PCHARSV(bptr, use_offsets[i+1], len - use_offsets[i+1],
                  outfile);
                fprintf(outfile, "\n");
                }
              }
            }
-        if (markptr != NULL) fprintf(outfile, "MK: %s\n", markptr);
+        if (markptr != NULL)
+          fprintf(outfile, "MK: ");
+          PCHARSV(markptr, 0, -1, outfile);
+          fprintf(outfile, "\n");
+          }
          for (i = 0; i < 32; i++)
            {
            if ((copystrings & (1 << i)) != 0)
              {
+             int rc;
              char copybuffer[256];
-            int rc = pcre_copy_substring((char *)bptr, use_offsets, count,
+            PCRE_COPY_SUBSTRING(rc, bptr, use_offsets, count, i,
-              i, copybuffer, sizeof(copybuffer));
+              copybuffer, sizeof(copybuffer));
              if (rc < 0)
                fprintf(outfile, "copy substring %d failed %d\n", i, rc);
              else
               fprintf(outfile, "%2dC %s (%d)\n", i, copybuffer, rc);
+              fprintf(outfile, "%2dC ", i);
+              PCHARSV(copybuffer, 0, rc, outfile);
+              fprintf(outfile, " (%d)\n", rc);
              }
            }
-        for (copynamesptr = copynames;
+        cnptr = copynames;
-             *copynamesptr != 0;
+        for (;;)
-             copynamesptr += (int)strlen((char*)copynamesptr) + 1)
            {
+           int rc;
            char copybuffer[256];
-          int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
-            count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));
+#ifdef SUPPORT_PCRE32
+          if (pcre_mode == PCRE32_MODE)
+            {
+            if (*(pcre_uint32 *)cnptr == 0) break;
+            }
+#endif
+#ifdef SUPPORT_PCRE16
+          if (pcre_mode == PCRE16_MODE)
+            {
+            if (*(pcre_uint16 *)cnptr == 0) break;
+            }
+#endif
+#ifdef SUPPORT_PCRE8
+          if (pcre_mode == PCRE8_MODE)
+            {
+            if (*(pcre_uint8 *)cnptr == 0) break;
+            }
+#endif
+          PCRE_COPY_NAMED_SUBSTRING(rc, re, bptr, use_offsets, count,
+            cnptr, copybuffer, sizeof(copybuffer));
            if (rc < 0)
             fprintf(outfile, "copy substring %s failed %d\n", copynamesptr, rc);
+            fprintf(outfile, "copy substring ");
+            PCHARSV(cnptr, 0, -1, outfile);
+            fprintf(outfile, " failed %d\n", rc);
            else
             fprintf(outfile, "  C %s (%d) %s\n", copybuffer, rc, copynamesptr);
+            fprintf(outfile, "  C ");
+            PCHARSV(copybuffer, 0, rc, outfile);
+            fprintf(outfile, " (%d) ", rc);
+            PCHARSV(cnptr, 0, -1, outfile);
+            putc('\n', outfile);
+            }
+          cnptr = (char *)cnptr + (STRLEN(cnptr) + 1) * CHAR_SIZE;
            }
          for (i = 0; i < 32; i++)
            {
            if ((getstrings & (1 << i)) != 0)
              {
+             int rc;
              const char *substring;
-            int rc = pcre_get_substring((char *)bptr, use_offsets, count,
+            PCRE_GET_SUBSTRING(rc, bptr, use_offsets, count, i, &substring);
-              i, &substring);
              if (rc < 0)
                fprintf(outfile, "get substring %d failed %d\n", i, rc);
              else
                {
-              fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
+              fprintf(outfile, "%2dG ", i);
-              pcre_free_substring(substring);
+              PCHARSV(substring, 0, rc, outfile);
+              fprintf(outfile, " (%d)\n", rc);
+              PCRE_FREE_SUBSTRING(substring);
                }
              }
            }
-        for (getnamesptr = getnames;
+        gnptr = getnames;
-             *getnamesptr != 0;
+        for (;;)
-             getnamesptr += (int)strlen((char*)getnamesptr) + 1)
            {
+           int rc;
            const char *substring;
-          int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
-            count, (char *)getnamesptr, &substring);
+#ifdef SUPPORT_PCRE32
+          if (pcre_mode == PCRE32_MODE)
+            {
+            if (*(pcre_uint32 *)gnptr == 0) break;
+            }
+#endif
+#ifdef SUPPORT_PCRE16
+          if (pcre_mode == PCRE16_MODE)
+            {
+            if (*(pcre_uint16 *)gnptr == 0) break;
+            }
+#endif
+#ifdef SUPPORT_PCRE8
+          if (pcre_mode == PCRE8_MODE)
+            {
+            if (*(pcre_uint8 *)gnptr == 0) break;
+            }
+#endif
+          PCRE_GET_NAMED_SUBSTRING(rc, re, bptr, use_offsets, count,
+            gnptr, &substring);
            if (rc < 0)
             fprintf(outfile, "copy substring %s failed %d\n", getnamesptr, rc);
+            fprintf(outfile, "get substring ");
+            PCHARSV(gnptr, 0, -1, outfile);
+            fprintf(outfile, " failed %d\n", rc);
            else
              {
-            fprintf(outfile, "  G %s (%d) %s\n", substring, rc, getnamesptr);
+            fprintf(outfile, "  G ");
-            pcre_free_substring(substring);
+            PCHARSV(substring, 0, rc, outfile);
+            fprintf(outfile, " (%d) ", rc);
+            PCHARSV(gnptr, 0, -1, outfile);
+            PCRE_FREE_SUBSTRING(substring);
+            putc('\n', outfile);
              }
+           gnptr = (char *)gnptr + (STRLEN(gnptr) + 1) * CHAR_SIZE;
            }
          if (getlist)
            {
+           int rc;
            const char **stringlist;
-          int rc = pcre_get_substring_list((char *)bptr, use_offsets, count,
+          PCRE_GET_SUBSTRING_LIST(rc, bptr, use_offsets, count, &stringlist);
-            &stringlist);
            if (rc < 0)
              fprintf(outfile, "get substring list failed %d\n", rc);
            else
              {
              for (i = 0; i < count; i++)
               fprintf(outfile, "%2dL %s\n", i, stringlist[i]);
+              fprintf(outfile, "%2dL ", i);
+              PCHARSV(stringlist[i], 0, -1, outfile);
+              putc('\n', outfile);
+              }
              if (stringlist[i] != NULL)
                fprintf(outfile, "string list not terminated by NULL\n");
-            pcre_free_substring_list(stringlist);
+            PCRE_FREE_SUBSTRING_LIST(stringlist);
              }
            }
          }
-      /* There was a partial match */
+      /* There was a partial match. If the bumpalong point is not the same as
+      the first inspected character, show the offset explicitly. */
        else if (count == PCRE_ERROR_PARTIAL)
          {
-        if (markptr == NULL) fprintf(outfile, "Partial match");
+        fprintf(outfile, "Partial match");
-          else fprintf(outfile, "Partial match, mark=%s", markptr);
+        if (use_size_offsets > 2 && use_offsets[0] != use_offsets[2])
+          fprintf(outfile, " at offset %d", use_offsets[2]);
+        if (markptr != NULL)
+          {
+          fprintf(outfile, ", mark=");
+          PCHARSV(markptr, 0, -1, outfile);
+          }
          if (use_size_offsets > 1)
            {
            fprintf(outfile, ": ");
-          pchars(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],
+          PCHARSV(bptr, use_offsets[0], use_offsets[1] - use_offsets[0],
              outfile);
            }
+         if (verify_jit && jit_was_used) fprintf(outfile, " (JIT)");
          fprintf(outfile, "\n");
          break;  /* Out of the /g loop */
          }
- Line 2978  while (!done)
+ Line 5416  while (!done)
        terminated by CRLF, an advance of one character just passes the \r,
        whereas we should prefer the longer newline sequence, as does the code in
        pcre_exec(). Fudge the offset value to achieve this. We check for a
-      newline setting in the pattern; if none was set, use pcre_config() to
+      newline setting in the pattern; if none was set, use PCRE_CONFIG() to
        find the default.
        Otherwise, in the case of UTF-8 matching, the advance must be one
- Line 2989  while (!done)
+ Line 5427  while (!done)
          if (g_notempty != 0)
            {
            int onechar = 1;
-          unsigned int obits = ((real_pcre *)re)->options;
+          unsigned int obits = REAL_PCRE_OPTIONS(re);
            use_offsets[0] = start_offset;
            if ((obits & PCRE_NEWLINE_BITS) == 0)
              {
              int d;
-            (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
+            (void)PCRE_CONFIG(PCRE_CONFIG_NEWLINE, &d);
              /* Note that these values are always the ASCII ones, even in
              EBCDIC environments. CR = 13, NL = 10. */
              obits = (d == 13)? PCRE_NEWLINE_CR :
- Line 3007  while (!done)
+ Line 5445  while (!done)
                 (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_CRLF ||
                 (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
                &&
-              start_offset < len - 1 &&
+              start_offset < len - 1 && (
 #ifdef SUPPORT_PCRE8
-              bptr[start_offset+1] == '\n')
+              (pcre_mode == PCRE8_MODE &&
+               bptr[start_offset] == '\r' &&
+               bptr[start_offset + 1] == '\n') ||
+#endif
+#ifdef SUPPORT_PCRE16
+              (pcre_mode == PCRE16_MODE &&
+               ((PCRE_SPTR16)bptr)[start_offset] == '\r' &&
+               ((PCRE_SPTR16)bptr)[start_offset + 1] == '\n') ||
+#endif
+#ifdef SUPPORT_PCRE32
+              (pcre_mode == PCRE32_MODE &&
+               ((PCRE_SPTR32)bptr)[start_offset] == '\r' &&
+               ((PCRE_SPTR32)bptr)[start_offset + 1] == '\n') ||
+#endif
+))
              onechar++;
-          else if (use_utf8)
+          else if (use_utf)
              {
              while (start_offset + onechar < len)
                {
- Line 3028  while (!done)
+ Line 5480  while (!done)
              case PCRE_ERROR_NOMATCH:
              if (gmatched == 0)
                {
-              if (markptr == NULL) fprintf(outfile, "No match\n");
+              if (markptr == NULL)
                 else fprintf(outfile, "No match, mark = %s\n", markptr);
+                fprintf(outfile, "No match");
+              else
+                fprintf(outfile, "No match, mark = ");
+                PCHARSV(markptr, 0, -1, outfile);
+                }
+              if (verify_jit && jit_was_used) fprintf(outfile, " (JIT)");
+              putc('\n', outfile);
                }
              break;
              case PCRE_ERROR_BADUTF8:
              case PCRE_ERROR_SHORTUTF8:
-            fprintf(outfile, "Error %d (%s UTF-8 string)", count,
+            fprintf(outfile, "Error %d (%s UTF-%d string)", count,
-              (count == PCRE_ERROR_BADUTF8)? "bad" : "short");
+              (count == PCRE_ERROR_BADUTF8)? "bad" : "short",
+* CHAR_SIZE);
              if (use_size_offsets >= 2)
                fprintf(outfile, " offset=%d reason=%d", use_offsets[0],
                  use_offsets[1]);
              fprintf(outfile, "\n");
              break;
+             case PCRE_ERROR_BADUTF8_OFFSET:
+             fprintf(outfile, "Error %d (bad UTF-%d offset)\n", count,
+* CHAR_SIZE);
+             break;
              default:
-            if (count < 0 && (-count) < sizeof(errtexts)/sizeof(const char *))
+            if (count < 0 &&
+                (-count) < (int)(sizeof(errtexts)/sizeof(const char *)))
                fprintf(outfile, "Error %d (%s)\n", count, errtexts[-count]);
              else
                fprintf(outfile, "Error %d (Unexpected value)\n", count);
- Line 3082  while (!done)
+ Line 5550  while (!done)
        else
          {
-        bptr += use_offsets[1];
+        bptr += use_offsets[1] * CHAR_SIZE;
          len -= use_offsets[1];
          }
        }  /* End of loop for /g and /G */
- Line 3097  while (!done)
+ Line 5565  while (!done)
  #endif
    if (re != NULL) new_free(re);
-  if (extra != NULL) pcre_free_study(extra);
+  if (extra != NULL)
+    PCRE_FREE_STUDY(extra);
    if (locale_set)
      {
      new_free((void *)tables);
- Line 3106  while (!done)
+ Line 5577  while (!done)
      }
    if (jit_stack != NULL)
      {
-    pcre_jit_stack_free(jit_stack);
+    PCRE_JIT_STACK_FREE(jit_stack);
      jit_stack = NULL;
      }
    }
  if (infile == stdin) fprintf(outfile, "\n");
+ if (showtotaltimes)
+   {
+   fprintf(outfile, "--------------------------------------\n");
+   if (timeit > 0)
+     {
+     fprintf(outfile, "Total compile time %.4f milliseconds\n",
+       (((double)total_compile_time * 1000.0) / (double)timeit) /
+         (double)CLOCKS_PER_SEC);
+     fprintf(outfile, "Total study time   %.4f milliseconds\n",
+       (((double)total_study_time * 1000.0) / (double)timeit) /
+         (double)CLOCKS_PER_SEC);
+     }
+   fprintf(outfile, "Total execute time %.4f milliseconds\n",
+     (((double)total_match_time * 1000.0) / (double)timeitm) /
+       (double)CLOCKS_PER_SEC);
+   }
  EXIT:
  if (infile != NULL && infile != stdin) fclose(infile);
- Line 3122  free(buffer);
+ Line 5610  free(buffer);
  free(dbuffer);
  free(pbuffer);
  free(offsets);
+ #ifdef SUPPORT_PCRE16
+ if (buffer16 != NULL) free(buffer16);
+ #endif
+ #ifdef SUPPORT_PCRE32
+ if (buffer32 != NULL) free(buffer32);
+ #endif
+ #if !defined NODFA
+ if (dfa_workspace != NULL)
+   free(dfa_workspace);
+ #endif
+ #if defined(__VMS)
+   yield = SS$_NORMAL;  /* Return values via DCL symbols */
+ #endif
  return yield;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1
changed lines
	Added in v.1.1.1.5