From 5d8a6b628ded65e28eb2a4a0f4baa1a9538da408 Mon Sep 17 00:00:00 2001 From: ph10 Date: Tue, 15 Jun 2021 16:15:50 +0000 Subject: Final source tidies for 8.45 release. git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1766 2f5784b3-3f2a-0410-8824-cb99058d5e15 --- AUTHORS | 10 ++-- ChangeLog | 8 +-- LICENCE | 10 ++-- NEWS | 4 +- NON-AUTOTOOLS-BUILD | 6 +-- README | 6 +-- configure.ac | 8 +-- doc/html/NON-AUTOTOOLS-BUILD.txt | 6 +-- doc/html/README.txt | 6 +-- doc/html/index.html | 14 +++--- doc/html/pcreapi.html | 10 ++-- doc/html/pcredemo.html | 4 +- doc/html/pcrejit.html | 2 +- doc/html/pcrepattern.html | 6 +-- doc/html/pcresyntax.html | 2 +- doc/pcre.txt | 104 +++++++++++++++++++-------------------- doc/pcredemo.3 | 4 +- maint/README | 6 +-- pcre_compile.c | 2 +- 19 files changed, 109 insertions(+), 109 deletions(-) diff --git a/AUTHORS b/AUTHORS index bb8b328..b3398bb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,13 +2,13 @@ THE MAIN PCRE LIBRARY --------------------- Written by: Philip Hazel -Email local part: ph10 -Email domain: cam.ac.uk +Email local part: Philip.Hazel +Email domain: gmail.com University of Cambridge Computing Service, Cambridge, England. -Copyright (c) 1997-2020 University of Cambridge +Copyright (c) 1997-2021 University of Cambridge All rights reserved @@ -19,7 +19,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Emain domain: freemail.hu -Copyright(c) 2010-2020 Zoltan Herczeg +Copyright(c) 2010-2021 Zoltan Herczeg All rights reserved. @@ -30,7 +30,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Emain domain: freemail.hu -Copyright(c) 2009-2020 Zoltan Herczeg +Copyright(c) 2009-2021 Zoltan Herczeg All rights reserved. diff --git a/ChangeLog b/ChangeLog index 471ef13..86acd7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,16 +5,16 @@ Note that the PCRE 8.xx series (PCRE1) is now at end of life. All development is happening in the PCRE2 10.xx series. -Version 8.45 14-June-2021 +Version 8.45 15-June-2021 ------------------------- This is the final release of PCRE1. A few minor tidies are included. -1. CMakeLists.txt has two user-supplied patches applied, one to allow for the -setting of MODULE_PATH, and the other to support the generation of pcre-config +1. CMakeLists.txt has two user-supplied patches applied, one to allow for the +setting of MODULE_PATH, and the other to support the generation of pcre-config file and libpcre*.pc files. -2. There was a memory leak if a compile error occurred when there were more +2. There was a memory leak if a compile error occurred when there were more than 20 named groups (Bugzilla #2613). 3. Fixed some typos in code and documentation. diff --git a/LICENCE b/LICENCE index 57a5448..803b411 100644 --- a/LICENCE +++ b/LICENCE @@ -19,13 +19,13 @@ THE BASIC LIBRARY FUNCTIONS --------------------------- Written by: Philip Hazel -Email local part: ph10 -Email domain: cam.ac.uk +Email local part: Philip.Hazel +Email domain: gmail.com University of Cambridge Computing Service, Cambridge, England. -Copyright (c) 1997-2020 University of Cambridge +Copyright (c) 1997-2021 University of Cambridge All rights reserved. @@ -36,7 +36,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Email domain: freemail.hu -Copyright(c) 2010-2020 Zoltan Herczeg +Copyright(c) 2010-2021 Zoltan Herczeg All rights reserved. @@ -47,7 +47,7 @@ Written by: Zoltan Herczeg Email local part: hzmester Email domain: freemail.hu -Copyright(c) 2009-2020 Zoltan Herczeg +Copyright(c) 2009-2021 Zoltan Herczeg All rights reserved. diff --git a/NEWS b/NEWS index abd6e7d..bec4d4b 100644 --- a/NEWS +++ b/NEWS @@ -5,10 +5,10 @@ Note that this library (now called PCRE1) is no longer being maintained. New projects are advised to use the PCRE2 libraries. -Release 8.45 14-June-2021 +Release 8.45 15-June-2021 ----------------------------- -This is the final PCRE1 release. +This is the final PCRE1 release. A very few small issues have been fixed. Release 8.44 12-February-2020 diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD index 908c5c3..23c4e64 100644 --- a/NON-AUTOTOOLS-BUILD +++ b/NON-AUTOTOOLS-BUILD @@ -768,6 +768,6 @@ Everything, source and executable, is in EBCDIC and native z/OS file formats. However, this software is not maintained and will not be upgraded. If you are new to PCRE you should be looking at PCRE2 (version 10.30 or later). -=============================== -Last Updated: 13 September 2017 -=============================== +========================== +Last Updated: 15 June 2021 +========================== diff --git a/README b/README index 46617c0..65f5e19 100644 --- a/README +++ b/README @@ -997,6 +997,6 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx. RunTest.bat a script for running tests under Windows Philip Hazel -Email local part: ph10 -Email domain: cam.ac.uk -Last updated: 12 February 2020 +Email local part: Philip.Hazel +Email domain: gmail.com +Last updated: 15 June 2021 diff --git a/configure.ac b/configure.ac index b3e5207..4d2e2f3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,15 +11,15 @@ dnl be defined as -RC2, for example. For real releases, it should be empty. m4_define(pcre_major, [8]) m4_define(pcre_minor, [45]) m4_define(pcre_prerelease, []) -m4_define(pcre_date, [2021-06-14]) +m4_define(pcre_date, [2021-06-15]) # NOTE: The CMakeLists.txt file searches for the above variables in the first # 50 lines of this file. Please update that if the variables above are moved. # Libtool shared library interface versions (current:revision:age) -m4_define(libpcre_version, [3:12:2]) -m4_define(libpcre16_version, [2:12:2]) -m4_define(libpcre32_version, [0:12:0]) +m4_define(libpcre_version, [3:13:2]) +m4_define(libpcre16_version, [2:13:2]) +m4_define(libpcre32_version, [0:13:0]) m4_define(libpcreposix_version, [0:7:0]) m4_define(libpcrecpp_version, [0:2:0]) diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt index 908c5c3..23c4e64 100644 --- a/doc/html/NON-AUTOTOOLS-BUILD.txt +++ b/doc/html/NON-AUTOTOOLS-BUILD.txt @@ -768,6 +768,6 @@ Everything, source and executable, is in EBCDIC and native z/OS file formats. However, this software is not maintained and will not be upgraded. If you are new to PCRE you should be looking at PCRE2 (version 10.30 or later). -=============================== -Last Updated: 13 September 2017 -=============================== +========================== +Last Updated: 15 June 2021 +========================== diff --git a/doc/html/README.txt b/doc/html/README.txt index 46617c0..65f5e19 100644 --- a/doc/html/README.txt +++ b/doc/html/README.txt @@ -997,6 +997,6 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx. RunTest.bat a script for running tests under Windows Philip Hazel -Email local part: ph10 -Email domain: cam.ac.uk -Last updated: 12 February 2020 +Email local part: Philip.Hazel +Email domain: gmail.com +Last updated: 15 June 2021 diff --git a/doc/html/index.html b/doc/html/index.html index 887f4d7..352c55d 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ - +--> PCRE specification @@ -96,7 +96,7 @@ in the library. There is a single page for each triple of 8-bit/16-bit/32-bit functions.

- +
@@ -162,7 +162,7 @@ functions. - + diff --git a/doc/html/pcreapi.html b/doc/html/pcreapi.html index 2fdfbff..2a0491f 100644 --- a/doc/html/pcreapi.html +++ b/doc/html/pcreapi.html @@ -1718,7 +1718,7 @@ very long time, and so the match_limit value is also used in this case

The default value for the limit can be set when PCRE is built; the default default is 10 million, which handles all but the most extreme cases. You can -override the default by suppling pcre_exec() with a pcre_extra +override the default by supplying pcre_exec() with a pcre_extra block in which match_limit is set, and PCRE_EXTRA_MATCH_LIMIT is set in the flags field. If the limit is exceeded, pcre_exec() returns PCRE_ERROR_MATCHLIMIT. @@ -1749,7 +1749,7 @@ and is ignored, when matching is done using JIT compiled code.

The default value for match_limit_recursion can be set when PCRE is built; the default default is the same value as the default for -match_limit. You can override the default by suppling pcre_exec() +match_limit. You can override the default by supplying pcre_exec() with a pcre_extra block in which match_limit_recursion is set, and PCRE_EXTRA_MATCH_LIMIT_RECURSION is set in the flags field. If the limit is exceeded, pcre_exec() returns PCRE_ERROR_RECURSIONLIMIT. @@ -2063,10 +2063,10 @@ lookbehind. For example, consider the pattern which finds occurrences of "iss" in the middle of words. (\B matches only if the current position in the subject is not a word boundary.) When applied to -the string "Mississipi" the first call to pcre_exec() finds the first +the string "Mississippi" the first call to pcre_exec() finds the first occurrence. If pcre_exec() is called again with just the remainder of the -subject, namely "issipi", it does not match, because \B is always false at the -start of the subject, which is deemed to be a word boundary. However, if +subject, namely "issippi", it does not match, because \B is always false at +the start of the subject, which is deemed to be a word boundary. However, if pcre_exec() is passed the entire string again, but with startoffset set to 4, it finds the second occurrence of "iss" because it is able to look behind the starting point to discover that it is preceded by a letter. diff --git a/doc/html/pcredemo.html b/doc/html/pcredemo.html index 894a930..d84c5c8 100644 --- a/doc/html/pcredemo.html +++ b/doc/html/pcredemo.html @@ -161,7 +161,7 @@ if (rc < 0) return 1; } -/* Match succeded */ +/* Match succeeded */ printf("\nMatch succeeded at offset %d\n", ovector[0]); @@ -379,7 +379,7 @@ for (;;) return 1; } - /* Match succeded */ + /* Match succeeded */ printf("\nMatch succeeded again at offset %d\n", ovector[0]); diff --git a/doc/html/pcrejit.html b/doc/html/pcrejit.html index abb3425..c1e0310 100644 --- a/doc/html/pcrejit.html +++ b/doc/html/pcrejit.html @@ -299,7 +299,7 @@ recommended. This is a suggestion for how a multithreaded program that needs to set up non-default JIT stacks might operate: 

-  During thread initalization
+  During thread initialization
     thread_local_var = pcre_jit_stack_alloc(...)
 
   During thread exit
diff --git a/doc/html/pcrepattern.html b/doc/html/pcrepattern.html
index 96fc729..2e3e626 100644
--- a/doc/html/pcrepattern.html
+++ b/doc/html/pcrepattern.html
@@ -655,7 +655,7 @@ recognized.
 

 It is possible to restrict \R to match only CR, LF, or CRLF (instead of the
 complete set of Unicode line endings) by setting the option PCRE_BSR_ANYCRLF
-either at compile time or when the pattern is matched. (BSR is an abbrevation
+either at compile time or when the pattern is matched. (BSR is an abbreviation
 for "backslash R".) This can be made the default when PCRE is built; if this is
 the case, the other behaviour can be requested via the PCRE_BSR_UNICODE option.
 It is also possible to specify these settings by starting a pattern string with
@@ -972,7 +972,7 @@ additional characters according to the following rules for ending a cluster:
 3. Do not break Hangul (a Korean script) syllable sequences. Hangul characters
 are of five types: L, V, T, LV, and LVT. An L character may be followed by an
 L, V, LV, or LVT character; an LV or V character may be followed by a V or T
-character; an LVT or T character may be follwed only by a T character.
+character; an LVT or T character may be followed only by a T character.
 

 

 4. Do not end before extending characters or spacing marks. Characters with
@@ -3080,7 +3080,7 @@ successful match. Consider:
If the subject is "aaaac...", after the first match attempt fails (starting at the first character in the string), the starting point skips on to start the -next attempt at "c". Note that a possessive quantifer does not have the same +next attempt at "c". Note that a possessive quantifier does not have the same effect as this example; although it would suppress backtracking during the first match attempt, the second attempt would start at the second character instead of skipping on to "c". diff --git a/doc/html/pcresyntax.html b/doc/html/pcresyntax.html index 5896b9e..2946ab3 100644 --- a/doc/html/pcresyntax.html +++ b/doc/html/pcresyntax.html @@ -157,7 +157,7 @@ is changed to use Unicode properties and they match many more characters. Xan Alphanumeric: union of properties L and N Xps POSIX space: property Z or tab, NL, VT, FF, CR Xsp Perl space: property Z or tab, NL, VT, FF, CR - Xuc Univerally-named character: one that can be + Xuc Universally-named character: one that can be represented by a Universal Character Name Xwd Perl word: property Xan or underscore diff --git a/doc/pcre.txt b/doc/pcre.txt index 393a700..f715269 100644 --- a/doc/pcre.txt +++ b/doc/pcre.txt @@ -193,8 +193,8 @@ REVISION Last updated: 14 June 2021 Copyright (c) 1997-2021 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRE(3) Library Functions Manual PCRE(3) @@ -525,8 +525,8 @@ REVISION Last updated: 12 May 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRE(3) Library Functions Manual PCRE(3) @@ -853,8 +853,8 @@ REVISION Last updated: 12 May 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREBUILD(3) Library Functions Manual PCREBUILD(3) @@ -1356,8 +1356,8 @@ REVISION Last updated: 12 May 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREMATCHING(3) Library Functions Manual PCREMATCHING(3) @@ -1574,8 +1574,8 @@ REVISION Last updated: 12 November 2013 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREAPI(3) Library Functions Manual PCREAPI(3) @@ -3155,7 +3155,7 @@ MATCHING A PATTERN: THE TRADITIONAL FUNCTION The default value for the limit can be set when PCRE is built; the de- fault default is 10 million, which handles all but the most extreme - cases. You can override the default by suppling pcre_exec() with a + cases. You can override the default by supplying pcre_exec() with a pcre_extra block in which match_limit is set, and PCRE_EX- TRA_MATCH_LIMIT is set in the flags field. If the limit is exceeded, pcre_exec() returns PCRE_ERROR_MATCHLIMIT. @@ -3183,7 +3183,7 @@ MATCHING A PATTERN: THE TRADITIONAL FUNCTION The default value for match_limit_recursion can be set when PCRE is built; the default default is the same value as the default for - match_limit. You can override the default by suppling pcre_exec() with + match_limit. You can override the default by supplying pcre_exec() with a pcre_extra block in which match_limit_recursion is set, and PCRE_EX- TRA_MATCH_LIMIT_RECURSION is set in the flags field. If the limit is exceeded, pcre_exec() returns PCRE_ERROR_RECURSIONLIMIT. @@ -3475,9 +3475,9 @@ MATCHING A PATTERN: THE TRADITIONAL FUNCTION which finds occurrences of "iss" in the middle of words. (\B matches only if the current position in the subject is not a word boundary.) - When applied to the string "Mississipi" the first call to pcre_exec() + When applied to the string "Mississippi" the first call to pcre_exec() finds the first occurrence. If pcre_exec() is called again with just - the remainder of the subject, namely "issipi", it does not match, be- + the remainder of the subject, namely "issippi", it does not match, be- cause \B is always false at the start of the subject, which is deemed to be a word boundary. However, if pcre_exec() is passed the entire string again, but with startoffset set to 4, it finds the second occur- @@ -4275,8 +4275,8 @@ REVISION Last updated: 18 December 2015 Copyright (c) 1997-2015 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRECALLOUT(3) Library Functions Manual PCRECALLOUT(3) @@ -4525,8 +4525,8 @@ REVISION Last updated: 12 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRECOMPAT(3) Library Functions Manual PCRECOMPAT(3) @@ -4720,8 +4720,8 @@ REVISION Last updated: 10 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPATTERN(3) Library Functions Manual PCREPATTERN(3) @@ -5292,11 +5292,11 @@ BACKSLASH It is possible to restrict \R to match only CR, LF, or CRLF (instead of the complete set of Unicode line endings) by setting the option PCRE_BSR_ANYCRLF either at compile time or when the pattern is matched. - (BSR is an abbrevation for "backslash R".) This can be made the default - when PCRE is built; if this is the case, the other behaviour can be re- - quested via the PCRE_BSR_UNICODE option. It is also possible to spec- - ify these settings by starting a pattern string with one of the follow- - ing sequences: + (BSR is an abbreviation for "backslash R".) This can be made the de- + fault when PCRE is built; if this is the case, the other behaviour can + be requested via the PCRE_BSR_UNICODE option. It is also possible to + specify these settings by starting a pattern string with one of the + following sequences: (*BSR_ANYCRLF) CR, LF, or CRLF only (*BSR_UNICODE) any Unicode newline sequence @@ -5488,8 +5488,8 @@ BACKSLASH 3. Do not break Hangul (a Korean script) syllable sequences. Hangul characters are of five types: L, V, T, LV, and LVT. An L character may be followed by an L, V, LV, or LVT character; an LV or V character may - be followed by a V or T character; an LVT or T character may be follwed - only by a T character. + be followed by a V or T character; an LVT or T character may be fol- + lowed only by a T character. 4. Do not end before extending characters or spacing marks. Characters with the "mark" property always have the "extend" grapheme breaking @@ -7494,7 +7494,7 @@ BACKTRACKING CONTROL If the subject is "aaaac...", after the first match attempt fails (starting at the first character in the string), the starting point skips on to start the next attempt at "c". Note that a possessive quan- - tifer does not have the same effect as this example; although it would + tifier does not have the same effect as this example; although it would suppress backtracking during the first match attempt, the second at- tempt would start at the second character instead of skipping on to "c". @@ -7670,8 +7670,8 @@ REVISION Last updated: 23 October 2016 Copyright (c) 1997-2016 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRESYNTAX(3) Library Functions Manual PCRESYNTAX(3) @@ -7793,7 +7793,7 @@ PCRE SPECIAL CATEGORY PROPERTIES FOR \p and \P Xan Alphanumeric: union of properties L and N Xps POSIX space: property Z or tab, NL, VT, FF, CR Xsp Perl space: property Z or tab, NL, VT, FF, CR - Xuc Univerally-named character: one that can be + Xuc Universally-named character: one that can be represented by a Universal Character Name Xwd Perl word: property Xan or underscore @@ -8076,8 +8076,8 @@ REVISION Last updated: 08 January 2014 Copyright (c) 1997-2014 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREUNICODE(3) Library Functions Manual PCREUNICODE(3) @@ -8295,8 +8295,8 @@ REVISION Last updated: 27 February 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREJIT(3) Library Functions Manual PCREJIT(3) @@ -8571,7 +8571,7 @@ CONTROLLING THE JIT STACK This is a suggestion for how a multithreaded program that needs to set up non-default JIT stacks might operate: - During thread initalization + During thread initialization thread_local_var = pcre_jit_stack_alloc(...) During thread exit @@ -8750,8 +8750,8 @@ REVISION Last updated: 05 July 2017 Copyright (c) 1997-2017 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPARTIAL(3) Library Functions Manual PCREPARTIAL(3) @@ -9235,8 +9235,8 @@ REVISION Last updated: 02 July 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPRECOMPILE(3) Library Functions Manual PCREPRECOMPILE(3) @@ -9374,8 +9374,8 @@ REVISION Last updated: 12 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPERFORM(3) Library Functions Manual PCREPERFORM(3) @@ -9544,8 +9544,8 @@ REVISION Last updated: 25 August 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCREPOSIX(3) Library Functions Manual PCREPOSIX(3) @@ -9808,8 +9808,8 @@ REVISION Last updated: 09 January 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRECPP(3) Library Functions Manual PCRECPP(3) @@ -10151,8 +10151,8 @@ REVISION Last updated: 08 January 2012 ------------------------------------------------------------------------------ - - + + PCRESAMPLE(3) Library Functions Manual PCRESAMPLE(3) @@ -10305,8 +10305,8 @@ REVISION Last updated: 05 November 2013 Copyright (c) 1997-2013 University of Cambridge. ------------------------------------------------------------------------------ - - + + PCRESTACK(3) Library Functions Manual PCRESTACK(3) @@ -10491,5 +10491,5 @@ REVISION Last updated: 24 June 2012 Copyright (c) 1997-2012 University of Cambridge. ------------------------------------------------------------------------------ - - + + diff --git a/doc/pcredemo.3 b/doc/pcredemo.3 index 194629b..4115ef1 100644 --- a/doc/pcredemo.3 +++ b/doc/pcredemo.3 @@ -161,7 +161,7 @@ if (rc < 0) return 1; } -/* Match succeded */ +/* Match succeeded */ printf("\enMatch succeeded at offset %d\en", ovector[0]); @@ -379,7 +379,7 @@ for (;;) return 1; } - /* Match succeded */ + /* Match succeeded */ printf("\enMatch succeeded again at offset %d\en", ovector[0]); diff --git a/maint/README b/maint/README index b0411b9..7e2c3ed 100644 --- a/maint/README +++ b/maint/README @@ -343,6 +343,6 @@ others are relatively new. "something" and the the #ifdef appears only in one place, in "something". Philip Hazel -Email local part: ph10 -Email domain: cam.ac.uk -Last updated: 07 December 2012 +Email local part: Philip.Hazel +Email domain: gmail.com +Last updated: 07 December 2012 (email updated 15-June-2021) diff --git a/pcre_compile.c b/pcre_compile.c index 03db188..8b80abe 100644 --- a/pcre_compile.c +++ b/pcre_compile.c @@ -9484,7 +9484,7 @@ if (cd->names_found > 0) add_name(cd, ng->name, ng->length, ng->number); if (cd->named_group_list_size > NAMED_GROUP_LIST_SIZE) (PUBL(free))((void *)cd->named_groups); - cd->named_group_list_size = 0; /* So we don't free it twice */ + cd->named_group_list_size = 0; /* So we don't free it twice */ } /* Set up a starting, non-extracting bracket, then compile the expression. On -- cgit v1.2.1
pcre_assign_jit_stack   Assign stack for JIT matching
pcre_maketables   Build character tables in current locale
pcre_pattern_to_host_byte_order   Convert compiled pattern to host byte order if necessary