[BZ #3957]
2007-02-05 Jakub Jelinek <jakub@redhat.com> [BZ #3957] * posix/regcomp.c (parse_bracket_exp): Set '\n' bit rather than '\0' bit for RE_HAT_LISTS_NOT_NEWLINE. (build_charclass_op): Remove bogus comment. * posix/Makefile (tests): Add bug-regex27 and bug-regex28. * posix/bug-regex27.c: New test. * posix/bug-regex28.c: New test.
This commit is contained in:
Ulrich Drepper
parent
bf7a246393
commit
784aacea3c
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2007-02-05 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
[BZ #3957]
|
||||
* posix/regcomp.c (parse_bracket_exp): Set '\n' bit rather than '\0'
|
||||
bit for RE_HAT_LISTS_NOT_NEWLINE.
|
||||
(build_charclass_op): Remove bogus comment.
|
||||
* posix/Makefile (tests): Add bug-regex27 and bug-regex28.
|
||||
* posix/bug-regex27.c: New test.
|
||||
* posix/bug-regex28.c: New test.
|
||||
|
||||
2007-02-03 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* po/sv.po: Update from translation team.
|
||||
|
|
|
|||
|
|
@ -81,7 +81,8 @@ tests := tstgetopt testfnm runtests runptests \
|
|||
bug-regex13 bug-regex14 bug-regex15 bug-regex16 \
|
||||
bug-regex17 bug-regex18 bug-regex19 bug-regex20 \
|
||||
bug-regex21 bug-regex22 bug-regex23 bug-regex24 \
|
||||
bug-regex25 bug-regex26 tst-nice tst-nanosleep tst-regex2 \
|
||||
bug-regex25 bug-regex26 bug-regex27 bug-regex28 \
|
||||
tst-nice tst-nanosleep tst-regex2 \
|
||||
transbug tst-rxspencer tst-pcre tst-boost \
|
||||
bug-ga1 tst-vfork1 tst-vfork2 tst-vfork3 tst-waitid \
|
||||
tst-getaddrinfo2 bug-glob1 bug-glob2 tst-sysconf \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
/* Test REG_NEWLINE.
|
||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jakub@redhat.com>, 2007.
|
||||
|
||||
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 <regex.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
struct tests
|
||||
{
|
||||
const char *regex;
|
||||
const char *string;
|
||||
int cflags;
|
||||
int retval;
|
||||
} tests[] = {
|
||||
{ "a.b", "a\nb", REG_EXTENDED | REG_NEWLINE, REG_NOMATCH },
|
||||
{ "a.b", "a\nb", REG_EXTENDED, 0 },
|
||||
{ "a[^x]b", "a\nb", REG_EXTENDED | REG_NEWLINE, REG_NOMATCH },
|
||||
{ "a[^x]b", "a\nb", REG_EXTENDED, 0 }
|
||||
};
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
regex_t r;
|
||||
size_t i;
|
||||
int ret = 0;
|
||||
|
||||
for (i = 0; i < sizeof (tests) / sizeof (tests[i]); ++i)
|
||||
{
|
||||
memset (&r, 0, sizeof (r));
|
||||
if (regcomp (&r, tests[i].regex, tests[i].cflags))
|
||||
{
|
||||
printf ("regcomp %zd failed\n", i);
|
||||
ret = 1;
|
||||
continue;
|
||||
}
|
||||
int rv = regexec (&r, tests[i].string, 0, NULL, 0);
|
||||
if (rv != tests[i].retval)
|
||||
{
|
||||
printf ("regexec %zd unexpected value %d != %d\n",
|
||||
i, rv, tests[i].retval);
|
||||
ret = 1;
|
||||
}
|
||||
regfree (&r);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
/* Test RE_HAT_LISTS_NOT_NEWLINE and RE_DOT_NEWLINE.
|
||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jakub@redhat.com>, 2007.
|
||||
|
||||
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 <regex.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
struct tests
|
||||
{
|
||||
const char *regex;
|
||||
const char *string;
|
||||
reg_syntax_t syntax;
|
||||
int retval;
|
||||
} tests[] = {
|
||||
#define EGREP RE_SYNTAX_EGREP
|
||||
#define EGREP_NL (RE_SYNTAX_EGREP | RE_DOT_NEWLINE) & ~RE_HAT_LISTS_NOT_NEWLINE
|
||||
{ "a.b", "a\nb", EGREP, -1 },
|
||||
{ "a.b", "a\nb", EGREP_NL, 0 },
|
||||
{ "a[^x]b", "a\nb", EGREP, -1 },
|
||||
{ "a[^x]b", "a\nb", EGREP_NL, 0 },
|
||||
/* While \S and \W are internally handled as [^[:space:]] and [^[:alnum:]_],
|
||||
RE_HAT_LISTS_NOT_NEWLINE did not make any difference, so ensure
|
||||
it doesn't change. */
|
||||
{ "a\\Sb", "a\nb", EGREP, -1 },
|
||||
{ "a\\Sb", "a\nb", EGREP_NL, -1 },
|
||||
{ "a\\Wb", "a\nb", EGREP, 0 },
|
||||
{ "a\\Wb", "a\nb", EGREP_NL, 0 }
|
||||
};
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
struct re_pattern_buffer r;
|
||||
size_t i;
|
||||
int ret = 0;
|
||||
|
||||
for (i = 0; i < sizeof (tests) / sizeof (tests[i]); ++i)
|
||||
{
|
||||
re_set_syntax (tests[i].syntax);
|
||||
memset (&r, 0, sizeof (r));
|
||||
if (re_compile_pattern (tests[i].regex, strlen (tests[i].regex), &r))
|
||||
{
|
||||
printf ("re_compile_pattern %zd failed\n", i);
|
||||
ret = 1;
|
||||
continue;
|
||||
}
|
||||
size_t len = strlen (tests[i].string);
|
||||
int rv = re_search (&r, tests[i].string, len, 0, len, NULL);
|
||||
if (rv != tests[i].retval)
|
||||
{
|
||||
printf ("re_search %zd unexpected value %d != %d\n",
|
||||
i, rv, tests[i].retval);
|
||||
ret = 1;
|
||||
}
|
||||
regfree (&r);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/* Extended regular expression matching and search library.
|
||||
Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
|
||||
|
||||
|
|
@ -3019,7 +3019,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
|
|||
#endif /* not RE_ENABLE_I18N */
|
||||
non_match = 1;
|
||||
if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
|
||||
bitset_set (sbcset, '\0');
|
||||
bitset_set (sbcset, '\n');
|
||||
re_string_skip_bytes (regexp, token_len); /* Skip a token. */
|
||||
token_len = peek_token_bracket (token, regexp, syntax);
|
||||
if (BE (token->type == END_OF_RE, 0))
|
||||
|
|
@ -3549,10 +3549,6 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
|
|||
if (non_match)
|
||||
{
|
||||
#ifdef RE_ENABLE_I18N
|
||||
/*
|
||||
if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
|
||||
bitset_set(cset->sbcset, '\0');
|
||||
*/
|
||||
mbcset->non_match = 1;
|
||||
#endif /* not RE_ENABLE_I18N */
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue