Fixed bug in the debugging /Z option of pcretest that made it assume /8.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@126 2f5784b3-3f2a-0410-8824-cb99058d5e15

5 files changed, 28 insertions, 28 deletions

diff --git a/Makefile.in b/Makefile.in
index c22ab3f..6b8887f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -398,7 +398,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_3)
-check_SCRIPTS =
+check_SCRIPTS = 
 noinst_SCRIPTS = RunTest RunGrepTest
 
 # Additional files to delete on 'make clean' and 'make maintainer-clean'.
@@ -583,7 +583,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 $@
@@ -633,11 +633,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)
@@ -674,25 +674,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/configure b/configure
index 7c41847..2de3a76 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for PCRE 7.1-RC1.
+# Generated by GNU Autoconf 2.61 for PCRE 7.1-RC2.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PCRE'
 PACKAGE_TARNAME='pcre'
-PACKAGE_VERSION='7.1-RC1'
-PACKAGE_STRING='PCRE 7.1-RC1'
+PACKAGE_VERSION='7.1-RC2'
+PACKAGE_STRING='PCRE 7.1-RC2'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="pcre.h.in"
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PCRE 7.1-RC1 to adapt to many kinds of systems.
+\`configure' configures PCRE 7.1-RC2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PCRE 7.1-RC1:";;
+     short | recursive ) echo "Configuration of PCRE 7.1-RC2:";;
    esac
   cat <<\_ACEOF
 
@@ -1596,7 +1596,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PCRE configure 7.1-RC1
+PCRE configure 7.1-RC2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1610,7 +1610,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PCRE $as_me 7.1-RC1, which was
+It was created by PCRE $as_me 7.1-RC2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2301,7 +2301,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pcre'
- VERSION='7.1-RC1'
+ VERSION='7.1-RC2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19770,8 +19770,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 PCRE_MAJOR="7"
 PCRE_MINOR="1"
-PCRE_PRERELEASE="-RC1"
-PCRE_DATE="2007-03-12"
+PCRE_PRERELEASE="-RC2"
+PCRE_DATE="2007-03-19"
 
 
 
@@ -21690,7 +21690,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PCRE $as_me 7.1-RC1, which was
+This file was extended by PCRE $as_me 7.1-RC2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21743,7 +21743,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-PCRE config.status 7.1-RC1
+PCRE config.status 7.1-RC2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index ee16e2c..9bd3ea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ dnl empty.
 
 m4_define(pcre_major, [7])
 m4_define(pcre_minor, [1])
-m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2007-03-12])
+m4_define(pcre_prerelease, [-RC2])
+m4_define(pcre_date, [2007-03-19])
 
 # Libtool shared library interface versions (current:revision:age)
 m4_define(libpcre_version, [0:1:0])
diff --git a/pcretest.c b/pcretest.c
index 313afcd..54f02f1 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -1135,7 +1135,7 @@ while (!done)
       case 'S': do_study = 1; break;
       case 'U': options |= PCRE_UNGREEDY; break;
       case 'X': options |= PCRE_EXTRA; break;
-      case 'Z': debug_lengths = 0;
+      case 'Z': debug_lengths = 0; break;
       case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
       case '?': options |= PCRE_NO_UTF8_CHECK; break;
 
diff --git a/testdata/testoutput3 b/testdata/testoutput3
index 4bddb28..839ae8a 100644
--- a/testdata/testoutput3
+++ b/testdata/testoutput3
@@ -156,7 +156,7 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+No options
 No first char
 No need char