walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

File tidies for 10.36-RC1

This commit is contained in:
Philip.Hazel 2020-11-06 17:27:35 +00:00
parent dc426be88e
commit 000bbf2ea7
27 changed files with 150 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -2,8 +2,8 @@ THE MAIN PCRE2 LIBRARY CODE
--------------------------- ---------------------------
Written by: Philip Hazel Written by: Philip Hazel
Email local part: ph10 Email local part: Philip.Hazel
Email domain: cam.ac.uk Email domain: gmail.com
University of Cambridge Computing Service, University of Cambridge Computing Service,
Cambridge, England. Cambridge, England.

4
ChangeLog
View File

@ -1,8 +1,8 @@
Change Log for PCRE2 Change Log for PCRE2
-------------------- --------------------
Version 10.36-RC1 25-May-2020 Version 10.36-RC1 05-November-2020
----------------------------- ----------------------------------
1. Add CET_CFLAGS so that when Intel CET is enabled, pass -mshstk to 1. Add CET_CFLAGS so that when Intel CET is enabled, pass -mshstk to
compiler. This fixes https://bugs.exim.org/show_bug.cgi?id=2578. Patch for compiler. This fixes https://bugs.exim.org/show_bug.cgi?id=2578. Patch for

4
LICENCE
View File

@ -20,8 +20,8 @@ THE BASIC LIBRARY FUNCTIONS
--------------------------- ---------------------------
Written by: Philip Hazel Written by: Philip Hazel
Email local part: ph10 Email local part: Philip.Hazel
Email domain: cam.ac.uk Email domain: gmail.com
University of Cambridge Computing Service, University of Cambridge Computing Service,
Cambridge, England. Cambridge, England.

6
Makefile.am
View File

@ -448,15 +448,15 @@ EXTRA_DIST += \
src/sljit/sljitNativePPC_32.c \ src/sljit/sljitNativePPC_32.c \
src/sljit/sljitNativePPC_64.c \ src/sljit/sljitNativePPC_64.c \
src/sljit/sljitNativePPC_common.c \ src/sljit/sljitNativePPC_common.c \
src/sljit/sljitNativeS390X.c \
src/sljit/sljitNativeSPARC_32.c \ src/sljit/sljitNativeSPARC_32.c \
src/sljit/sljitNativeSPARC_common.c \ src/sljit/sljitNativeSPARC_common.c \
src/sljit/sljitNativeTILEGX-encoder.c \
src/sljit/sljitNativeTILEGX_64.c \
src/sljit/sljitNativeX86_32.c \ src/sljit/sljitNativeX86_32.c \
src/sljit/sljitNativeX86_64.c \ src/sljit/sljitNativeX86_64.c \
src/sljit/sljitNativeX86_common.c \ src/sljit/sljitNativeX86_common.c \
src/sljit/sljitProtExecAllocator.c \ src/sljit/sljitProtExecAllocator.c \
src/sljit/sljitUtils.c src/sljit/sljitUtils.c \
src/sljit/sljitWXExecAllocator.c
# Some of the JIT sources are also in separate files that are #included. # Some of the JIT sources are also in separate files that are #included.

10
NEWS
View File

@ -2,6 +2,16 @@ News about PCRE2 releases
------------------------- -------------------------
Version 10.36 05-November-2020
------------------------------
Again, mainly bug fixes and tidies. The only enhancements are the addition of
GNU grep's -m (aka --max-count) option to pcre2grep, and also unifying the
handling of substitution strings for both -O and callouts in pcre2grep, with
the addition of $x{...} and $o{...} to allow for characters whose code points
are greater than 255 in Unicode mode.
Version 10.35 15-April-2020 Version 10.35 15-April-2020
--------------------------- ---------------------------

6
README
View File

@ -297,8 +297,8 @@ library. They are also documented in the pcre2build man page.
unaddressable. This allows it to detect invalid memory accesses, and is unaddressable. This allows it to detect invalid memory accesses, and is
mostly useful for debugging PCRE2 itself. mostly useful for debugging PCRE2 itself.
. In environments where the gcc compiler is used and lcov version 1.6 or above . In environments where the gcc compiler is used and lcov is installed, if you
is installed, if you specify specify
--enable-coverage --enable-coverage
@ -894,4 +894,4 @@ The distribution should contain the files listed below.
Philip Hazel Philip Hazel
Email local part: Philip.Hazel Email local part: Philip.Hazel
Email domain: gmail.com Email domain: gmail.com
Last updated: 22 September 2020 Last updated: 06 November 2020

6
RunGrepTest
View File

@ -674,11 +674,11 @@ echo "---------------------------- Test 131 -----------------------------" >>tes
echo "RC=$?" >>testtrygrep echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 132 -----------------------------" >>testtrygrep echo "---------------------------- Test 132 -----------------------------" >>testtrygrep
(cd $srcdir; $valgrind $vjs $pcre2grep -m1 -A3 '^match'; echo '---'; head -1) <testdata/grepinput >>testtrygrep 2>&1 (cd $srcdir; $valgrind $vjs $pcre2grep -m1 -A3 '^match'; echo '---'; head -1) <$srcdir/testdata/grepinput >>testtrygrep 2>&1
echo "RC=$?" >>testtrygrep echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 133 -----------------------------" >>testtrygrep echo "---------------------------- Test 133 -----------------------------" >>testtrygrep
(cd $srcdir; $valgrind $vjs $pcre2grep -m1 -O '=$x{41}$x423$o{103}$o1045=' 'fox') <testdata/grepinputv >>testtrygrep 2>&1 (cd $srcdir; $valgrind $vjs $pcre2grep -m1 -O '=$x{41}$x423$o{103}$o1045=' 'fox') <$srcdir/testdata/grepinputv >>testtrygrep 2>&1
echo "RC=$?" >>testtrygrep echo "RC=$?" >>testtrygrep
# Now compare the results. # Now compare the results.
@ -715,7 +715,7 @@ if [ $utf8 -ne 0 ] ; then
echo "RC=$?" >>testtrygrep echo "RC=$?" >>testtrygrep
echo "---------------------------- Test U6 -----------------------------" >>testtrygrep echo "---------------------------- Test U6 -----------------------------" >>testtrygrep
(cd $srcdir; $valgrind $vjs $pcre2grep -u -m1 -O '=$x{1d3}$o{744}=' 'fox') <testdata/grepinputv >>testtrygrep 2>&1 (cd $srcdir; $valgrind $vjs $pcre2grep -u -m1 -O '=$x{1d3}$o{744}=' 'fox') <$srcdir/testdata/grepinputv >>testtrygrep 2>&1
echo "RC=$?" >>testtrygrep echo "RC=$?" >>testtrygrep
$cf $srcdir/testdata/grepoutput8 testtrygrep $cf $srcdir/testdata/grepoutput8 testtrygrep

