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.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:05:51	version 1.1.1.2, 2012/02/21 23:50:25
Line 4	Line 4

/* This program was hacked up as a tester for PCRE. I really should have	/* 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	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	Redistribution and use in source and binary forms, with or without
Line 35 POSSIBILITY OF SUCH DAMAGE.	Line 36 POSSIBILITY OF SUCH DAMAGE.
-----------------------------------------------------------------------------	-----------------------------------------------------------------------------
*/	*/

	/* This program now supports the testing of both the 8-bit and 16-bit PCRE
	libraries in a single program. This is different from the modules such as
	pcre_compile.c in the library itself, which are compiled separately for each
	mode. If both modes are enabled, for example, pcre_compile.c is compiled twice
	(the second time with COMPILE_PCRE16 defined). By contrast, pcretest.c is
	compiled only once. Therefore, it must not make use of any of the macros from
	pcre_internal.h that depend on COMPILE_PCRE8 or COMPILE_PCRE16. It does,
	however, make use of SUPPORT_PCRE8 and SUPPORT_PCRE16 to ensure that it calls
	only supported library functions. */


#ifdef HAVE_CONFIG_H	#ifdef HAVE_CONFIG_H
#include "config.h"	#include "config.h"
#endif	#endif
Line 94 input mode under Windows. */	Line 105 input mode under Windows. */
#define OUTPUT_MODE "wb"	#define OUTPUT_MODE "wb"
#endif	#endif

	#define PRIV(name) name

/* We have to include pcre_internal.h because we need the internal info for	/* 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	displaying the results of pcre_study() and we also need to know about the
Line 105 here before pcre_internal.h so that the PCRE_EXP_xxx m	Line 117 here before pcre_internal.h so that the PCRE_EXP_xxx m
appropriately for an application, not for building PCRE. */	appropriately for an application, not for building PCRE. */

#include "pcre.h"	#include "pcre.h"

	#if defined SUPPORT_PCRE16 && !defined SUPPORT_PCRE8
	/* Configure internal macros to 16 bit mode. */
	#define COMPILE_PCRE16
	#endif

#include "pcre_internal.h"	#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
	8-bit or 16-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

/* We need access to some of the data tables that PCRE uses. So as not to have	/* 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 file here, changing the names of the
external symbols to prevent clashes. */	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_tables.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	/* 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	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 bit only mode. */
	#if defined SUPPORT_PCRE16 && !defined SUPPORT_PCRE8 && !defined NOPOSIX
	#define NOPOSIX
	#endif

/* It is possible to compile this test program without including support for	/* It is possible to compile this test program without including support for
testing the POSIX interface, though this is not available via the standard	testing the POSIX interface, though this is not available via the standard
Makefile. */	Makefile. */
Line 150 Makefile. */	Line 172 Makefile. */
#include "pcreposix.h"	#include "pcreposix.h"
#endif	#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
#endif	#endif

	/* To make the code a bit tidier for 8-bit and 16-bit support, we define macros
	for all the pcre[16]_xxx functions (except pcre16_fullinfo, which is called
	only from one place and is handled differently). I couldn't dream up any way of
	using a single macro to do this in a generic way, because of the many different
	argument requirements. We know that at least one of SUPPORT_PCRE8 and
	SUPPORT_PCRE16 must be set. First define macros for each individual mode; then
	use these in the definitions of generic macros.

	**** Special note about the PCHARSxxx macros: the address of the string to be
	printed is always given as two arguments: a base address followed by an offset.
	The base address is cast to the correct data size for 8 or 16 bit data; the
	offset is in units of this size. If the string were given as base+offset in one
	argument, the casting might be incorrectly applied. */

	#ifdef SUPPORT_PCRE8

	#define PCHARS8(lv, p, offset, len, f) \
	lv = pchars((pcre_uint8 *)(p) + offset, len, f)

	#define PCHARSV8(p, offset, len, f) \
	(void)pchars((pcre_uint8 *)(p) + offset, len, f)

	#define READ_CAPTURE_NAME8(p, cn8, cn16, re) \
	p = read_capture_name8(p, cn8, re)

	#define 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)

	#endif /* SUPPORT_PCRE8 */

	/* -----------------------------------------------------------*/

	#ifdef SUPPORT_PCRE16

	#define PCHARS16(lv, p, offset, len, f) \
	lv = pchars16((PCRE_SPTR16)(p) + offset, len, f)

	#define PCHARSV16(p, offset, len, f) \
	(void)pchars16((PCRE_SPTR16)(p) + offset, len, f)

	#define READ_CAPTURE_NAME16(p, cn8, cn16, re) \
	p = read_capture_name16(p, cn16, re)

	#define STRLEN16(p) ((int)strlen16((PCRE_SPTR16)p))

	#define SET_PCRE_CALLOUT16(callout) \
	pcre16_callout = (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 */


	/* ----- Both modes are supported; a runtime test is needed, except for
	pcre_config(), and the JIT stack functions, when it doesn't matter which
	version is called. ----- */

	#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16

	#define CHAR_SIZE (use_pcre16? 2:1)

	#define PCHARS(lv, p, offset, len, f) \
	if (use_pcre16) \
	PCHARS16(lv, p, offset, len, f); \
	else \
	PCHARS8(lv, p, offset, len, f)

	#define PCHARSV(p, offset, len, f) \
	if (use_pcre16) \
	PCHARSV16(p, offset, len, f); \
	else \
	PCHARSV8(p, offset, len, f)

	#define READ_CAPTURE_NAME(p, cn8, cn16, re) \
	if (use_pcre16) \
	READ_CAPTURE_NAME16(p, cn8, cn16, re); \
	else \
	READ_CAPTURE_NAME8(p, cn8, cn16, re)

	#define SET_PCRE_CALLOUT(callout) \
	if (use_pcre16) \
	SET_PCRE_CALLOUT16(callout); \
	else \
	SET_PCRE_CALLOUT8(callout)

	#define STRLEN(p) (use_pcre16? STRLEN16(p) : STRLEN8(p))

	#define PCRE_ASSIGN_JIT_STACK(extra, callback, userdata) \
	if (use_pcre16) \
	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 (use_pcre16) \
	PCRE_COMPILE16(re, pat, options, error, erroffset, tables); \
	else \
	PCRE_COMPILE8(re, pat, options, error, erroffset, tables)

	#define PCRE_CONFIG pcre_config

	#define PCRE_COPY_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
	namesptr, cbuffer, size) \
	if (use_pcre16) \
	PCRE_COPY_NAMED_SUBSTRING16(rc, re, bptr, offsets, count, \
	namesptr, cbuffer, size); \
	else \
	PCRE_COPY_NAMED_SUBSTRING8(rc, re, bptr, offsets, count, \
	namesptr, cbuffer, size)

	#define PCRE_COPY_SUBSTRING(rc, bptr, offsets, count, i, cbuffer, size) \
	if (use_pcre16) \
	PCRE_COPY_SUBSTRING16(rc, bptr, offsets, count, i, cbuffer, size); \
	else \
	PCRE_COPY_SUBSTRING8(rc, bptr, offsets, count, i, cbuffer, size)

	#define PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset, options, \
	offsets, size_offsets, workspace, size_workspace) \
	if (use_pcre16) \
	PCRE_DFA_EXEC16(count, re, extra, bptr, len, start_offset, options, \
	offsets, size_offsets, workspace, size_workspace); \
	else \
	PCRE_DFA_EXEC8(count, re, extra, bptr, len, start_offset, options, \
	offsets, size_offsets, workspace, size_workspace)

	#define PCRE_EXEC(count, re, extra, bptr, len, start_offset, options, \
	offsets, size_offsets) \
	if (use_pcre16) \
	PCRE_EXEC16(count, re, extra, bptr, len, start_offset, options, \
	offsets, size_offsets); \
	else \
	PCRE_EXEC8(count, re, extra, bptr, len, start_offset, options, \
	offsets, size_offsets)

	#define PCRE_FREE_STUDY(extra) \
	if (use_pcre16) \
	PCRE_FREE_STUDY16(extra); \
	else \
	PCRE_FREE_STUDY8(extra)

	#define PCRE_FREE_SUBSTRING(substring) \
	if (use_pcre16) \
	PCRE_FREE_SUBSTRING16(substring); \
	else \
	PCRE_FREE_SUBSTRING8(substring)

	#define PCRE_FREE_SUBSTRING_LIST(listptr) \
	if (use_pcre16) \
	PCRE_FREE_SUBSTRING_LIST16(listptr); \
	else \
	PCRE_FREE_SUBSTRING_LIST8(listptr)

	#define PCRE_GET_NAMED_SUBSTRING(rc, re, bptr, offsets, count, \
	getnamesptr, subsptr) \
	if (use_pcre16) \
	PCRE_GET_NAMED_SUBSTRING16(rc, re, bptr, offsets, count, \
	getnamesptr, subsptr); \
	else \
	PCRE_GET_NAMED_SUBSTRING8(rc, re, bptr, offsets, count, \
	getnamesptr, subsptr)

	#define PCRE_GET_STRINGNUMBER(n, rc, ptr) \
	if (use_pcre16) \
	PCRE_GET_STRINGNUMBER16(n, rc, ptr); \
	else \
	PCRE_GET_STRINGNUMBER8(n, rc, ptr)

	#define PCRE_GET_SUBSTRING(rc, bptr, use_offsets, count, i, subsptr) \
	if (use_pcre16) \
	PCRE_GET_SUBSTRING16(rc, bptr, use_offsets, count, i, subsptr); \
	else \
	PCRE_GET_SUBSTRING8(rc, bptr, use_offsets, count, i, subsptr)

	#define PCRE_GET_SUBSTRING_LIST(rc, bptr, offsets, count, listptr) \
	if (use_pcre16) \
	PCRE_GET_SUBSTRING_LIST16(rc, bptr, offsets, count, listptr); \
	else \
	PCRE_GET_SUBSTRING_LIST8(rc, bptr, offsets, count, listptr)

	#define PCRE_JIT_STACK_ALLOC(startsize, maxsize) \
	(use_pcre16 ? \
	PCRE_JIT_STACK_ALLOC16(startsize, maxsize) \
	:PCRE_JIT_STACK_ALLOC8(startsize, maxsize))

	#define PCRE_JIT_STACK_FREE(stack) \
	if (use_pcre16) \
	PCRE_JIT_STACK_FREE16(stack); \
	else \
	PCRE_JIT_STACK_FREE8(stack)

	#define PCRE_MAKETABLES \
	(use_pcre16? pcre16_maketables() : pcre_maketables())

	#define PCRE_PATTERN_TO_HOST_BYTE_ORDER(rc, re, extra, tables) \
	if (use_pcre16) \
	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 (use_pcre16) \
	PCRE_PRINTINT16(re, outfile, debug_lengths); \
	else \
	PCRE_PRINTINT8(re, outfile, debug_lengths)

	#define PCRE_STUDY(extra, re, options, error) \
	if (use_pcre16) \
	PCRE_STUDY16(extra, re, options, error); \
	else \
	PCRE_STUDY8(extra, re, options, error)

	/* ----- Only 8-bit mode is supported ----- */

	#elif defined SUPPORT_PCRE8
	#define CHAR_SIZE 1
	#define PCHARS PCHARS8
	#define PCHARSV PCHARSV8
	#define READ_CAPTURE_NAME READ_CAPTURE_NAME8
	#define SET_PCRE_CALLOUT SET_PCRE_CALLOUT8
	#define STRLEN STRLEN8
	#define PCRE_ASSIGN_JIT_STACK PCRE_ASSIGN_JIT_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 ----- */

	#else
	#define CHAR_SIZE 2
	#define PCHARS PCHARS16
	#define PCHARSV PCHARSV16
	#define READ_CAPTURE_NAME READ_CAPTURE_NAME16
	#define SET_PCRE_CALLOUT SET_PCRE_CALLOUT16
	#define STRLEN STRLEN16
	#define PCRE_ASSIGN_JIT_STACK 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
	#endif

	/* ----- End of mode-specific function call macros ----- */


