Revision: 589
http://vcs.pcre.org/viewvc?view=rev&revision=589
Author: ph10
Date: 2011-01-15 11:31:39 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
Tidies for Release 8.12
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/Makefile.am
code/trunk/NEWS
code/trunk/doc/html/index.html
code/trunk/doc/html/pcregrep.html
code/trunk/doc/pcre.txt
code/trunk/doc/pcregrep.1
code/trunk/doc/pcregrep.txt
code/trunk/pcregrep.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/ChangeLog 2011-01-15 11:31:39 UTC (rev 589)
@@ -6,35 +6,35 @@
1. Fixed some typos in the markup of the man pages, and wrote a script that
checks for such things as part of the documentation building process.
-
+
2. On a big-endian 64-bit system, pcregrep did not correctly process the
--match-limit and --recursion-limit options (added for 8.11). In
- particular, this made one of the standard tests fail. (The integer value
+ particular, this made one of the standard tests fail. (The integer value
went into the wrong half of a long int.)
-
+
3. If the --colour option was given to pcregrep with -v (invert match), it
did strange things, either producing crazy output, or crashing. It should,
- of course, ignore a request for colour when reporting lines that do not
- match.
-
+ of course, ignore a request for colour when reporting lines that do not
+ match.
+
4. Another pcregrep bug caused similar problems if --colour was specified with
-M (multiline) and the pattern match finished with a line ending.
-
+
5. In pcregrep, when a pattern that ended with a literal newline sequence was
matched in multiline mode, the following line was shown as part of the
match. This seems wrong, so I have changed it.
-
+
6. Another pcregrep bug in multiline mode, when --colour was specified, caused
- the check for further matches in the same line (so they could be coloured)
- to overrun the end of the current line. If another match was found, it was
+ the check for further matches in the same line (so they could be coloured)
+ to overrun the end of the current line. If another match was found, it was
incorrectly shown (and then shown again when found in the next line).
-
-7. If pcregrep was compiled under Windows, there was a reference to the
+
+7. If pcregrep was compiled under Windows, there was a reference to the
function pcregrep_exit() before it was defined. I am assuming this was
- the cause of the "error C2371: 'pcregrep_exit' : redefinition;" that was
+ the cause of the "error C2371: 'pcregrep_exit' : redefinition;" that was
reported by a user. I've moved the definition above the reference.
-
+
Version 8.11 10-Dec-2010
------------------------
Modified: code/trunk/Makefile.am
===================================================================
--- code/trunk/Makefile.am 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/Makefile.am 2011-01-15 11:31:39 UTC (rev 589)
@@ -256,6 +256,7 @@
EXTRA_DIST += \
testdata/grepinput \
+ testdata/grepinput3 \
testdata/grepinput8 \
testdata/grepinputv \
testdata/grepinputx \
Modified: code/trunk/NEWS
===================================================================
--- code/trunk/NEWS 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/NEWS 2011-01-15 11:31:39 UTC (rev 589)
@@ -4,7 +4,7 @@
Release 8.12 15-Jan-2011
------------------------
-This release fixes some bugs in pcregrep, one of which caused the tests to fail
+This release fixes some bugs in pcregrep, one of which caused the tests to fail
on 64-bit big-endian systems. There are no changes to the code of the library.
Modified: code/trunk/doc/html/index.html
===================================================================
--- code/trunk/doc/html/index.html 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/doc/html/index.html 2011-01-15 11:31:39 UTC (rev 589)
@@ -1,10 +1,10 @@
<html>
-<!-- This is a manually maintained file that is the root of the HTML version of
- the PCRE documentation. When the HTML documents are built from the man
- page versions, the entire doc/html directory is emptied, this file is then
- copied into doc/html/index.html, and the remaining files therein are
+<!-- This is a manually maintained file that is the root of the HTML version of
+ the PCRE documentation. When the HTML documents are built from the man
+ page versions, the entire doc/html directory is emptied, this file is then
+ copied into doc/html/index.html, and the remaining files therein are
created by the 132html script.
--->
+-->
<head>
<title>PCRE specification</title>
</head>
@@ -74,11 +74,11 @@
</table>
<p>
-There are also individual pages that summarize the interface for each function
+There are also individual pages that summarize the interface for each function
in the library:
</p>
-<table>
+<table>
<tr><td><a href="pcre_compile.html">pcre_compile</a></td>
<td> Compile a regular expression</td></tr>
@@ -129,7 +129,7 @@
<tr><td><a href="pcre_maketables.html">pcre_maketables</a></td>
<td> Build character tables in current locale</td></tr>
-
+
<tr><td><a href="pcre_refcount.html">pcre_refcount</a></td>
<td> Maintain reference count in compiled pattern</td></tr>
Modified: code/trunk/doc/html/pcregrep.html
===================================================================
--- code/trunk/doc/html/pcregrep.html 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/doc/html/pcregrep.html 2011-01-15 11:31:39 UTC (rev 589)
@@ -399,8 +399,12 @@
<b>-M</b>, <b>--multiline</b>
Allow patterns to match more than one line. When this option is given, patterns
may usefully contain literal newline characters and internal occurrences of ^
-and $ characters. The output for any one match may consist of more than one
-line. When this option is set, the PCRE library is called in "multiline" mode.
+and $ characters. The output for a successful match may consist of more than
+one line, the last of which is the one in which the match ended. If the matched
+string ends with a newline sequence the output ends at the end of that line.
+<br>
+<br>
+When this option is set, the PCRE library is called in "multiline" mode.
There is a limit to the number of lines that can be matched, imposed by the way
that <b>pcregrep</b> buffers the input file as it scans it. However,
<b>pcregrep</b> ensures that at least 8K characters or the rest of the document
@@ -616,9 +620,9 @@
</P>
<br><a name="SEC13" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 16 November 2010
+Last updated: 14 January 2011
<br>
-Copyright © 1997-2010 University of Cambridge.
+Copyright © 1997-2011 University of Cambridge.
<br>
<p>
Return to the <a href="index.html">PCRE index page</a>.
Modified: code/trunk/doc/pcre.txt
===================================================================
--- code/trunk/doc/pcre.txt 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/doc/pcre.txt 2011-01-15 11:31:39 UTC (rev 589)
@@ -2,7 +2,7 @@
This file contains a concatenation of the PCRE man pages, converted to plain
text format for ease of searching with a text editor, or for use on systems
that do not have a man page processor. The small individual files that give
-synopses of each function in the library have not been included. Neither has
+synopses of each function in the library have not been included. Neither has
the pcredemo program. There are separate text files for the pcregrep and
pcretest commands.
-----------------------------------------------------------------------------
@@ -269,8 +269,8 @@
Last updated: 13 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREBUILD(3) PCREBUILD(3)
@@ -600,8 +600,8 @@
Last updated: 29 September 2009
Copyright (c) 1997-2009 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREMATCHING(3) PCREMATCHING(3)
@@ -804,8 +804,8 @@
Last updated: 17 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREAPI(3) PCREAPI(3)
@@ -2877,8 +2877,8 @@
Last updated: 21 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRECALLOUT(3) PCRECALLOUT(3)
@@ -3059,8 +3059,8 @@
Last updated: 21 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRECOMPAT(3) PCRECOMPAT(3)
@@ -3215,8 +3215,8 @@
Last updated: 31 October 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREPATTERN(3) PCREPATTERN(3)
@@ -5694,8 +5694,8 @@
Last updated: 21 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRESYNTAX(3) PCRESYNTAX(3)
@@ -6064,8 +6064,8 @@
Last updated: 21 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREPARTIAL(3) PCREPARTIAL(3)
@@ -6484,8 +6484,8 @@
Last updated: 07 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREPRECOMPILE(3) PCREPRECOMPILE(3)
@@ -6609,8 +6609,8 @@
Last updated: 17 November 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREPERFORM(3) PCREPERFORM(3)
@@ -6777,8 +6777,8 @@
Last updated: 16 May 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCREPOSIX(3) PCREPOSIX(3)
@@ -7040,8 +7040,8 @@
Last updated: 16 May 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRECPP(3) PCRECPP(3)
@@ -7381,8 +7381,8 @@
Last updated: 17 March 2009
------------------------------------------------------------------------------
-
-
+
+
PCRESAMPLE(3) PCRESAMPLE(3)
@@ -7617,5 +7617,5 @@
Last updated: 03 January 2010
Copyright (c) 1997-2010 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
Modified: code/trunk/doc/pcregrep.1
===================================================================
--- code/trunk/doc/pcregrep.1 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/doc/pcregrep.1 2011-01-15 11:31:39 UTC (rev 589)
@@ -337,7 +337,7 @@
Allow patterns to match more than one line. When this option is given, patterns
may usefully contain literal newline characters and internal occurrences of ^
and $ characters. The output for a successful match may consist of more than
-one line, the last of which is the one in which the match ended. If the matched
+one line, the last of which is the one in which the match ended. If the matched
string ends with a newline sequence the output ends at the end of that line.
.sp
When this option is set, the PCRE library is called in "multiline" mode.
Modified: code/trunk/doc/pcregrep.txt
===================================================================
--- code/trunk/doc/pcregrep.txt 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/doc/pcregrep.txt 2011-01-15 11:31:39 UTC (rev 589)
@@ -383,7 +383,11 @@
Allow patterns to match more than one line. When this option
is given, patterns may usefully contain literal newline char-
acters and internal occurrences of ^ and $ characters. The
- output for any one match may consist of more than one line.
+ output for a successful match may consist of more than one
+ line, the last of which is the one in which the match ended.
+ If the matched string ends with a newline sequence the output
+ ends at the end of that line.
+
When this option is set, the PCRE library is called in "mul-
tiline" mode. There is a limit to the number of lines that
can be matched, imposed by the way that pcregrep buffers the
@@ -603,5 +607,5 @@
REVISION
- Last updated: 16 November 2010
- Copyright (c) 1997-2010 University of Cambridge.
+ Last updated: 14 January 2011
+ Copyright (c) 1997-2011 University of Cambridge.
Modified: code/trunk/pcregrep.c
===================================================================
--- code/trunk/pcregrep.c 2011-01-15 11:22:47 UTC (rev 588)
+++ code/trunk/pcregrep.c 2011-01-15 11:31:39 UTC (rev 589)
@@ -1349,10 +1349,10 @@
/* We have to split the line(s) up if colouring, and search for further
matches, but not of course if the line is a non-match. */
-
+
if (do_colour && !invert)
{
- int plength;
+ int plength;
int last_offset = 0;
FWRITE(ptr, 1, offsets[0], stdout);
fprintf(stdout, "%c[%sm", 0x1b, colour_string);
@@ -1372,9 +1372,9 @@
}
/* In multiline mode, we may have already printed the complete line
- and its line-ending characters (if they matched the pattern), so there
+ and its line-ending characters (if they matched the pattern), so there
may be no more to print. */
-
+
plength = (linelength + endlinelength) - last_offset;
if (plength > 0)
FWRITE(ptr + last_offset, 1, plength, stdout);
