diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-03-26 16:00:17 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-03-26 16:00:17 +0000 |
commit | 03d37305d8557554e1e9b080e83abc7b16cef432 (patch) | |
tree | e2fa553bacf29ee136ea7bba4afdf6a88d123beb | |
parent | db9afb7f55bae7352ba9497434980599b45d51be (diff) | |
download | pcre-03d37305d8557554e1e9b080e83abc7b16cef432.tar.gz |
Commit after detrailing; set executable on autogen.sh.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@134 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | Makefile.in | 24 | ||||
-rw-r--r-- | NON-UNIX-USE | 32 | ||||
-rwxr-xr-x[-rw-r--r--] | autogen.sh | 0 | ||||
-rw-r--r-- | pcre_dfa_exec.c | 2 | ||||
-rw-r--r-- | pcre_exec.c | 4 |
6 files changed, 40 insertions, 40 deletions
@@ -115,17 +115,17 @@ Version 7.1 12-Mar-07 14. If erroroffset was passed as NULL to pcre_compile, it provoked a segmentation fault instead of returning the appropriate error message. - + 15. In multiline mode when the newline sequence was set to "any", the pattern - ^$ would give a match between the \r and \n of a subject such as "A\r\nB". - This doesn't seem right; it now treats the CRLF combination as the line - ending, and so does not match in that case. It's only a pattern such as ^$ - that would hit this one: something like ^ABC$ would have failed after \r - and then tried again after \r\n. - + ^$ would give a match between the \r and \n of a subject such as "A\r\nB". + This doesn't seem right; it now treats the CRLF combination as the line + ending, and so does not match in that case. It's only a pattern such as ^$ + that would hit this one: something like ^ABC$ would have failed after \r + and then tried again after \r\n. + 16. Changed the comparison command for RunGrepTest from "diff -u" to "diff -ub" - in an attempt to make files that differ only in their line terminators - compare equal. This works on Linux. + in an attempt to make files that differ only in their line terminators + compare equal. This works on Linux. Version 7.0 19-Dec-06 diff --git a/Makefile.in b/Makefile.in index 180ebb0..fcc8a5c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -401,7 +401,7 @@ dist_noinst_DATA = $(pcrecpp_html) # The Libtool libraries to install. We'll add to this later. lib_LTLIBRARIES = libpcre.la libpcreposix.la $(am__append_4) -check_SCRIPTS = +check_SCRIPTS = noinst_SCRIPTS = RunTest RunGrepTest # Additional files to delete on 'make clean' and 'make maintainer-clean'. @@ -589,7 +589,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +$(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ @@ -639,11 +639,11 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES) +libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES) $(libpcre_la_LINK) -rpath $(libdir) $(libpcre_la_OBJECTS) $(libpcre_la_LIBADD) $(LIBS) -libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES) +libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES) $(libpcrecpp_la_LINK) $(am_libpcrecpp_la_rpath) $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_LIBADD) $(LIBS) -libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES) +libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES) $(libpcreposix_la_LINK) -rpath $(libdir) $(libpcreposix_la_OBJECTS) $(libpcreposix_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -680,25 +680,25 @@ clean-noinstPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -dftables$(EXEEXT): $(dftables_OBJECTS) $(dftables_DEPENDENCIES) +dftables$(EXEEXT): $(dftables_OBJECTS) $(dftables_DEPENDENCIES) @rm -f dftables$(EXEEXT) $(LINK) $(dftables_OBJECTS) $(dftables_LDADD) $(LIBS) -pcre_scanner_unittest$(EXEEXT): $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_DEPENDENCIES) +pcre_scanner_unittest$(EXEEXT): $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_DEPENDENCIES) @rm -f pcre_scanner_unittest$(EXEEXT) $(CXXLINK) $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_LDADD) $(LIBS) -pcre_stringpiece_unittest$(EXEEXT): $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_DEPENDENCIES) +pcre_stringpiece_unittest$(EXEEXT): $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_DEPENDENCIES) @rm -f pcre_stringpiece_unittest$(EXEEXT) $(CXXLINK) $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_LDADD) $(LIBS) -pcrecpp_unittest$(EXEEXT): $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_DEPENDENCIES) +pcrecpp_unittest$(EXEEXT): $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_DEPENDENCIES) @rm -f pcrecpp_unittest$(EXEEXT) $(CXXLINK) $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_LDADD) $(LIBS) -pcredemo$(EXEEXT): $(pcredemo_OBJECTS) $(pcredemo_DEPENDENCIES) +pcredemo$(EXEEXT): $(pcredemo_OBJECTS) $(pcredemo_DEPENDENCIES) @rm -f pcredemo$(EXEEXT) $(LINK) $(pcredemo_OBJECTS) $(pcredemo_LDADD) $(LIBS) -pcregrep$(EXEEXT): $(pcregrep_OBJECTS) $(pcregrep_DEPENDENCIES) +pcregrep$(EXEEXT): $(pcregrep_OBJECTS) $(pcregrep_DEPENDENCIES) @rm -f pcregrep$(EXEEXT) $(LINK) $(pcregrep_OBJECTS) $(pcregrep_LDADD) $(LIBS) -pcretest$(EXEEXT): $(pcretest_OBJECTS) $(pcretest_DEPENDENCIES) +pcretest$(EXEEXT): $(pcretest_OBJECTS) $(pcretest_DEPENDENCIES) @rm -f pcretest$(EXEEXT) $(LINK) $(pcretest_OBJECTS) $(pcretest_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) diff --git a/NON-UNIX-USE b/NON-UNIX-USE index 5144751..fa972f1 100644 --- a/NON-UNIX-USE +++ b/NON-UNIX-USE @@ -4,12 +4,12 @@ Compiling PCRE on non-Unix systems This document contains the following sections: General - Generic instructions for the PCRE C library + Generic instructions for the PCRE C library The C++ wrapper functions Building for virtual Pascal - Comments about Win32 builds + Comments about Win32 builds Building under Windows with BCC5.5 - Building PCRE on OpenVMS + Building PCRE on OpenVMS GENERAL @@ -125,7 +125,7 @@ COMMENTS ABOUT WIN32 BUILDS There are two ways of building PCRE on Windows systems: using MinGW or using Cygwin. These are not at all the same thing, and are completely different from -each other. +each other. The MinGW home page (http://www.mingw.org/) says this: @@ -136,20 +136,20 @@ The MinGW home page (http://www.mingw.org/) says this: The Cygwin home page (http://www.cygwin.com/) says this: - Cygwin is a Linux-like environment for Windows. It consists of two parts: - - . A DLL (cygwin1.dll) which acts as a Linux API emulation layer providing + Cygwin is a Linux-like environment for Windows. It consists of two parts: + + . A DLL (cygwin1.dll) which acts as a Linux API emulation layer providing substantial Linux API functionality - + . A collection of tools which provide Linux look and feel. - The Cygwin DLL currently works with all recent, commercially released x86 32 + The Cygwin DLL currently works with all recent, commercially released x86 32 bit and 64 bit versions of Windows, with the exception of Windows CE. On both MinGW and Cygwin, PCRE should build correctly using: - ./configure && make && make install - + ./configure && make && make install + However, if you want to statically link your program against the .a file, you must define PCRE_STATIC before including pcre.h, otherwise the pcre_malloc() and pcre_free() exported functions will be declared __declspec(dllimport), with @@ -173,15 +173,15 @@ to tell Cygwin's gcc to use the MinGW gcc. Cygwin's gcc is only acting as a front end to MinGW's gcc (if you install Cygwin's gcc, you get both Cygwin's gcc and MinGW's gcc). So, a user can: -. Build native binaries by using MinGW or by getting Cygwin and using +. Build native binaries by using MinGW or by getting Cygwin and using -mno-cygwin. -. Build binaries that depend on cygwin1.dll by using Cygwin with the normal +. Build binaries that depend on cygwin1.dll by using Cygwin with the normal compiler flags. -The test files that are supplied with PCRE are in Unix format, with LF -characters as line terminators. It may be necessary to change the line -terminators in order to get some of the tests to work. We hope to improves +The test files that are supplied with PCRE are in Unix format, with LF +characters as line terminators. It may be necessary to change the line +terminators in order to get some of the tests to work. We hope to improves things in this area in future. diff --git a/autogen.sh b/autogen.sh index 6d7dbb0..6d7dbb0 100644..100755 --- a/autogen.sh +++ b/autogen.sh diff --git a/pcre_dfa_exec.c b/pcre_dfa_exec.c index 42bcbb9..8ffad82 100644 --- a/pcre_dfa_exec.c +++ b/pcre_dfa_exec.c @@ -2311,7 +2311,7 @@ for (;;) /* If we have just passed a CR and the newline option is ANY, and we are now at a LF, advance the match position by one more character. */ - + if (current_subject[-1] == '\r' && md->nltype == NLTYPE_ANY && current_subject < end_subject && diff --git a/pcre_exec.c b/pcre_exec.c index 011a931..3c3e780 100644 --- a/pcre_exec.c +++ b/pcre_exec.c @@ -4013,10 +4013,10 @@ for(;;) { while (start_match <= end_subject && !WAS_NEWLINE(start_match)) start_match++; - + /* If we have just passed a CR and the newline option is ANY, and we are now at a LF, advance the match position by one more character. */ - + if (start_match[-1] == '\r' && md->nltype == NLTYPE_ANY && start_match < end_subject && |