/* Other parameters */	/* Other parameters */

#ifndef CLOCKS_PER_SEC	#ifndef CLOCKS_PER_SEC
Line 189 static int debug_lengths;	Line 615 static int debug_lengths;
static int first_callout;	static int first_callout;
static int locale_set = 0;	static int locale_set = 0;
static int show_malloc;	static int show_malloc;
static int use_utf8;	static int use_utf;
static size_t gotten_store;	static size_t gotten_store;
static size_t first_gotten_store = 0;	static size_t first_gotten_store = 0;
static const unsigned char *last_callout_mark = NULL;	static const unsigned char *last_callout_mark = NULL;
Line 197 static const unsigned char *last_callout_mark = NULL;	Line 623 static const unsigned char *last_callout_mark = NULL;
/* The buffers grow automatically if very long input lines are encountered. */	/* The buffers grow automatically if very long input lines are encountered. */

static int buffer_size = 50000;	static int buffer_size = 50000;
static uschar *buffer = NULL;	static pcre_uint8 *buffer = NULL;
static uschar *dbuffer = NULL;	static pcre_uint8 *dbuffer = NULL;
static uschar *pbuffer = NULL;	static pcre_uint8 *pbuffer = NULL;

	/* Another buffer is needed translation to 16-bit character strings. It will
	obtained and extended as required. */

	#ifdef SUPPORT_PCRE16
	static int buffer16_size = 0;
	static pcre_uint16 *buffer16 = NULL;

	#ifdef SUPPORT_PCRE8

	/* We need the table of operator lengths that is used for 16-bit compiling, in
	order to swap bytes in a pattern for saving/reloading testing. Luckily, the
	data is defined as a macro. However, we must ensure that LINK_SIZE is adjusted
	appropriately for the 16-bit world. Just as a safety check, make sure that
	COMPILE_PCRE16 is not set. */

	#ifdef COMPILE_PCRE16
	#error COMPILE_PCRE16 must not be set when compiling pcretest.c
	#endif

	#if LINK_SIZE == 2
	#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

	#undef IMM2_SIZE
	#define IMM2_SIZE 1

	#endif /* SUPPORT_PCRE8 */

	static const pcre_uint16 OP_lengths16[] = { OP_LENGTHS };
	#endif /* SUPPORT_PCRE16 */

	/* If we have 8-bit support, default use_pcre16 to false; if there is also
	16-bit support, it can be changed by an option. If there is no 8-bit support,
	there must be 16-bit support, so default it to 1. */

	#ifdef SUPPORT_PCRE8
	static int use_pcre16 = 0;
	#else
	static int use_pcre16 = 1;
	#endif

/* Textual explanations for runtime error codes */	/* Textual explanations for runtime error codes */

