aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog51
-rw-r--r--posix/Makefile3
-rw-r--r--posix/bug-regex13.c75
-rw-r--r--posix/regcomp.c3
4 files changed, 110 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 922e0d9bb8..3e4829b372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-21 Isamu Hasegawa <isamu@yamato.ibm.com>
+
+ * posix/Makefile: Add a test case for the bug reported by Aharon
+ Robbins <arnold@skeeve.com>.
+ * posix/bug-regex13.c: New file.
+ * posix/regcomp.c (peek_token_bracket): Skip the byte already read.
+
+2002-10-21 Ulrich Drepper <drepper@redhat.com>
+
+ * csu/gmon-start.c: Pretty printing.
+
2002-10-19 Art Haas <ahaas@neosoft.com>
* configure.in: Replace AC_CONFIG_HEADER with AC_CONFIG_HEADERS,
@@ -123,32 +134,32 @@
2002-10-18 Jeff Bailey <jbailey@gnu.org>
- * configure.in: Replace obsolete AC_OUTPUT syntax with
- AC_CONFIG_FILES, AC_CONFIG_COMMANDS, and new-type AC_OUTPUT trio.
+ * configure.in: Replace obsolete AC_OUTPUT syntax with
+ AC_CONFIG_FILES, AC_CONFIG_COMMANDS, and new-type AC_OUTPUT trio.
- * aclocal.m4 (GLIBC_PROVIDES): Add AC_PROVIDEs for
+ * aclocal.m4 (GLIBC_PROVIDES): Add AC_PROVIDEs for
_AS_PATH_SEPARATOR_PREPARE and _AS_TEST_PREPARE.
- * configure.in: Replace AC_FD_CC with AS_MESSAGE_LOG_FD.
- * sysdeps/alpha/elf/configure.in: Likewise.
- * sysdeps/i386/elf/configure.in: Likewise.
- * sysdeps/mach/hurd/configure.in: Likewise.
- * sysdeps/x86_64/elf/configure.in: Likewise.
+ * configure.in: Replace AC_FD_CC with AS_MESSAGE_LOG_FD.
+ * sysdeps/alpha/elf/configure.in: Likewise.
+ * sysdeps/i386/elf/configure.in: Likewise.
+ * sysdeps/mach/hurd/configure.in: Likewise.
+ * sysdeps/x86_64/elf/configure.in: Likewise.
* configure.in: Use AC_CONFIG_SRCDIR and new AC_INIT syntax.
- * sysdeps/alpha/elf/configure.in: Remove unneeded sinclude statement.
- * sysdeps/generic/configure.in: Likewise.
- * sysdeps/i386/elf/configure.in: Likewise.
- * sysdeps/ia64/elf/configure.in: Likewise.
- * sysdeps/mach/configure.in: Likewise.
- * sysdeps/mach/hurd/configure.in: Likewise.
- * sysdeps/unix/configure.in: Likewise.
- * sysdeps/unix/common/configure.in: Likewise.
- * sysdeps/unix/sysv/aix/configure.in: Likewise.
- * sysdeps/unix/sysv/linux/configure.in: Likewise.
- * sysdeps/unix/sysv/linux/mips/configure.in: Likewise.
- * sysdeps/x86_64/elf/configure.in: Likewise.
+ * sysdeps/alpha/elf/configure.in: Remove unneeded sinclude statement.
+ * sysdeps/generic/configure.in: Likewise.
+ * sysdeps/i386/elf/configure.in: Likewise.
+ * sysdeps/ia64/elf/configure.in: Likewise.
+ * sysdeps/mach/configure.in: Likewise.
+ * sysdeps/mach/hurd/configure.in: Likewise.
+ * sysdeps/unix/configure.in: Likewise.
+ * sysdeps/unix/common/configure.in: Likewise.
+ * sysdeps/unix/sysv/aix/configure.in: Likewise.
+ * sysdeps/unix/sysv/linux/configure.in: Likewise.
+ * sysdeps/unix/sysv/linux/mips/configure.in: Likewise.
+ * sysdeps/x86_64/elf/configure.in: Likewise.
* aclocal.m4: Use just the bits from AS_INIT that are needed for the
GLIBC_PROVIDES. Use plain comment instead of HEADER-COMMENT so
diff --git a/posix/Makefile b/posix/Makefile
index ede9d1fa1d..d483ee2b51 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -73,7 +73,8 @@ tests := tstgetopt testfnm runtests runptests \
tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \
- bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12
+ bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12 \
+ bug-regex13
ifeq (yes,$(build-shared))
test-srcs := globtest
tests += wordexp-test tst-exec tst-spawn
diff --git a/posix/bug-regex13.c b/posix/bug-regex13.c
new file mode 100644
index 0000000000..589293a7c0
--- /dev/null
+++ b/posix/bug-regex13.c
@@ -0,0 +1,75 @@
+/* Regular expression tests.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>, 2002.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <sys/types.h>
+#include <mcheck.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static struct
+{
+ int syntax;
+ const char *pattern;
+ const char *string;
+ int start;
+} tests[] = {
+ {RE_BACKSLASH_ESCAPE_IN_LISTS, "[0\\-9]", "1", -1}, /* It should not match. */
+ {RE_BACKSLASH_ESCAPE_IN_LISTS, "[0\\-9]", "-", 0}, /* It should match. */
+};
+
+int
+main (void)
+{
+ struct re_pattern_buffer regbuf;
+ const char *err;
+ size_t i;
+ int ret = 0;
+
+ mtrace ();
+
+ for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
+ {
+ int start;
+ re_set_syntax (tests[i].syntax);
+ memset (&regbuf, '\0', sizeof (regbuf));
+ err = re_compile_pattern (tests[i].pattern, strlen (tests[i].pattern),
+ &regbuf);
+ if (err != NULL)
+ {
+ printf ("re_compile_pattern failed: %s\n", err);
+ ret = 1;
+ continue;
+ }
+
+ start = re_search (&regbuf, tests[i].string, strlen (tests[i].string),
+ 0, strlen (tests[i].string), NULL);
+ if (start != tests[i].start)
+ {
+ printf ("re_search failed %d\n", start);
+ ret = 1;
+ regfree (&regbuf);
+ continue;
+ }
+ regfree (&regbuf);
+ }
+
+ return ret;
+}
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 715dd0f9a1..497d1301df 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -1690,7 +1690,8 @@ peek_token_bracket (token, input, syntax)
{
/* In this case, '\' escape a character. */
unsigned char c2;
- c2 = re_string_peek_byte (input, 1);
+ re_string_skip_bytes (input, 1);
+ c2 = re_string_peek_byte (input, 0);
token->opr.c = c2;
token->type = CHARACTER;
return 1;