8
configure.ac
View File

@ -11,12 +11,12 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10]) m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [36]) m4_define(pcre2_minor, [36])
m4_define(pcre2_prerelease, [-RC1]) m4_define(pcre2_prerelease, [-RC1])
m4_define(pcre2_date, [2020-06-01]) m4_define(pcre2_date, [2020-11-05])
# Libtool shared library interface versions (current:revision:age) # Libtool shared library interface versions (current:revision:age)
m4_define(libpcre2_8_version, [10:0:10]) m4_define(libpcre2_8_version, [10:1:10])
m4_define(libpcre2_16_version, [10:0:10]) m4_define(libpcre2_16_version, [10:1:10])
m4_define(libpcre2_32_version, [10:0:10]) m4_define(libpcre2_32_version, [10:1:10])
m4_define(libpcre2_posix_version, [2:3:0]) m4_define(libpcre2_posix_version, [2:3:0])
# NOTE: The CMakeLists.txt file searches for the above variables in the first # NOTE: The CMakeLists.txt file searches for the above variables in the first

6
doc/html/README.txt
View File

@ -297,8 +297,8 @@ library. They are also documented in the pcre2build man page.
unaddressable. This allows it to detect invalid memory accesses, and is unaddressable. This allows it to detect invalid memory accesses, and is
mostly useful for debugging PCRE2 itself. mostly useful for debugging PCRE2 itself.
. In environments where the gcc compiler is used and lcov version 1.6 or above . In environments where the gcc compiler is used and lcov is installed, if you
is installed, if you specify specify
--enable-coverage --enable-coverage
@ -894,4 +894,4 @@ The distribution should contain the files listed below.
Philip Hazel Philip Hazel
Email local part: Philip.Hazel Email local part: Philip.Hazel
Email domain: gmail.com Email domain: gmail.com
Last updated: 22 September 2020 Last updated: 06 November 2020

6
src/config.h.generic
View File

@ -224,7 +224,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_NAME "PCRE2" #define PACKAGE_NAME "PCRE2"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "PCRE2 10.35" #define PACKAGE_STRING "PCRE2 10.36-RC1"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2" #define PACKAGE_TARNAME "pcre2"
@ -233,7 +233,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "10.35" #define PACKAGE_VERSION "10.36-RC1"
/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
parentheses (of any kind) in a pattern. This limits the amount of system parentheses (of any kind) in a pattern. This limits the amount of system
@ -358,7 +358,7 @@ sure both macros are undefined; an emulation function will then be used. */
#endif #endif
/* Version number of package */ /* Version number of package */
#define VERSION "10.35" #define VERSION "10.36-RC1"
/* Define to 1 if on MINIX. */ /* Define to 1 if on MINIX. */
/* #undef _MINIX */ /* #undef _MINIX */

6
src/pcre2.h.generic
View File

@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
/* The current PCRE version information. */ /* The current PCRE version information. */
#define PCRE2_MAJOR 10 #define PCRE2_MAJOR 10
#define PCRE2_MINOR 35 #define PCRE2_MINOR 36
#define PCRE2_PRERELEASE #define PCRE2_PRERELEASE -RC1
#define PCRE2_DATE 2020-05-09 #define PCRE2_DATE 2020-11-05
/* When an application links to a PCRE DLL in Windows, the symbols that are /* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate imported have to be identified as such. When building PCRE2, the appropriate

6
src/pcre2_dftables.c
View File

@ -63,7 +63,7 @@ given, they are written in binary. */
#include "pcre2_maketables.c" #include "pcre2_maketables.c"
static char *classlist[] = static const char *classlist[] =
{ {
"space", "xdigit", "digit", "upper", "lower", "space", "xdigit", "digit", "upper", "lower",
"word", "graph", "print", "punct", "cntrl" "word", "graph", "print", "punct", "cntrl"
@ -97,7 +97,7 @@ FILE *f;
int i; int i;
int nclass = 0; int nclass = 0;
BOOL binary = FALSE; BOOL binary = FALSE;
char *env = "C"; char *env = (char *)"C";
const unsigned char *tables; const unsigned char *tables;
const unsigned char *base_of_tables; const unsigned char *base_of_tables;
@ -105,7 +105,7 @@ const unsigned char *base_of_tables;
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
unsigned char *arg = (unsigned char *)argv[i]; char *arg = argv[i];
if (*arg != '-') break; if (*arg != '-') break;
if (strcmp(arg, "-help") == 0 || strcmp(arg, "--help") == 0) if (strcmp(arg, "-help") == 0 || strcmp(arg, "--help") == 0)