static const char *errtexts[] = {	static const char *errtexts[] = {
Line 214 static const char *errtexts[] = {	Line 687 static const char *errtexts[] = {
NULL, /* never returned by pcre_exec() or pcre_dfa_exec() */	NULL, /* never returned by pcre_exec() or pcre_dfa_exec() */
"match limit exceeded",	"match limit exceeded",
"callout error code",	"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 */	NULL, /* PARTIAL is handled specially */
"not used - internal error",	"not used - internal error",
"internal error - pattern overwritten?",	"internal error - pattern overwritten?",
Line 229 static const char *errtexts[] = {	Line 702 static const char *errtexts[] = {
"not used - internal error",	"not used - internal error",
"invalid combination of newline options",	"invalid combination of newline options",
"bad offset value",	"bad offset value",
NULL, /* SHORTUTF8 is handled specially */	NULL, /* SHORTUTF8/16 is handled specially */
"nested recursion at the same subject position",	"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"
};	};


Line 247 the L (locale) option also adjusts the tables. */	Line 721 the L (locale) option also adjusts the tables. */
/* This is the set of tables distributed as default with PCRE. It recognizes	/* This is the set of tables distributed as default with PCRE. It recognizes
only ASCII characters. */	only ASCII characters. */

static const unsigned char tables0[] = {	static const pcre_uint8 tables0[] = {

/* This table is a lower casing table. */	/* This table is a lower casing table. */

Line 420 graph, print, punct, and cntrl. Other classes are buil	Line 894 graph, print, punct, and cntrl. Other classes are buil
be at least an approximation of ISO 8859. In particular, there are characters	be at least an approximation of ISO 8859. In particular, there are characters
greater than 128 that are marked as spaces, letters, etc. */	greater than 128 that are marked as spaces, letters, etc. */

static const unsigned char tables1[] = {	static const pcre_uint8 tables1[] = {
0,1,2,3,4,5,6,7,	0,1,2,3,4,5,6,7,
8,9,10,11,12,13,14,15,	8,9,10,11,12,13,14,15,
16,17,18,19,20,21,22,23,	16,17,18,19,20,21,22,23,
Line 593 return (pcre_jit_stack *)arg;	Line 1067 return (pcre_jit_stack *)arg;
}	}


	#if !defined NOUTF \|\| defined SUPPORT_PCRE16
/*************************************************	/*************************************************
	* 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, int vptr)
	{
	int c = *utf8bytes++;
	int 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 <= utf8_table1[j]) break;
	if (j != i) return -(i+1);

	/* Valid value */

	*vptr = d;
	return i+1;
	}
	#endif /* NOUTF \|\| SUPPORT_PCRE16 */



	#if !defined NOUTF \|\| defined SUPPORT_PCRE16
	/*************************************************
	* 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(int cvalue, pcre_uint8 *utf8bytes)
	{
	register int i, j;
	for (i = 0; i < utf8_table1_size; i++)
	if (cvalue <= 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
	8-bit size. For a UTF-8 string, the size needed for UTF-16 is no more than
	double, because up to 0xffff uses no more than 3 bytes in UTF-8 but possibly 4
	in UTF-16. Higher values use 4 bytes in UTF-8 and up to 4 bytes in UTF-16. The
	result is always left in buffer16.

	Note that this function does not object to surrogate values. This is
	deliberate; it makes it possible to construct UTF-16 strings that are invalid,
	for the purpose of testing that they are correctly faulted.

	Patterns to be converted are either plain ASCII or UTF-8; data lines are always
	in UTF-8 so that values greater than 255 can be handled.

	Arguments:
	data TRUE if converting a data line; FALSE for a regex
	p points to a byte string
	utf true if UTF-8 (to be converted to UTF-16)
	len number of bytes in the string (excluding trailing zero)

	Returns: number of 16-bit data items used (excluding trailing zero)
	OR -1 if a UTF-8 string is malformed
	OR -2 if a value > 0x10ffff is encountered
	OR -3 if a value > 0xffff is encountered when not in UTF mode
	*/

	static int
	to16(int data, pcre_uint8 *p, int utf, int len)
	{
	pcre_uint16 *pp;

	if (buffer16_size < 2*len + 2)
	{
	if (buffer16 != NULL) free(buffer16);
	buffer16_size = 2*len + 2;
	buffer16 = (pcre_uint16 *)malloc(buffer16_size);
	if (buffer16 == NULL)
	{
	fprintf(stderr, "pcretest: malloc(%d) failed for buffer16\n", buffer16_size);
	exit(1);
	}
	}

	pp = buffer16;

	if (!utf && !data)
	{
	while (len-- > 0) pp++ = p++;
	}

	else
	{
	int c = 0;
	while (len > 0)
	{
	int chlen = utf82ord(p, &c);
	if (chlen <= 0) return -1;
	if (c > 0x10ffff) return -2;
	p += chlen;
	len -= chlen;
	if (c < 0x10000) *pp++ = c; else
	{
	if (!utf) return -3;
	c -= 0x10000;
	*pp++ = 0xD800 \| (c >> 10);
	*pp++ = 0xDC00 \| (c & 0x3ff);
	}
	}
	}

	*pp = 0;
	return pp - buffer16;
	}
	#endif


	/*************************************************
* Read or extend an input line *	* Read or extend an input line *
*************************************************/	*************************************************/

Line 616 Returns: pointer to the start of new data	Line 1263 Returns: pointer to the start of new data
NULL if no data read and EOF reached	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 (;;)	for (;;)
{	{
int rlen = (int)(buffer_size - (here - buffer));	size_t rlen = (size_t)(buffer_size - (here - buffer));

if (rlen > 1000)	if (rlen > 1000)
{	{
Line 666 for (;;)	Line 1313 for (;;)
else	else
{	{
int new_buffer_size = 2*buffer_size;	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_dbuffer = (pcre_uint8 )malloc(new_buffer_size);
uschar new_pbuffer = (unsigned char )malloc(new_buffer_size);	pcre_uint8 new_pbuffer = (pcre_uint8 )malloc(new_buffer_size);

if (new_buffer == NULL \|\| new_dbuffer == NULL \|\| new_pbuffer == NULL)	if (new_buffer == NULL \|\| new_dbuffer == NULL \|\| new_pbuffer == NULL)
{	{
Line 699 return NULL; /* Control never gets here */	Line 1346 return NULL; /* Control never gets here */







/*************************************************	/*************************************************
* Read number from string *	* Read number from string *
*************************************************/	*************************************************/
Line 719 Returns: the unsigned long	Line 1362 Returns: the unsigned long
*/	*/

static int	static int
get_value(unsigned char str, unsigned char *endptr)	get_value(pcre_uint8 str, pcre_uint8 *endptr)
{	{
int result = 0;	int result = 0;
while(str != 0 && isspace(str)) str++;	while(str != 0 && isspace(str)) str++;
Line 730 return(result);	Line 1373 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(int 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++;	if (PRINTOK(c))
int d = 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) fprintf(f, "\\x{%02x}", c);
if (i == 0 \|\| i == 6) return 0; /* invalid UTF-8 */	return (c <= 0x000000ff)? 6 :
	(c <= 0x00000fff)? 7 :
	(c <= 0x0000ffff)? 8 :
	(c <= 0x000fffff)? 9 : 10;
	}

/* 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);	int 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	#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.

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

static int
ord2utf8(int cvalue, uschar *utf8bytes)
{	{
register int i, j;	int len = 0;
for (i = 0; i < utf8_table1_size; i++)	while (*p++ != 0) len++;
if (cvalue <= utf8_table1[i]) break;	return len;
utf8bytes += i;
for (j = i; j > 0; j--)
{
*utf8bytes-- = 0x80 \| (cvalue & 0x3f);
cvalue >>= 6;
}
*utf8bytes = utf8_table2[i] \| cvalue;
return i + 1;
}	}
	#endif /* SUPPORT_PCRE16 */

#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;	int yield = 0;

	if (length < 0)
	length = strlen16(p);

while (length-- > 0)	while (length-- > 0)
{	{
#if !defined NOUTF8	int 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	#endif
	yield += pchar(c, f);
	}

/* Not UTF-8, or malformed UTF-8 */	return yield;
	}
	#endif /* SUPPORT_PCRE16 */

c = *p++;
if (PRINTHEX(c))
{	#ifdef SUPPORT_PCRE8
if (f != NULL) fprintf(f, "%c", c);	/*************************************************
yield++;	* Read a capture name (8-bit) and check it *
}	*************************************************/
else
{	static pcre_uint8 *
if (f != NULL) fprintf(f, "\\x%02x", c);	read_capture_name8(pcre_uint8 p, pcre_uint8 pp, pcre re)
yield += 4;	{
}	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");
}	}

return yield;	*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 */



	/*************************************************
* Callout function *	* Callout function *
*************************************************/	*************************************************/

Line 917 if (callout_extra)	Line 1582 if (callout_extra)
else	else
{	{
fprintf(f, "%2d: ", i/2);	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);	cb->offset_vector[i+1] - cb->offset_vector[i], f);
fprintf(f, "\n");	fprintf(f, "\n");
}	}
Line 930 printed lengths of the substrings. */	Line 1595 printed lengths of the substrings. */

if (f != NULL) fprintf(f, "--->");	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);	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);	cb->subject_length - cb->current_position, f);

if (f != NULL) fprintf(f, "\n");	if (f != NULL) fprintf(f, "\n");
Line 975 first_callout = 0;	Line 1640 first_callout = 0;

if (cb->mark != last_callout_mark)	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;	last_callout_mark = cb->mark;
}	}

Line 1042 free(block);	Line 1713 free(block);
* Call pcre_fullinfo() *	* Call pcre_fullinfo() *
*************************************************/	*************************************************/

/* Get one piece of information from the pcre_fullinfo() function */	/* Get one piece of information from the pcre_fullinfo() function. When only
	one of 8-bit or 16-bit is supported, use_pcre16 should always have the correct
	value, but the code is defensive.

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;	int rc;
if ((rc = pcre_fullinfo(re, study, option, ptr)) < 0)
fprintf(outfile, "Error %d from pcre_fullinfo(%d)\n", rc, option);	if (use_pcre16)
	#ifdef SUPPORT_PCRE16
	rc = pcre16_fullinfo((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)
	{
	fprintf(outfile, "Error %d from pcre%s_fullinfo(%d)\n", rc,
	use_pcre16? "16" : "", option);
	if (rc == PCRE_ERROR_BADMODE)
	fprintf(outfile, "Running in %s-bit mode but pattern was compiled in "
	"%s-bit mode\n", use_pcre16? "16":"8", use_pcre16? "8":"16");
	}

	return rc;
}	}



/*************************************************	/*************************************************
* Byte flipping function *	* Swap byte functions *
*************************************************/	*************************************************/

static unsigned long int	/* The following functions swap the bytes of a pcre_uint16 and pcre_uint32
byteflip(unsigned long int value, int n)	value, respectively.

	Arguments:
	value any number

	Returns: the byte swapped value
	*/

	static pcre_uint32
	swap_uint32(pcre_uint32 value)
{	{
if (n == 2) return ((value & 0x00ff) << 8) \| ((value & 0xff00) >> 8);
return ((value & 0x000000ff) << 24) \|	return ((value & 0x000000ff) << 24) \|
((value & 0x0000ff00) << 8) \|	((value & 0x0000ff00) << 8) \|
((value & 0x00ff0000) >> 8) \|	((value & 0x00ff0000) >> 8) \|
((value & 0xff000000) >> 24);	(value >> 24);
}	}

	static pcre_uint16
	swap_uint16(pcre_uint16 value)
	{
	return (value >> 8) \| (value << 8);
	}



/*************************************************	/*************************************************
	* Flip bytes in a compiled pattern *
	*************************************************/

	/* This function is called if the 'F' option was present on a pattern that is
	to be written to a file. We flip the bytes of all the integer fields in the
	regex data block and the study block. In 16-bit mode this also flips relevant
	bytes in the pattern itself. This is to make it possible to test PCRE's
	ability to reload byte-flipped patterns, e.g. those compiled on a different
	architecture. */

	static void
	regexflip(pcre ere, pcre_extra extra)
	{
	REAL_PCRE re = (REAL_PCRE )ere;
	#ifdef SUPPORT_PCRE16
	int op;
	pcre_uint16 ptr = (pcre_uint16 )re + re->name_table_offset;
	int length = re->name_count * re->name_entry_size;
	#ifdef SUPPORT_UTF
	BOOL utf = (re->options & PCRE_UTF16) != 0;
	BOOL utf16_char = FALSE;
	#endif /* SUPPORT_UTF */
	#endif /* SUPPORT_PCRE16 */

	/* Always flip the bytes in the main data block and study blocks. */

	re->magic_number = REVERSED_MAGIC_NUMBER;
	re->size = swap_uint32(re->size);
	re->options = swap_uint32(re->options);
	re->flags = swap_uint16(re->flags);
	re->top_bracket = swap_uint16(re->top_bracket);
	re->top_backref = swap_uint16(re->top_backref);
	re->first_char = swap_uint16(re->first_char);
	re->req_char = swap_uint16(re->req_char);
	re->name_table_offset = swap_uint16(re->name_table_offset);
	re->name_entry_size = swap_uint16(re->name_entry_size);
	re->name_count = swap_uint16(re->name_count);

	if (extra != NULL)
	{
	pcre_study_data rsd = (pcre_study_data )(extra->study_data);
	rsd->size = swap_uint32(rsd->size);
	rsd->flags = swap_uint32(rsd->flags);
	rsd->minlength = swap_uint32(rsd->minlength);
	}

	/* In 8-bit mode, that is all we need to do. In 16-bit mode we must swap bytes
	in the name table, if present, and then in the pattern itself. */

	#ifdef SUPPORT_PCRE16
	if (!use_pcre16) return;

	while(TRUE)
	{
	/* Swap previous characters. */
	while (length-- > 0)
	{
	ptr = swap_uint16(ptr);
	ptr++;
	}
	#ifdef SUPPORT_UTF
	if (utf16_char)
	{
	if ((ptr[-1] & 0xfc00) == 0xd800)
	{
	/* We know that there is only one extra character in UTF-16. */
	ptr = swap_uint16(ptr);
	ptr++;
	}
	}
	utf16_char = FALSE;
	#endif /* SUPPORT_UTF */

	/* Get next opcode. */

	length = 0;
	op = *ptr;
	*ptr++ = swap_uint16(op);

	switch (op)
	{
	case OP_END:
	return;

	#ifdef SUPPORT_UTF
	case OP_CHAR:
	case OP_CHARI:
	case OP_NOT:
	case OP_NOTI:
	case OP_STAR:
	case OP_MINSTAR:
	case OP_PLUS:
	case OP_MINPLUS:
	case OP_QUERY:
	case OP_MINQUERY:
	case OP_UPTO:
	case OP_MINUPTO:
	case OP_EXACT:
	case OP_POSSTAR:
	case OP_POSPLUS:
	case OP_POSQUERY:
	case OP_POSUPTO:
	case OP_STARI:
	case OP_MINSTARI:
	case OP_PLUSI:
	case OP_MINPLUSI:
	case OP_QUERYI:
	case OP_MINQUERYI:
	case OP_UPTOI:
	case OP_MINUPTOI:
	case OP_EXACTI:
	case OP_POSSTARI:
	case OP_POSPLUSI:
	case OP_POSQUERYI:
	case OP_POSUPTOI:
	case OP_NOTSTAR:
	case OP_NOTMINSTAR:
	case OP_NOTPLUS:
	case OP_NOTMINPLUS:
	case OP_NOTQUERY:
	case OP_NOTMINQUERY:
	case OP_NOTUPTO:
	case OP_NOTMINUPTO:
	case OP_NOTEXACT:
	case OP_NOTPOSSTAR:
	case OP_NOTPOSPLUS:
	case OP_NOTPOSQUERY:
	case OP_NOTPOSUPTO:
	case OP_NOTSTARI:
	case OP_NOTMINSTARI:
	case OP_NOTPLUSI:
	case OP_NOTMINPLUSI:
	case OP_NOTQUERYI:
	case OP_NOTMINQUERYI:
	case OP_NOTUPTOI:
	case OP_NOTMINUPTOI:
	case OP_NOTEXACTI:
	case OP_NOTPOSSTARI:
	case OP_NOTPOSPLUSI:
	case OP_NOTPOSQUERYI:
	case OP_NOTPOSUPTOI:
	if (utf) utf16_char = TRUE;
	#endif
	/* Fall through. */

	default:
	length = OP_lengths16[op] - 1;
	break;

	case OP_CLASS:
	case OP_NCLASS:
	/* Skip the character bit map. */
	ptr += 32/sizeof(pcre_uint16);
	length = 0;
	break;

	case OP_XCLASS:
	/* 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 */
	}



	/*************************************************
* Check match or recursion limit *	* Check match or recursion limit *
*************************************************/	*************************************************/

static int	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 start_offset, int options, int *use_offsets, int use_size_offsets,
int flag, unsigned long int limit, int errnumber, const char msg)	int flag, unsigned long int limit, int errnumber, const char msg)
{	{
Line 1090 for (;;)	Line 2000 for (;;)
{	{
*limit = mid;	*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);	use_offsets, use_size_offsets);

if (count == errnumber)	if (count == errnumber)
Line 1135 Returns: < 0, = 0, or > 0, according to the compari	Line 2045 Returns: < 0, = 0, or > 0, according to the compari
*/	*/

static int	static int
strncmpic(uschar s, uschar t, int n)	strncmpic(pcre_uint8 s, pcre_uint8 t, int n)
{	{
while (n--)	while (n--)
{	{
Line 1162 Returns: appropriate PCRE_NEWLINE_xxx flags, or 0	Line 2072 Returns: appropriate PCRE_NEWLINE_xxx flags, or 0
*/	*/

static int	static int
check_newline(uschar p, FILE f)	check_newline(pcre_uint8 p, FILE f)
{	{
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);	fprintf(f, "Unknown newline type at: <%s\n", p);
return 0;	return 0;
}	}
Line 1192 printf("If input is a terminal, readline() is used to	Line 2102 printf("If input is a terminal, readline() is used to
printf("This version of pcretest is not linked with readline().\n");	printf("This version of pcretest is not linked with readline().\n");
#endif	#endif
printf("\nOptions:\n");	printf("\nOptions:\n");
printf(" -b show compiled code (bytecode)\n");	#ifdef SUPPORT_PCRE16
	printf(" -16 use the 16-bit library\n");
	#endif
	printf(" -b show compiled code\n");
printf(" -C show PCRE compile-time options and exit\n");	printf(" -C show PCRE compile-time options and exit\n");
	printf(" -C arg show a specific compile-time option\n");
	printf(" and exit with its value. The arg can be:\n");
	printf(" linksize internal link size [2, 3, 4]\n");
	printf(" pcre8 8 bit library support enabled [0, 1]\n");
	printf(" pcre16 16 bit library support enabled [0, 1]\n");
	printf(" utf Unicode Transformation Format supported [0, 1]\n");
	printf(" ucp Unicode Properties supported [0, 1]\n");
	printf(" jit Just-in-time compiler supported [0, 1]\n");
	printf(" newline Newline type [CR, LF, CRLF, ANYCRLF, ANY, ???]\n");
printf(" -d debug: show compiled code and information (-b and -i)\n");	printf(" -d debug: show compiled code and information (-b and -i)\n");
#if !defined NODFA	#if !defined NODFA
printf(" -dfa force DFA matching for all subjects\n");	printf(" -dfa force DFA matching for all subjects\n");
Line 1229 options, followed by a set of test data, terminated by	Line 2151 options, followed by a set of test data, terminated by
int main(int argc, char **argv)	int main(int argc, char **argv)
{	{
FILE *infile = stdin;	FILE *infile = stdin;
	const char *version;
int options = 0;	int options = 0;
int study_options = 0;	int study_options = 0;
int default_find_match_limit = FALSE;	int default_find_match_limit = FALSE;
Line 1254 int stack_size;	Line 2177 int stack_size;

pcre_jit_stack *jit_stack = NULL;	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-bit and 16-bit versions, using the 16-bit version
	for the actual memory, to ensure alignment. */

/* These vectors store, end-to-end, a list of captured substring names. Assume	pcre_uint16 copynames[1024];
that 1024 is plenty long enough for the few names we'll be testing. */	pcre_uint16 getnames[1024];

uschar copynames[1024];	#ifdef SUPPORT_PCRE16
uschar getnames[1024];	pcre_uint16 *cn16ptr;
	pcre_uint16 *gn16ptr;
	#endif

uschar *copynamesptr;	#ifdef SUPPORT_PCRE8
uschar *getnamesptr;	pcre_uint8 copynames8 = (pcre_uint8 )copynames;
	pcre_uint8 getnames8 = (pcre_uint8 )getnames;
	pcre_uint8 *cn8ptr;
	pcre_uint8 *gn8ptr;
	#endif

/* Get buffers from malloc() so that Electric Fence will check their misuse	/* Get buffers from malloc() so that valgrind will check their misuse when
when I am debugging. They grow automatically when very long lines are read. */	debugging. They grow automatically when very long lines are read. The 16-bit
	buffer (buffer16) is obtained only if needed. */

buffer = (unsigned char *)malloc(buffer_size);	buffer = (pcre_uint8 *)malloc(buffer_size);
dbuffer = (unsigned char *)malloc(buffer_size);	dbuffer = (pcre_uint8 *)malloc(buffer_size);
pbuffer = (unsigned char *)malloc(buffer_size);	pbuffer = (pcre_uint8 *)malloc(buffer_size);

/* The outfile variable is static so that new_malloc can use it. */	/* The outfile variable is static so that new_malloc can use it. */

Line 1284 it set 0x8000, but then I was advised that _O_BINARY w	Line 2219 it set 0x8000, but then I was advised that _O_BINARY w
_setmode( _fileno( stdout ), _O_BINARY );	_setmode( _fileno( stdout ), _O_BINARY );
#endif	#endif

	/* Get the version number: both pcre_version() and pcre16_version() give the
	same answer. We just need to ensure that we call one that is available. */

	#ifdef SUPPORT_PCRE8
	version = pcre_version();
	#else
	version = pcre16_version();
	#endif

/* Scan options */	/* Scan options */

while (argc > 1 && argv[op][0] == '-')	while (argc > 1 && argv[op][0] == '-')
{	{
unsigned char *endptr;	pcre_uint8 *endptr;

if (strcmp(argv[op], "-m") == 0) showstore = 1;	if (strcmp(argv[op], "-m") == 0) showstore = 1;
else if (strcmp(argv[op], "-s") == 0) force_study = 0;	else if (strcmp(argv[op], "-s") == 0) force_study = 0;
Line 1297 while (argc > 1 && argv[op][0] == '-')	Line 2241 while (argc > 1 && argv[op][0] == '-')
force_study = 1;	force_study = 1;
force_study_options = PCRE_STUDY_JIT_COMPILE;	force_study_options = PCRE_STUDY_JIT_COMPILE;
}	}
	else if (strcmp(argv[op], "-16") == 0)
	{
	#ifdef SUPPORT_PCRE16
	use_pcre16 = 1;
	#else
	printf("** This version of PCRE was built without 16-bit support\n");
	exit(1);
	#endif
	}
else if (strcmp(argv[op], "-q") == 0) quiet = 1;	else if (strcmp(argv[op], "-q") == 0) quiet = 1;
else if (strcmp(argv[op], "-b") == 0) debug = 1;	else if (strcmp(argv[op], "-b") == 0) debug = 1;
else if (strcmp(argv[op], "-i") == 0) showinfo = 1;	else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
Line 1306 while (argc > 1 && argv[op][0] == '-')	Line 2259 while (argc > 1 && argv[op][0] == '-')
else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;	else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
#endif	#endif
else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&	else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&
((size_offsets = get_value((unsigned char *)argv[op+1], &endptr)),	((size_offsets = get_value((pcre_uint8 *)argv[op+1], &endptr)),
*endptr == 0))	*endptr == 0))
{	{
op++;	op++;
Line 1316 while (argc > 1 && argv[op][0] == '-')	Line 2269 while (argc > 1 && argv[op][0] == '-')
{	{
int both = argv[op][2] == 0;	int both = argv[op][2] == 0;
int temp;	int temp;
if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),	if (argc > 2 && (temp = get_value((pcre_uint8 *)argv[op+1], &endptr),
*endptr == 0))	*endptr == 0))
{	{
timeitm = temp;	timeitm = temp;
Line 1327 while (argc > 1 && argv[op][0] == '-')	Line 2280 while (argc > 1 && argv[op][0] == '-')
if (both) timeit = timeitm;	if (both) timeit = timeitm;
}	}
else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&	else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),	((stack_size = get_value((pcre_uint8 *)argv[op+1], &endptr)),
*endptr == 0))	*endptr == 0))
{	{
#if defined(_WIN32) \|\| defined(WIN32) \|\| defined(__minix)	#if defined(_WIN32) \|\| defined(WIN32) \|\| defined(__minix)
Line 1355 while (argc > 1 && argv[op][0] == '-')	Line 2308 while (argc > 1 && argv[op][0] == '-')
{	{
int rc;	int rc;
unsigned long int lrc;	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;
	goto EXIT;
	}
	if (strcmp(argv[op + 1], "pcre8") == 0)
	{
	#ifdef SUPPORT_PCRE8
	printf("1\n");
	yield = 1;
	#else
	printf("0\n");
	yield = 0;
	#endif
	goto EXIT;
	}
	if (strcmp(argv[op + 1], "pcre16") == 0)
	{
	#ifdef SUPPORT_PCRE16
	printf("1\n");
	yield = 1;
	#else
	printf("0\n");
	yield = 0;
	#endif
	goto EXIT;
	}
	if (strcmp(argv[op + 1], "utf") == 0)
	{
	#ifdef SUPPORT_PCRE8
	(void)pcre_config(PCRE_CONFIG_UTF8, &rc);
	printf("%d\n", rc);
	yield = rc;
	#else
	(void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
	printf("%d\n", rc);
	yield = rc;
	#endif
	goto EXIT;
	}
	if (strcmp(argv[op + 1], "ucp") == 0)
	{
	(void)PCRE_CONFIG(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
	printf("%d\n", rc);
	yield = rc;
	goto EXIT;
	}
	if (strcmp(argv[op + 1], "jit") == 0)
	{
	(void)PCRE_CONFIG(PCRE_CONFIG_JIT, &rc);
	printf("%d\n", rc);
	yield = rc;
	goto EXIT;
	}
	if (strcmp(argv[op + 1], "newline") == 0)
	{
	(void)PCRE_CONFIG(PCRE_CONFIG_NEWLINE, &rc);
	/* Note that these values are always the ASCII values, even
	in EBCDIC environments. CR is 13 and NL is 10. */
	printf("%s\n", (rc == 13)? "CR" :
	(rc == 10)? "LF" : (rc == (13<<8 \| 10))? "CRLF" :
	(rc == -2)? "ANYCRLF" :
	(rc == -1)? "ANY" : "???");
	goto EXIT;
	}
	printf("Unknown -C option: %s\n", argv[op + 1]);
	goto EXIT;
	}

	printf("PCRE version %s\n", version);
printf("Compiled with\n");	printf("Compiled with\n");

	/* At least one of SUPPORT_PCRE8 and SUPPORT_PCRE16 will be set. If both
	are set, either both UTFs are supported or both are not supported. */

	#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
	printf(" 8-bit and 16-bit support\n");
(void)pcre_config(PCRE_CONFIG_UTF8, &rc);	(void)pcre_config(PCRE_CONFIG_UTF8, &rc);
	if (rc)
	printf(" UTF-8 and UTF-16 support\n");
	else
	printf(" No UTF-8 or UTF-16 support\n");
	#elif defined SUPPORT_PCRE8
	printf(" 8-bit support only\n");
	(void)pcre_config(PCRE_CONFIG_UTF8, &rc);
printf(" %sUTF-8 support\n", rc? "" : "No ");	printf(" %sUTF-8 support\n", rc? "" : "No ");
(void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);	#else
	printf(" 16-bit support only\n");
	(void)pcre16_config(PCRE_CONFIG_UTF16, &rc);
	printf(" %sUTF-16 support\n", rc? "" : "No ");
	#endif

	(void)PCRE_CONFIG(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
printf(" %sUnicode properties support\n", rc? "" : "No ");	printf(" %sUnicode properties support\n", rc? "" : "No ");
(void)pcre_config(PCRE_CONFIG_JIT, &rc);	(void)PCRE_CONFIG(PCRE_CONFIG_JIT, &rc);
if (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	else
printf(" No just-in-time compiler support\n");	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	/* Note that these values are always the ASCII values, even
in EBCDIC environments. CR is 13 and NL is 10. */	in EBCDIC environments. CR is 13 and NL is 10. */
printf(" Newline sequence is %s\n", (rc == 13)? "CR" :	printf(" Newline sequence is %s\n", (rc == 13)? "CR" :
(rc == 10)? "LF" : (rc == (13<<8 \| 10))? "CRLF" :	(rc == 10)? "LF" : (rc == (13<<8 \| 10))? "CRLF" :
(rc == -2)? "ANYCRLF" :	(rc == -2)? "ANYCRLF" :
(rc == -1)? "ANY" : "???");	(rc == -1)? "ANY" : "???");
(void)pcre_config(PCRE_CONFIG_BSR, &rc);	(void)PCRE_CONFIG(PCRE_CONFIG_BSR, &rc);
printf(" \\R matches %s\n", rc? "CR, LF, or CRLF only" :	printf(" \\R matches %s\n", rc? "CR, LF, or CRLF only" :
"all Unicode newlines");	"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);	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);	printf(" POSIX malloc threshold = %d\n", rc);
(void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &lrc);	(void)PCRE_CONFIG(PCRE_CONFIG_MATCH_LIMIT, &lrc);
printf(" Default match limit = %ld\n", 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);	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;	goto EXIT;
}	}
else if (strcmp(argv[op], "-help") == 0 \|\|	else if (strcmp(argv[op], "-help") == 0 \|\|
Line 1443 if (argc > 2)	Line 2499 if (argc > 2)

/* Set alternative malloc function */	/* Set alternative malloc function */

	#ifdef SUPPORT_PCRE8
pcre_malloc = new_malloc;	pcre_malloc = new_malloc;
pcre_free = new_free;	pcre_free = new_free;
pcre_stack_malloc = stack_malloc;	pcre_stack_malloc = stack_malloc;
pcre_stack_free = stack_free;	pcre_stack_free = stack_free;
	#endif

	#ifdef SUPPORT_PCRE16
	pcre16_malloc = new_malloc;
	pcre16_free = new_free;
	pcre16_stack_malloc = stack_malloc;
	pcre16_stack_free = stack_free;
	#endif

/* Heading line unless quiet, then prompt for first regex if stdin */	/* Heading line unless quiet, then prompt for first regex if stdin */

if (!quiet) fprintf(outfile, "PCRE version %s\n\n", pcre_version());	if (!quiet) fprintf(outfile, "PCRE version %s\n\n", version);

/* Main loop */	/* Main loop */

Line 1465 while (!done)	Line 2530 while (!done)
#endif	#endif

const char *error;	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;	unsigned long int true_size, true_study_size = 0;
size_t size, regex_gotten_store;	size_t size, regex_gotten_store;
int do_allcaps = 0;	int do_allcaps = 0;
Line 1484 while (!done)	Line 2550 while (!done)
int do_flip = 0;	int do_flip = 0;
int erroroffset, len, delimiter, poffset;	int erroroffset, len, delimiter, poffset;

use_utf8 = 0;	use_utf = 0;
debug_lengths = 1;	debug_lengths = 1;

if (extend_inputline(infile, buffer, " re> ") == NULL) break;	if (extend_inputline(infile, buffer, " re> ") == NULL) break;
Line 1499 while (!done)	Line 2565 while (!done)

if (p == '<' && strchr((char )(p+1), '<') == NULL)	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;	FILE *f;

p++;	p++;
	if (*p == '!')
	{
	do_debug = TRUE;
	do_showinfo = TRUE;
	p++;
	}

pp = p + (int)strlen((char *)p);	pp = p + (int)strlen((char *)p);
while (isspace(pp[-1])) pp--;	while (isspace(pp[-1])) pp--;
*pp = 0;	*pp = 0;
Line 1515 while (!done)	Line 2588 while (!done)
continue;	continue;
}	}

	first_gotten_store = 0;
if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ;	if (fread(sbuf, 1, 8, f) != 8) goto FAIL_READ;

true_size =	true_size =
Line 1522 while (!done)	Line 2596 while (!done)
true_study_size =	true_study_size =
(sbuf[4] << 24) \| (sbuf[5] << 16) \| (sbuf[6] << 8) \| sbuf[7];	(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;	regex_gotten_store = first_gotten_store;

if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;	if (fread(re, 1, true_size, f) != true_size) goto FAIL_READ;

magic = ((real_pcre *)re)->magic_number;	magic = ((REAL_PCRE *)re)->magic_number;
if (magic != MAGIC_NUMBER)	if (magic != MAGIC_NUMBER)
{	{
if (byteflip(magic, sizeof(magic)) == MAGIC_NUMBER)	if (swap_uint32(magic) == MAGIC_NUMBER)
{	{
do_flip = 1;	do_flip = 1;
}	}
Line 1542 while (!done)	Line 2616 while (!done)
}	}
}	}

	/* We hide the byte-invert info for little and big endian tests. */
fprintf(outfile, "Compiled pattern%s loaded from %s\n",	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. */	/* Now see if there is any following study data. */

if (true_study_size != 0)	if (true_study_size != 0)
Line 1566 while (!done)	Line 2636 while (!done)
{	{
FAIL_READ:	FAIL_READ:
fprintf(outfile, "Failed to read data from %s\n", p);	fprintf(outfile, "Failed to read data from %s\n", p);
if (extra != NULL) pcre_free_study(extra);	if (extra != NULL)
	{
	PCRE_FREE_STUDY(extra);
	}
if (re != NULL) new_free(re);	if (re != NULL) new_free(re);
fclose(f);	fclose(f);
continue;	continue;
Line 1576 while (!done)	Line 2649 while (!done)
}	}
else fprintf(outfile, "No study data\n");	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)
	{
	/* Simulate the result of the function call below. */
	fprintf(outfile, "Error %d from pcre%s_fullinfo(%d)\n", rc,
	use_pcre16? "16" : "", PCRE_INFO_OPTIONS);
	fprintf(outfile, "Running in %s-bit mode but pattern was compiled in "
	"%s-bit mode\n", use_pcre16? "16":"8", use_pcre16? "8":"16");
	continue;
	}
	}

	/* Need to know if UTF-8 for printing data strings. */

	if (new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options) < 0) continue;
	use_utf = (get_options & PCRE_UTF8) != 0;

fclose(f);	fclose(f);
goto SHOW_INFO;	goto SHOW_INFO;
}	}

/* In-line pattern (the usual case). Get the delimiter and seek the end of	/* 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++;	delimiter = *p++;

Line 1690 while (!done)	Line 2784 while (!done)
case 'X': options \|= PCRE_EXTRA; break;	case 'X': options \|= PCRE_EXTRA; break;
case 'Y': options \|= PCRE_NO_START_OPTIMISE; break;	case 'Y': options \|= PCRE_NO_START_OPTIMISE; break;
case 'Z': debug_lengths = 0; 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 '?': options \|= PCRE_NO_UTF8_CHECK; break;	case '?': options \|= PCRE_NO_UTF8_CHECK; break;

case 'T':	case 'T':
Line 1724 while (!done)	Line 2818 while (!done)
goto SKIP_DATA;	goto SKIP_DATA;
}	}
locale_set = 1;	locale_set = 1;
tables = pcre_maketables();	tables = PCRE_MAKETABLES;
pp = ppp;	pp = ppp;
break;	break;

Line 1737 while (!done)	Line 2831 while (!done)

case '<':	case '<':
{	{
if (strncmpic(pp, (uschar *)"JS>", 3) == 0)	if (strncmpic(pp, (pcre_uint8 *)"JS>", 3) == 0)
{	{
options \|= PCRE_JAVASCRIPT_COMPAT;	options \|= PCRE_JAVASCRIPT_COMPAT;
pp += 3;	pp += 3;
Line 1765 while (!done)	Line 2859 while (!done)

/* Handle compiling via the POSIX interface, which doesn't support the	/* Handle compiling via the POSIX interface, which doesn't support the
timing, showing, or debugging options, nor the ability to pass over	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 !defined NOPOSIX
if (posix \|\| do_posix)	if (posix \|\| do_posix)
Line 1801 while (!done)	Line 2895 while (!done)
#endif /* !defined NOPOSIX */	#endif /* !defined NOPOSIX */

{	{
unsigned long int get_options;	/* In 16-bit mode, convert the input. */

	#ifdef SUPPORT_PCRE16
	if (use_pcre16)
	{
	switch(to16(FALSE, p, options & PCRE_UTF8, (int)strlen((char *)p)))
	{
	case -1:
	fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
	"converted to UTF-16\n");
	goto SKIP_DATA;

	case -2:
	fprintf(outfile, "**Failed: character value greater than 0x10ffff "
	"cannot be converted to UTF-16\n");
	goto SKIP_DATA;

	case -3: /* "Impossible error" when to16 is called arg1 FALSE */
	fprintf(outfile, "**Failed: character value greater than 0xffff "
	"cannot be converted to 16-bit in non-UTF mode\n");
	goto SKIP_DATA;

	default:
	break;
	}
	p = (pcre_uint8 *)buffer16;
	}
	#endif

	/* Compile many times when timing */

if (timeit > 0)	if (timeit > 0)
{	{
register int i;	register int i;
Line 1810 while (!done)	Line 2933 while (!done)
clock_t start_time = clock();	clock_t start_time = clock();
for (i = 0; i < timeit; i++)	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);	if (re != NULL) free(re);
}	}
time_taken = clock() - start_time;	time_taken = clock() - start_time;
Line 1820 while (!done)	Line 2943 while (!done)
}	}

first_gotten_store = 0;	first_gotten_store = 0;
re = pcre_compile((char *)p, options, &error, &erroroffset, tables);	PCRE_COMPILE(re, p, options, &error, &erroroffset, tables);

/* Compilation failed; go back for another re, skipping to blank line	/* Compilation failed; go back for another re, skipping to blank line
if non-interactive. */	if non-interactive. */
Line 1851 while (!done)	Line 2974 while (!done)
within the regex; check for this so that we know how to process the data	within the regex; check for this so that we know how to process the data
lines. */	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,	/* Extract the size for possible writing before possibly flipping it,
and remember the store that was got. */	and remember the store that was got. */

true_size = ((real_pcre *)re)->size;	true_size = ((REAL_PCRE *)re)->size;
regex_gotten_store = first_gotten_store;	regex_gotten_store = first_gotten_store;

/* Output code size information if requested */	/* Output code size information if requested */
Line 1865 while (!done)	Line 2989 while (!done)
if (log_store)	if (log_store)
fprintf(outfile, "Memory allocation (code space): %d\n",	fprintf(outfile, "Memory allocation (code space): %d\n",
(int)(first_gotten_store -	(int)(first_gotten_store -
sizeof(real_pcre) -	sizeof(REAL_PCRE) -
((real_pcre )re)->name_count ((real_pcre *)re)->name_entry_size));	((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	/* 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	help with the matching, unless the pattern has the SS option, which
Line 1881 while (!done)	Line 3005 while (!done)
clock_t time_taken;	clock_t time_taken;
clock_t start_time = clock();	clock_t start_time = clock();
for (i = 0; i < timeit; i++)	for (i = 0; i < timeit; i++)
extra = pcre_study(re, study_options \| force_study_options, &error);	{
	PCRE_STUDY(extra, re, study_options \| force_study_options, &error);
	}
time_taken = clock() - start_time;	time_taken = clock() - start_time;
if (extra != NULL) pcre_free_study(extra);	if (extra != NULL)
	{
	PCRE_FREE_STUDY(extra);
	}
fprintf(outfile, " Study time %.4f milliseconds\n",	fprintf(outfile, " Study time %.4f milliseconds\n",
(((double)time_taken * 1000.0) / (double)timeit) /	(((double)time_taken * 1000.0) / (double)timeit) /
(double)CLOCKS_PER_SEC);	(double)CLOCKS_PER_SEC);
}	}
extra = pcre_study(re, study_options \| force_study_options, &error);	PCRE_STUDY(extra, re, study_options \| force_study_options, &error);
if (error != NULL)	if (error != NULL)
fprintf(outfile, "Failed to study: %s\n", error);	fprintf(outfile, "Failed to study: %s\n", error);
else if (extra != NULL)	else if (extra != NULL)
Line 1897 while (!done)	Line 3026 while (!done)
if (log_store)	if (log_store)
{	{
size_t jitsize;	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 3046 while (!done)
extra->flags \|= PCRE_EXTRA_MARK;	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:	SHOW_INFO:

if (do_debug)	if (do_debug)
{	{
fprintf(outfile, "------------------------------------------------------------------\n");	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) */	/* We already have the options in get_options (see above) */
Line 1971 while (!done)	Line 3061 while (!done)
if (do_showinfo)	if (do_showinfo)
{	{
unsigned long int all_options;	unsigned long int all_options;
#if !defined NOINFOCHECK
int old_first_char, old_options, old_count;
#endif
int count, backrefmax, first_char, need_char, okpartial, jchanged,	int count, backrefmax, first_char, need_char, okpartial, jchanged,
hascrorlf;	hascrorlf;
int nameentrysize, namecount;	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_SIZE, &size) +
new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);	new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count) +
new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);	new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax) +
new_info(re, NULL, PCRE_INFO_FIRSTBYTE, &first_char);	new_info(re, NULL, PCRE_INFO_FIRSTBYTE, &first_char) +
new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);	new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char) +
new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);	new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize) +
new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);	new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount) +
new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);	new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable) +
new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);	new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial) +
new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);	new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged) +
new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);	new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf)
	!= 0)
	goto SKIP_DATA;

#if !defined NOINFOCHECK
old_count = pcre_info(re, &old_options, &old_first_char);
if (count < 0) fprintf(outfile,
"Error %d from pcre_info()\n", count);
else
{
if (old_count != count) fprintf(outfile,
"Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count,
old_count);

if (old_first_char != first_char) fprintf(outfile,
"First char disagreement: pcre_fullinfo=%d pcre_info=%d\n",
first_char, old_first_char);

if (old_options != (int)get_options) fprintf(outfile,
"Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n",
get_options, old_options);
}
#endif

if (size != regex_gotten_store) fprintf(outfile,	if (size != regex_gotten_store) fprintf(outfile,
"Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",	"Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
(int)size, (int)regex_gotten_store);	(int)size, (int)regex_gotten_store);
Line 2024 while (!done)	Line 3093 while (!done)
fprintf(outfile, "Named capturing subpatterns:\n");	fprintf(outfile, "Named capturing subpatterns:\n");
while (namecount-- > 0)	while (namecount-- > 0)
{	{
fprintf(outfile, " %s %*s%3d\n", nametable + 2,	#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
nameentrysize - 3 - (int)strlen((char *)nametable + 2), "",	int imm2_size = use_pcre16 ? 1 : 2;
GET2(nametable, 0));	#else
	int imm2_size = IMM2_SIZE;
	#endif
	int length = (int)STRLEN(nametable + imm2_size);
	fprintf(outfile, " ");
	PCHARSV(nametable, imm2_size, length, outfile);
	while (length++ < nameentrysize - imm2_size) putc(' ', outfile);
	#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
	fprintf(outfile, "%3d\n", use_pcre16?
	(int)(((PCRE_SPTR16)nametable)[0])
	:((int)nametable[0] << 8) \| (int)nametable[1]);
	nametable += nameentrysize * (use_pcre16 ? 2 : 1);
	#else
	fprintf(outfile, "%3d\n", GET2(nametable, 0));
	#ifdef SUPPORT_PCRE8
nametable += nameentrysize;	nametable += nameentrysize;
	#else
	nametable += nameentrysize * 2;
	#endif
	#endif
}	}
}	}

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");

all_options = ((real_pcre *)re)->options;	all_options = ((REAL_PCRE *)re)->options;
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");	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\n",
Line 2051 while (!done)	Line 3138 while (!done)
((get_options & PCRE_EXTRA) != 0)? " extra" : "",	((get_options & PCRE_EXTRA) != 0)? " extra" : "",
((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",	((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",	((get_options & PCRE_NO_AUTO_CAPTURE) != 0)? " no_auto_capture" : "",
((get_options & PCRE_UTF8) != 0)? " utf8" : "",	((get_options & PCRE_UTF8) != 0)? " utf" : "",
((get_options & PCRE_UCP) != 0)? " ucp" : "",	((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_NO_START_OPTIMIZE) != 0)? " no_start_optimize" : "",
((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");	((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");

Line 2095 while (!done)	Line 3182 while (!done)
}	}
else	else
{	{
int ch = first_char & 255;	const char *caseless =
const char *caseless = ((first_char & REQ_CASELESS) == 0)?	((((REAL_PCRE *)re)->flags & PCRE_FCH_CASELESS) == 0)?
"" : " (caseless)";	"" : " (caseless)";
if (PRINTHEX(ch))
fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);	if (PRINTOK(first_char))
	fprintf(outfile, "First char = \'%c\'%s\n", first_char, caseless);
else	else
fprintf(outfile, "First char = %d%s\n", ch, caseless);	{
	fprintf(outfile, "First char = ");
	pchar(first_char, outfile);
	fprintf(outfile, "%s\n", caseless);
	}
}	}

if (need_char < 0)	if (need_char < 0)
Line 2110 while (!done)	Line 3202 while (!done)
}	}
else	else
{	{
int ch = need_char & 255;	const char *caseless =
const char *caseless = ((need_char & REQ_CASELESS) == 0)?	((((REAL_PCRE *)re)->flags & PCRE_RCH_CASELESS) == 0)?
"" : " (caseless)";	"" : " (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	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	/* Don't output study size; at present it is in any case a fixed
Line 2133 while (!done)	Line 3230 while (!done)
fprintf(outfile, "Study returned NULL\n");	fprintf(outfile, "Study returned NULL\n");
else	else
{	{
uschar *start_bits = NULL;	pcre_uint8 *start_bits = NULL;
int minlength;	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");
}	}
}	}

Line 2177 while (!done)	Line 3276 while (!done)
if ((study_options & PCRE_STUDY_JIT_COMPILE) != 0)	if ((study_options & PCRE_STUDY_JIT_COMPILE) != 0)
{	{
int jit;	int jit;
new_info(re, extra, PCRE_INFO_JIT, &jit);	if (new_info(re, extra, PCRE_INFO_JIT, &jit) == 0)
if (jit)	{
fprintf(outfile, "JIT study was successful\n");	if (jit)
else	fprintf(outfile, "JIT study was successful\n");
	else
#ifdef SUPPORT_JIT	#ifdef SUPPORT_JIT
fprintf(outfile, "JIT study was not successful\n");	fprintf(outfile, "JIT study was not successful\n");
#else	#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	#endif
	}
}	}
}	}
}	}
Line 2203 while (!done)	Line 3304 while (!done)
}	}
else	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 \|\|	if (fwrite(sbuf, 1, 8, f) < 8 \|\|
fwrite(re, 1, true_size, f) < true_size)	fwrite(re, 1, true_size, f) < true_size)
Line 2240 while (!done)	Line 3342 while (!done)
}	}

new_free(re);	new_free(re);
if (extra != NULL) pcre_free_study(extra);	if (extra != NULL)
	{
	PCRE_FREE_STUDY(extra);
	}
if (locale_set)	if (locale_set)
{	{
new_free((void *)tables);	new_free((void *)tables);
Line 2255 while (!done)	Line 3360 while (!done)

for (;;)	for (;;)
{	{
uschar *q;	pcre_uint8 *q;
uschar *bptr;	pcre_uint8 *bptr;
int *use_offsets = offsets;	int *use_offsets = offsets;
int use_size_offsets = size_offsets;	int use_size_offsets = size_offsets;
int callout_data = 0;	int callout_data = 0;
Line 2272 while (!done)	Line 3377 while (!done)
int g_notempty = 0;	int g_notempty = 0;
int use_dfa = 0;	int use_dfa = 0;

options = 0;

*copynames = 0;	*copynames = 0;
*getnames = 0;	*getnames = 0;

copynamesptr = copynames;	#ifdef SUPPORT_PCRE16
getnamesptr = getnames;	cn16ptr = copynames;
	gn16ptr = getnames;
	#endif
	#ifdef SUPPORT_PCRE8
	cn8ptr = copynames8;
	gn8ptr = getnames8;
	#endif

pcre_callout = callout;	SET_PCRE_CALLOUT(callout);
first_callout = 1;	first_callout = 1;
last_callout_mark = NULL;	last_callout_mark = NULL;
callout_extra = 0;	callout_extra = 0;
Line 2288 while (!done)	Line 3397 while (!done)
callout_fail_count = 999999;	callout_fail_count = 999999;
callout_fail_id = -1;	callout_fail_id = -1;
show_malloc = 0;	show_malloc = 0;
	options = 0;

if (extra != NULL) extra->flags &=	if (extra != NULL) extra->flags &=
~(PCRE_EXTRA_MATCH_LIMIT\|PCRE_EXTRA_MATCH_LIMIT_RECURSION);	~(PCRE_EXTRA_MATCH_LIMIT\|PCRE_EXTRA_MATCH_LIMIT_RECURSION);
Line 2323 while (!done)	Line 3433 while (!done)
int i = 0;	int i = 0;
int n = 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
	16-bit mode. */

	if (c != '\\')
{	{
	if (use_utf)
	{
	*q++ = c;
	continue;
	}
	}

	/* Handle backslash escapes */

	else switch ((c = *p++))
	{
case 'a': c = 7; break;	case 'a': c = 7; break;
case 'b': c = '\b'; break;	case 'b': c = '\b'; break;
case 'e': c = 27; break;	case 'e': c = 27; break;
Line 2339 while (!done)	Line 3465 while (!done)
c -= '0';	c -= '0';
while (i++ < 2 && isdigit(p) && p != '8' && *p != '9')	while (i++ < 2 && isdigit(p) && p != '8' && *p != '9')
c = c * 8 + *p++ - '0';	c = c * 8 + *p++ - '0';

#if !defined NOUTF8
if (use_utf8 && c > 255)
{
unsigned char buff8[8];
int ii, utn;
utn = ord2utf8(c, buff8);
for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
c = buff8[ii]; /* Last byte */
}
#endif
break;	break;

case 'x':	case 'x':

/* Handle \x{..} specially - new Perl thing for utf8 */

#if !defined NOUTF8
if (*p == '{')	if (*p == '{')
{	{
unsigned char *pt = p;	pcre_uint8 *pt = p;
c = 0;	c = 0;

/* We used to have "while (isxdigit(*(++pt)))" here, but it fails	/* We used to have "while (isxdigit(*(++pt)))" here, but it fails
Line 2368 while (!done)	Line 3479 while (!done)
least one MacOS environment. */	least one MacOS environment. */

for (pt++; isxdigit(*pt); pt++)	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 == '}')	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;	p = pt + 1;
break;	break;
}	}
/* Not correct form; fall through */	/* Not correct form for \x{...}; fall through */
}	}
#endif

/* Ordinary \x */	/* \x without {} always defines just one byte in 8-bit mode. This
	allows UTF-8 characters to be constructed byte by byte, and also allows
	invalid UTF-8 sequences to be made. Just copy the byte in UTF mode.
	Otherwise, pass it down to later code so that it can be turned into
	UTF-8 when running in 16-bit mode. */

c = 0;	c = 0;
while (i++ < 2 && isxdigit(*p))	while (i++ < 2 && isxdigit(*p))
Line 2401 while (!done)	Line 3505 while (!done)
c = c * 16 + tolower(p) - ((isdigit(p))? '0' : 'a' - 10);	c = c * 16 + tolower(p) - ((isdigit(p))? '0' : 'a' - 10);
p++;	p++;
}	}
	if (use_utf)
	{
	*q++ = c;
	continue;
	}
break;	break;

case 0: /* \ followed by EOF allows for an empty line */	case 0: /* \ followed by EOF allows for an empty line */
Line 2433 while (!done)	Line 3542 while (!done)
}	}
else if (isalnum(*p))	else if (isalnum(*p))
{	{
uschar *npp = copynamesptr;	READ_CAPTURE_NAME(p, &cn8ptr, &cn16ptr, re);
while (isalnum(p)) npp++ = *p++;
*npp++ = 0;
*npp = 0;
n = pcre_get_stringnumber(re, (char *)copynamesptr);
if (n < 0)
fprintf(outfile, "no parentheses with name \"%s\"\n", copynamesptr);
copynamesptr = npp;
}	}
else if (*p == '+')	else if (*p == '+')
{	{
Line 2449 while (!done)	Line 3551 while (!done)
}	}
else if (*p == '-')	else if (*p == '-')
{	{
pcre_callout = NULL;	SET_PCRE_CALLOUT(NULL);
p++;	p++;
}	}
else if (*p == '!')	else if (*p == '!')
Line 2503 while (!done)	Line 3605 while (!done)
}	}
else if (isalnum(*p))	else if (isalnum(*p))
{	{
uschar *npp = getnamesptr;	READ_CAPTURE_NAME(p, &gn8ptr, &gn16ptr, 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;	continue;

Line 2520 while (!done)	Line 3615 while (!done)
&& (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0	&& (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0
&& extra->executable_jit != NULL)	&& 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;	continue;

Line 2618 while (!done)	Line 3713 while (!done)
}	}
continue;	continue;
}	}
*q++ = c;
	/* We now have a character value in c that may be greater than 255. In
	16-bit mode, we always convert characters to UTF-8 so that values greater
	than 255 can be passed to non-UTF 16-bit strings. In 8-bit mode we
	convert to UTF-8 if we are in UTF mode. Values greater than 127 in UTF
	mode must have come from \x{...} or octal constructs because values from
	\x.. get this far only in non-UTF mode. */

	#if !defined NOUTF \|\| defined SUPPORT_PCRE16
	if (use_pcre16 \|\| use_utf)
	{
	pcre_uint8 buff8[8];
	int ii, utn;
	utn = ord2utf8(c, buff8);
	for (ii = 0; ii < utn; ii++) *q++ = buff8[ii];
	}
	else
	#endif
	{
	if (c > 255)
	{
	fprintf(outfile, "** Character \\x{%x} is greater than 255 "
	"and UTF-8 mode is not enabled.\n", c);
	fprintf(outfile, "** Truncation will probably give the wrong "
	"result.\n");
	}
	*q++ = c;
	}
}	}

	/* Reached end of subject string */

*q = 0;	*q = 0;
len = (int)(q - dbuffer);	len = (int)(q - dbuffer);

Line 2681 while (!done)	Line 3806 while (!done)
if (pmatch[i].rm_so >= 0)	if (pmatch[i].rm_so >= 0)
{	{
fprintf(outfile, "%2d: ", (int)i);	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);	pmatch[i].rm_eo - pmatch[i].rm_so, outfile);
fprintf(outfile, "\n");	fprintf(outfile, "\n");
if (do_showcaprest \|\| (i == 0 && do_showrest))	if (do_showcaprest \|\| (i == 0 && do_showrest))
{	{
fprintf(outfile, "%2d+ ", (int)i);	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);	outfile);
fprintf(outfile, "\n");	fprintf(outfile, "\n");
}	}
Line 2695 while (!done)	Line 3820 while (!done)
}	}
}	}
free(pmatch);	free(pmatch);
	goto NEXT_DATA;
}	}

	#endif /* !defined NOPOSIX */

/* Handle matching via the native interface - repeats for /g and /G */	/* Handle matching via the native interface - repeats for /g and /G */

else	#ifdef SUPPORT_PCRE16
#endif /* !defined NOPOSIX */	if (use_pcre16)
	{
	len = to16(TRUE, bptr, (((REAL_PCRE *)re)->options) & PCRE_UTF8, len);
	switch(len)
	{
	case -1:
	fprintf(outfile, "**Failed: invalid UTF-8 string cannot be "
	"converted to UTF-16\n");
	goto NEXT_DATA;

	case -2:
	fprintf(outfile, "**Failed: character value greater than 0x10ffff "
	"cannot be converted to UTF-16\n");
	goto NEXT_DATA;

	case -3:
	fprintf(outfile, "**Failed: character value greater than 0xffff "
	"cannot be converted to 16-bit in non-UTF mode\n");
	goto NEXT_DATA;

	default:
	break;
	}
	bptr = (pcre_uint8 *)buffer16;
	}
	#endif

for (;; gmatched++) /* Loop for /g or /G */	for (;; gmatched++) /* Loop for /g or /G */
{	{
markptr = NULL;	markptr = NULL;
Line 2717 while (!done)	Line 3870 while (!done)
{	{
int workspace[1000];	int workspace[1000];
for (i = 0; i < timeitm; i++)	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, workspace,
	(sizeof(workspace)/sizeof(int)));
	}
}	}
else	else
#endif	#endif

for (i = 0; i < timeitm; i++)	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;	time_taken = clock() - start_time;
fprintf(outfile, "Execute time %.4f milliseconds\n",	fprintf(outfile, "Execute time %.4f milliseconds\n",
(((double)time_taken * 1000.0) / (double)timeitm) /	(((double)time_taken * 1000.0) / (double)timeitm) /
Line 2772 while (!done)	Line 3928 while (!done)
}	}
extra->flags \|= PCRE_EXTRA_CALLOUT_DATA;	extra->flags \|= PCRE_EXTRA_CALLOUT_DATA;
extra->callout_data = &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);	options \| g_notempty, use_offsets, use_size_offsets);
extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;	extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA;
}	}
Line 2784 while (!done)	Line 3940 while (!done)
else if (all_use_dfa \|\| use_dfa)	else if (all_use_dfa \|\| use_dfa)
{	{
int workspace[1000];	int workspace[1000];
count = pcre_dfa_exec(re, extra, (char *)bptr, len, start_offset,	PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,
options \| g_notempty, use_offsets, use_size_offsets, workspace,	(options \| g_notempty), use_offsets, use_size_offsets, workspace,
sizeof(workspace)/sizeof(int));	(sizeof(workspace)/sizeof(int)));
if (count == 0)	if (count == 0)
{	{
fprintf(outfile, "Matched, but too many subsidiary matches\n");	fprintf(outfile, "Matched, but too many subsidiary matches\n");
Line 2797 while (!done)	Line 3953 while (!done)

else	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)	if (count == 0)
{	{
fprintf(outfile, "Matched, but too many substrings\n");	fprintf(outfile, "Matched, but too many substrings\n");
Line 2811 while (!done)	Line 3967 while (!done)
if (count >= 0)	if (count >= 0)
{	{
int i, maxcount;	int i, maxcount;
	void cnptr, gnptr;

#if !defined NODFA	#if !defined NODFA
if (all_use_dfa \|\| use_dfa) maxcount = use_size_offsets/2; else	if (all_use_dfa \|\| use_dfa) maxcount = use_size_offsets/2; else
Line 2837 while (!done)	Line 3994 while (!done)

if (do_allcaps)	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 */	count++; /* Allow for full match */
if (count * 2 > use_size_offsets) count = use_size_offsets/2;	if (count * 2 > use_size_offsets) count = use_size_offsets/2;
}	}
Line 2859 while (!done)	Line 4017 while (!done)
else	else
{	{
fprintf(outfile, "%2d: ", i/2);	fprintf(outfile, "%2d: ", i/2);
(void)pchars(bptr + use_offsets[i],	PCHARSV(bptr, use_offsets[i],
use_offsets[i+1] - use_offsets[i], outfile);	use_offsets[i+1] - use_offsets[i], outfile);
fprintf(outfile, "\n");	fprintf(outfile, "\n");
if (do_showcaprest \|\| (i == 0 && do_showrest))	if (do_showcaprest \|\| (i == 0 && do_showrest))
{	{
fprintf(outfile, "%2d+ ", i/2);	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);	outfile);
fprintf(outfile, "\n");	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++)	for (i = 0; i < 32; i++)
{	{
if ((copystrings & (1 << i)) != 0)	if ((copystrings & (1 << i)) != 0)
{	{
	int rc;
char copybuffer[256];	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)	if (rc < 0)
fprintf(outfile, "copy substring %d failed %d\n", i, rc);	fprintf(outfile, "copy substring %d failed %d\n", i, rc);
else	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];	char copybuffer[256];
int rc = pcre_copy_named_substring(re, (char *)bptr, use_offsets,
count, (char *)copynamesptr, copybuffer, sizeof(copybuffer));	if (use_pcre16)
	{
	if ((pcre_uint16 )cnptr == 0) break;
	}
	else
	{
	if ((pcre_uint8 )cnptr == 0) break;
	}

	PCRE_COPY_NAMED_SUBSTRING(rc, re, bptr, use_offsets, count,
	cnptr, copybuffer, sizeof(copybuffer));

if (rc < 0)	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	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++)	for (i = 0; i < 32; i++)
{	{
if ((getstrings & (1 << i)) != 0)	if ((getstrings & (1 << i)) != 0)
{	{
	int rc;
const char *substring;	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)	if (rc < 0)
fprintf(outfile, "get substring %d failed %d\n", i, rc);	fprintf(outfile, "get substring %d failed %d\n", i, rc);
else	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;	const char *substring;
int rc = pcre_get_named_substring(re, (char *)bptr, use_offsets,
count, (char *)getnamesptr, &substring);	if (use_pcre16)
	{
	if ((pcre_uint16 )gnptr == 0) break;
	}
	else
	{
	if ((pcre_uint8 )gnptr == 0) break;
	}

	PCRE_GET_NAMED_SUBSTRING(rc, re, bptr, use_offsets, count,
	gnptr, &substring);
if (rc < 0)	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	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)	if (getlist)
{	{
	int rc;
const char **stringlist;	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)	if (rc < 0)
fprintf(outfile, "get substring list failed %d\n", rc);	fprintf(outfile, "get substring list failed %d\n", rc);
else	else
{	{
for (i = 0; i < count; i++)	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)	if (stringlist[i] != NULL)
fprintf(outfile, "string list not terminated by NULL\n");	fprintf(outfile, "string list not terminated by NULL\n");
pcre_free_substring_list(stringlist);	PCRE_FREE_SUBSTRING_LIST(stringlist);
}	}
}	}
}	}
Line 2957 while (!done)	Line 4174 while (!done)
else if (count == PCRE_ERROR_PARTIAL)	else if (count == PCRE_ERROR_PARTIAL)
{	{
if (markptr == NULL) fprintf(outfile, "Partial match");	if (markptr == NULL) fprintf(outfile, "Partial match");
else fprintf(outfile, "Partial match, mark=%s", markptr);	else
	{
	fprintf(outfile, "Partial match, mark=");
	PCHARSV(markptr, 0, -1, outfile);
	}
if (use_size_offsets > 1)	if (use_size_offsets > 1)
{	{
fprintf(outfile, ": ");	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);	outfile);
}	}
fprintf(outfile, "\n");	fprintf(outfile, "\n");
Line 2978 while (!done)	Line 4199 while (!done)
terminated by CRLF, an advance of one character just passes the \r,	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	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	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.	find the default.

Otherwise, in the case of UTF-8 matching, the advance must be one	Otherwise, in the case of UTF-8 matching, the advance must be one
Line 2989 while (!done)	Line 4210 while (!done)
if (g_notempty != 0)	if (g_notempty != 0)
{	{
int onechar = 1;	int onechar = 1;
unsigned int obits = ((real_pcre *)re)->options;	unsigned int obits = ((REAL_PCRE *)re)->options;
use_offsets[0] = start_offset;	use_offsets[0] = start_offset;
if ((obits & PCRE_NEWLINE_BITS) == 0)	if ((obits & PCRE_NEWLINE_BITS) == 0)
{	{
int d;	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	/* Note that these values are always the ASCII ones, even in
EBCDIC environments. CR = 13, NL = 10. */	EBCDIC environments. CR = 13, NL = 10. */
obits = (d == 13)? PCRE_NEWLINE_CR :	obits = (d == 13)? PCRE_NEWLINE_CR :
Line 3008 while (!done)	Line 4229 while (!done)
(obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)	(obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
&&	&&
start_offset < len - 1 &&	start_offset < len - 1 &&
bptr[start_offset] == '\r' &&	#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
bptr[start_offset+1] == '\n')	(use_pcre16?
	((PCRE_SPTR16)bptr)[start_offset] == '\r'
	&& ((PCRE_SPTR16)bptr)[start_offset + 1] == '\n'
	:
	bptr[start_offset] == '\r'
	&& bptr[start_offset + 1] == '\n')
	#elif defined SUPPORT_PCRE16
	((PCRE_SPTR16)bptr)[start_offset] == '\r'
	&& ((PCRE_SPTR16)bptr)[start_offset + 1] == '\n'
	#else
	bptr[start_offset] == '\r'
	&& bptr[start_offset + 1] == '\n'
	#endif
	)
onechar++;	onechar++;
else if (use_utf8)	else if (use_utf)
{	{
while (start_offset + onechar < len)	while (start_offset + onechar < len)
{	{
Line 3028 while (!done)	Line 4262 while (!done)
case PCRE_ERROR_NOMATCH:	case PCRE_ERROR_NOMATCH:
if (gmatched == 0)	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\n");
	}
	else
	{
	fprintf(outfile, "No match, mark = ");
	PCHARSV(markptr, 0, -1, outfile);
	putc('\n', outfile);
	}
}	}
break;	break;

case PCRE_ERROR_BADUTF8:	case PCRE_ERROR_BADUTF8:
case PCRE_ERROR_SHORTUTF8:	case PCRE_ERROR_SHORTUTF8:
fprintf(outfile, "Error %d (%s UTF-8 string)", count,	fprintf(outfile, "Error %d (%s UTF-%s string)", count,
(count == PCRE_ERROR_BADUTF8)? "bad" : "short");	(count == PCRE_ERROR_BADUTF8)? "bad" : "short",
	use_pcre16? "16" : "8");
if (use_size_offsets >= 2)	if (use_size_offsets >= 2)
fprintf(outfile, " offset=%d reason=%d", use_offsets[0],	fprintf(outfile, " offset=%d reason=%d", use_offsets[0],
use_offsets[1]);	use_offsets[1]);
fprintf(outfile, "\n");	fprintf(outfile, "\n");
break;	break;

	case PCRE_ERROR_BADUTF8_OFFSET:
	fprintf(outfile, "Error %d (bad UTF-%s offset)\n", count,
	use_pcre16? "16" : "8");
	break;

default:	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]);	fprintf(outfile, "Error %d (%s)\n", count, errtexts[-count]);
else	else
fprintf(outfile, "Error %d (Unexpected value)\n", count);	fprintf(outfile, "Error %d (Unexpected value)\n", count);
Line 3082 while (!done)	Line 4331 while (!done)

else	else
{	{
bptr += use_offsets[1];	bptr += use_offsets[1] * CHAR_SIZE;
len -= use_offsets[1];	len -= use_offsets[1];
}	}
} /* End of loop for /g and /G */	} /* End of loop for /g and /G */
Line 3097 while (!done)	Line 4346 while (!done)
#endif	#endif

if (re != NULL) new_free(re);	if (re != NULL) new_free(re);
if (extra != NULL) pcre_free_study(extra);	if (extra != NULL)
	{
	PCRE_FREE_STUDY(extra);
	}
if (locale_set)	if (locale_set)
{	{
new_free((void *)tables);	new_free((void *)tables);
Line 3106 while (!done)	Line 4358 while (!done)
}	}
if (jit_stack != NULL)	if (jit_stack != NULL)
{	{
pcre_jit_stack_free(jit_stack);	PCRE_JIT_STACK_FREE(jit_stack);
jit_stack = NULL;	jit_stack = NULL;
}	}
}	}
Line 3122 free(buffer);	Line 4374 free(buffer);
free(dbuffer);	free(dbuffer);
free(pbuffer);	free(pbuffer);
free(offsets);	free(offsets);

	#ifdef SUPPORT_PCRE16
	if (buffer16 != NULL) free(buffer16);
	#endif

return yield;	return yield;
}	}

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

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2