Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
/* Copyright (C) 2001, 2003 Free Software Foundation, Inc.
|
2001-06-26 11:14:04 +08:00
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 12:58:11 +08:00
|
|
|
|
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.
|
2001-06-26 11:14:04 +08:00
|
|
|
|
|
|
|
|
|
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
|
2001-07-06 12:58:11 +08:00
|
|
|
|
Lesser General Public License for more details.
|
2001-06-26 11:14:04 +08:00
|
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
|
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. */
|
2001-06-26 11:14:04 +08:00
|
|
|
|
|
|
|
|
|
#include <spawn.h>
|
|
|
|
|
#include "spawn_int.h"
|
|
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <error.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <iconv.h>
|
|
|
|
|
#include <locale.h>
|
|
|
|
|
#include <mcheck.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <regex.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
static clockid_t cl;
|
|
|
|
|
static int use_clock;
|
|
|
|
|
#endif
|
2001-06-27 15:11:22 +08:00
|
|
|
|
static iconv_t cd;
|
|
|
|
|
static char *mem;
|
|
|
|
|
static char *umem;
|
|
|
|
|
static size_t memlen;
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
static size_t umemlen;
|
2001-06-26 11:14:04 +08:00
|
|
|
|
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
static int test_expr (const char *expr, int expected, int expectedicase);
|
2001-06-27 15:11:22 +08:00
|
|
|
|
static int run_test (const char *expr, const char *mem, size_t memlen,
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
int icase, int expected);
|
|
|
|
|
static int run_test_backwards (const char *expr, const char *mem,
|
|
|
|
|
size_t memlen, int icase, int expected);
|
2001-06-26 11:14:04 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
main (void)
|
|
|
|
|
{
|
|
|
|
|
const char *file;
|
|
|
|
|
int fd;
|
|
|
|
|
struct stat st;
|
|
|
|
|
int result;
|
|
|
|
|
char *inmem;
|
|
|
|
|
char *outmem;
|
|
|
|
|
size_t inlen;
|
|
|
|
|
size_t outlen;
|
|
|
|
|
|
|
|
|
|
mtrace ();
|
|
|
|
|
|
|
|
|
|
/* Make the content of the file available in memory. */
|
|
|
|
|
file = "../ChangeLog.8";
|
|
|
|
|
fd = open (file, O_RDONLY);
|
|
|
|
|
if (fd == -1)
|
|
|
|
|
error (EXIT_FAILURE, errno, "cannot open %s", basename (file));
|
|
|
|
|
|
|
|
|
|
if (fstat (fd, &st) != 0)
|
|
|
|
|
error (EXIT_FAILURE, errno, "cannot stat %s", basename (file));
|
|
|
|
|
memlen = st.st_size;
|
|
|
|
|
|
|
|
|
|
mem = (char *) malloc (memlen + 1);
|
|
|
|
|
if (mem == NULL)
|
|
|
|
|
error (EXIT_FAILURE, errno, "while allocating buffer");
|
|
|
|
|
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
if ((size_t) read (fd, mem, memlen) != memlen)
|
2001-06-26 11:14:04 +08:00
|
|
|
|
error (EXIT_FAILURE, 0, "cannot read entire file");
|
|
|
|
|
mem[memlen] = '\0';
|
|
|
|
|
|
|
|
|
|
close (fd);
|
|
|
|
|
|
2001-06-28 06:27:03 +08:00
|
|
|
|
/* We have to convert a few things from Latin-1 to UTF-8. */
|
2001-06-26 11:14:04 +08:00
|
|
|
|
cd = iconv_open ("UTF-8", "ISO-8859-1");
|
|
|
|
|
if (cd == (iconv_t) -1)
|
|
|
|
|
error (EXIT_FAILURE, errno, "cannot get conversion descriptor");
|
|
|
|
|
|
2001-06-28 06:27:03 +08:00
|
|
|
|
/* For the second test we have to convert the file content to UTF-8.
|
|
|
|
|
Since the text is mostly ASCII it should be enough to allocate
|
|
|
|
|
twice as much memory for the UTF-8 text than for the Latin-1
|
|
|
|
|
text. */
|
|
|
|
|
umem = (char *) calloc (2, memlen);
|
|
|
|
|
if (umem == NULL)
|
|
|
|
|
error (EXIT_FAILURE, errno, "while allocating buffer");
|
|
|
|
|
|
2001-06-26 11:14:04 +08:00
|
|
|
|
inmem = mem;
|
|
|
|
|
inlen = memlen;
|
|
|
|
|
outmem = umem;
|
2001-06-28 06:27:03 +08:00
|
|
|
|
outlen = 2 * memlen - 1;
|
2001-06-26 11:14:04 +08:00
|
|
|
|
iconv (cd, &inmem, &inlen, &outmem, &outlen);
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
umemlen = outmem - umem;
|
2001-06-26 11:14:04 +08:00
|
|
|
|
if (inlen != 0)
|
|
|
|
|
error (EXIT_FAILURE, errno, "cannot convert buffer");
|
|
|
|
|
|
2001-06-27 15:11:22 +08:00
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
/* See whether we can use the CPU clock. */
|
|
|
|
|
use_clock = clock_getcpuclockid (0, &cl) == 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-06-28 06:27:03 +08:00
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
re_set_syntax (RE_DEBUG);
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-06-27 15:11:22 +08:00
|
|
|
|
/* Run the actual tests. All tests are run in a single-byte and a
|
|
|
|
|
multi-byte locale. */
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
result = test_expr ("[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]", 2, 2);
|
|
|
|
|
result |= test_expr ("G.ran", 2, 3);
|
|
|
|
|
result |= test_expr ("G.\\{1\\}ran", 2, 3);
|
|
|
|
|
result |= test_expr ("G.*ran", 3, 44);
|
|
|
|
|
result |= test_expr ("[<5B><><EFBFBD><EFBFBD>]", 0, 0);
|
2001-06-27 15:11:22 +08:00
|
|
|
|
|
|
|
|
|
/* Free the resources. */
|
2001-06-28 06:27:03 +08:00
|
|
|
|
free (umem);
|
2001-06-27 15:11:22 +08:00
|
|
|
|
iconv_close (cd);
|
|
|
|
|
free (mem);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
test_expr (const char *expr, int expected, int expectedicase)
|
2001-06-27 15:11:22 +08:00
|
|
|
|
{
|
|
|
|
|
int result;
|
|
|
|
|
char *inmem;
|
|
|
|
|
char *outmem;
|
|
|
|
|
size_t inlen;
|
|
|
|
|
size_t outlen;
|
|
|
|
|
char *uexpr;
|
|
|
|
|
|
|
|
|
|
/* First test: search with an ISO-8859-1 locale. */
|
|
|
|
|
if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL)
|
|
|
|
|
error (EXIT_FAILURE, 0, "cannot set locale de_DE.ISO-8859-1");
|
|
|
|
|
|
|
|
|
|
printf ("\nTest \"%s\" with 8-bit locale\n", expr);
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
result = run_test (expr, mem, memlen, 0, expected);
|
|
|
|
|
printf ("\nTest \"%s\" with 8-bit locale, case insensitive\n", expr);
|
|
|
|
|
result |= run_test (expr, mem, memlen, 1, expectedicase);
|
|
|
|
|
printf ("\nTest \"%s\" backwards with 8-bit locale\n", expr);
|
|
|
|
|
result |= run_test_backwards (expr, mem, memlen, 0, expected);
|
|
|
|
|
printf ("\nTest \"%s\" backwards with 8-bit locale, case insensitive\n",
|
|
|
|
|
expr);
|
|
|
|
|
result |= run_test_backwards (expr, mem, memlen, 1, expectedicase);
|
2001-06-27 15:11:22 +08:00
|
|
|
|
|
|
|
|
|
/* Second test: search with an UTF-8 locale. */
|
|
|
|
|
if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
|
|
|
|
|
error (EXIT_FAILURE, 0, "cannot set locale de_DE.UTF-8");
|
|
|
|
|
|
|
|
|
|
inmem = (char *) expr;
|
2001-06-26 11:14:04 +08:00
|
|
|
|
inlen = strlen (expr);
|
|
|
|
|
outlen = inlen * MB_CUR_MAX;
|
|
|
|
|
outmem = uexpr = alloca (outlen + 1);
|
2001-06-27 15:11:22 +08:00
|
|
|
|
memset (outmem, '\0', outlen + 1);
|
2001-06-26 11:14:04 +08:00
|
|
|
|
iconv (cd, &inmem, &inlen, &outmem, &outlen);
|
|
|
|
|
if (inlen != 0)
|
|
|
|
|
error (EXIT_FAILURE, errno, "cannot convert expression");
|
|
|
|
|
|
|
|
|
|
/* Run the tests. */
|
2001-06-27 15:11:22 +08:00
|
|
|
|
printf ("\nTest \"%s\" with multi-byte locale\n", expr);
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
result |= run_test (uexpr, umem, umemlen, 0, expected);
|
|
|
|
|
printf ("\nTest \"%s\" with multi-byte locale, case insensitive\n", expr);
|
|
|
|
|
result |= run_test (uexpr, umem, umemlen, 1, expectedicase);
|
|
|
|
|
printf ("\nTest \"%s\" backwards with multi-byte locale\n", expr);
|
|
|
|
|
result |= run_test_backwards (uexpr, umem, umemlen, 0, expected);
|
|
|
|
|
printf ("\nTest \"%s\" backwards with multi-byte locale, case insensitive\n",
|
|
|
|
|
expr);
|
|
|
|
|
result |= run_test_backwards (uexpr, umem, umemlen, 1, expectedicase);
|
2001-06-26 11:14:04 +08:00
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
run_test (const char *expr, const char *mem, size_t memlen, int icase,
|
|
|
|
|
int expected)
|
2001-06-26 11:14:04 +08:00
|
|
|
|
{
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
struct timespec start;
|
|
|
|
|
struct timespec finish;
|
|
|
|
|
#endif
|
|
|
|
|
regex_t re;
|
|
|
|
|
int err;
|
|
|
|
|
size_t offset;
|
|
|
|
|
int cnt;
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
if (use_clock)
|
|
|
|
|
use_clock = clock_gettime (cl, &start) == 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
err = regcomp (&re, expr, REG_NEWLINE | (icase ? REG_ICASE : 0));
|
2001-06-26 11:14:04 +08:00
|
|
|
|
if (err != REG_NOERROR)
|
|
|
|
|
{
|
|
|
|
|
char buf[200];
|
|
|
|
|
regerror (err, &re, buf, sizeof buf);
|
|
|
|
|
error (EXIT_FAILURE, 0, "cannot compile expression: %s", buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cnt = 0;
|
|
|
|
|
offset = 0;
|
|
|
|
|
assert (mem[memlen] == '\0');
|
|
|
|
|
while (offset < memlen)
|
|
|
|
|
{
|
|
|
|
|
regmatch_t ma[1];
|
|
|
|
|
const char *sp;
|
|
|
|
|
const char *ep;
|
|
|
|
|
|
|
|
|
|
err = regexec (&re, mem + offset, 1, ma, 0);
|
|
|
|
|
if (err == REG_NOMATCH)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (err != REG_NOERROR)
|
|
|
|
|
{
|
|
|
|
|
char buf[200];
|
|
|
|
|
regerror (err, &re, buf, sizeof buf);
|
|
|
|
|
error (EXIT_FAILURE, 0, "cannot use expression: %s", buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert (ma[0].rm_so >= 0);
|
|
|
|
|
sp = mem + offset + ma[0].rm_so;
|
2001-06-27 15:11:22 +08:00
|
|
|
|
while (sp > mem && sp[-1] != '\n')
|
2001-06-26 11:14:04 +08:00
|
|
|
|
--sp;
|
|
|
|
|
|
|
|
|
|
ep = mem + offset + ma[0].rm_so;
|
|
|
|
|
while (*ep != '\0' && *ep != '\n')
|
|
|
|
|
++ep;
|
|
|
|
|
|
|
|
|
|
printf ("match %d: \"%.*s\"\n", ++cnt, (int) (ep - sp), sp);
|
|
|
|
|
|
|
|
|
|
offset = ep + 1 - mem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
regfree (&re);
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
if (use_clock)
|
|
|
|
|
{
|
|
|
|
|
use_clock = clock_gettime (cl, &finish) == 0;
|
|
|
|
|
if (use_clock)
|
|
|
|
|
{
|
|
|
|
|
if (finish.tv_nsec < start.tv_nsec)
|
|
|
|
|
{
|
|
|
|
|
finish.tv_nsec -= start.tv_nsec - 1000000000;
|
|
|
|
|
finish.tv_sec -= 1 + start.tv_sec;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
finish.tv_nsec -= start.tv_nsec;
|
|
|
|
|
finish.tv_sec -= start.tv_sec;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf ("elapsed time: %ld.%09ld sec\n",
|
|
|
|
|
finish.tv_sec, finish.tv_nsec);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Return an error if the number of matches found is not match we
|
|
|
|
|
expect. */
|
2001-06-27 15:11:22 +08:00
|
|
|
|
return cnt != expected;
|
2001-06-26 11:14:04 +08:00
|
|
|
|
}
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-13 01:47:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
run_test_backwards (const char *expr, const char *mem, size_t memlen,
|
|
|
|
|
int icase, int expected)
|
|
|
|
|
{
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
struct timespec start;
|
|
|
|
|
struct timespec finish;
|
|
|
|
|
#endif
|
|
|
|
|
struct re_pattern_buffer re;
|
|
|
|
|
const char *err;
|
|
|
|
|
size_t offset;
|
|
|
|
|
int cnt;
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
if (use_clock)
|
|
|
|
|
use_clock = clock_gettime (cl, &start) == 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
re_set_syntax ((RE_SYNTAX_POSIX_BASIC & ~RE_DOT_NEWLINE)
|
|
|
|
|
| RE_HAT_LISTS_NOT_NEWLINE
|
|
|
|
|
| (icase ? RE_ICASE : 0));
|
|
|
|
|
|
|
|
|
|
memset (&re, 0, sizeof (re));
|
|
|
|
|
re.fastmap = malloc (256);
|
|
|
|
|
if (re.fastmap == NULL)
|
|
|
|
|
error (EXIT_FAILURE, errno, "cannot allocate fastmap");
|
|
|
|
|
|
|
|
|
|
err = re_compile_pattern (expr, strlen (expr), &re);
|
|
|
|
|
if (err != NULL)
|
|
|
|
|
error (EXIT_FAILURE, 0, "cannot compile expression: %s", err);
|
|
|
|
|
|
|
|
|
|
if (re_compile_fastmap (&re))
|
|
|
|
|
error (EXIT_FAILURE, 0, "couldn't compile fastmap");
|
|
|
|
|
|
|
|
|
|
cnt = 0;
|
|
|
|
|
offset = memlen;
|
|
|
|
|
assert (mem[memlen] == '\0');
|
|
|
|
|
while (offset <= memlen)
|
|
|
|
|
{
|
|
|
|
|
int start;
|
|
|
|
|
const char *sp;
|
|
|
|
|
const char *ep;
|
|
|
|
|
|
|
|
|
|
start = re_search (&re, mem, memlen, offset, -offset, NULL);
|
|
|
|
|
if (start == -1)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (start == -2)
|
|
|
|
|
error (EXIT_FAILURE, 0, "internal error in re_search");
|
|
|
|
|
|
|
|
|
|
sp = mem + start;
|
|
|
|
|
while (sp > mem && sp[-1] != '\n')
|
|
|
|
|
--sp;
|
|
|
|
|
|
|
|
|
|
ep = mem + start;
|
|
|
|
|
while (*ep != '\0' && *ep != '\n')
|
|
|
|
|
++ep;
|
|
|
|
|
|
|
|
|
|
printf ("match %d: \"%.*s\"\n", ++cnt, (int) (ep - sp), sp);
|
|
|
|
|
|
|
|
|
|
offset = sp - 1 - mem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
regfree (&re);
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_CPUTIME
|
|
|
|
|
if (use_clock)
|
|
|
|
|
{
|
|
|
|
|
use_clock = clock_gettime (cl, &finish) == 0;
|
|
|
|
|
if (use_clock)
|
|
|
|
|
{
|
|
|
|
|
if (finish.tv_nsec < start.tv_nsec)
|
|
|
|
|
{
|
|
|
|
|
finish.tv_nsec -= start.tv_nsec - 1000000000;
|
|
|
|
|
finish.tv_sec -= 1 + start.tv_sec;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
finish.tv_nsec -= start.tv_nsec;
|
|
|
|
|
finish.tv_sec -= start.tv_sec;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf ("elapsed time: %ld.%09ld sec\n",
|
|
|
|
|
finish.tv_sec, finish.tv_nsec);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Return an error if the number of matches found is not match we
|
|
|
|
|
expect. */
|
|
|
|
|
return cnt != expected;
|
|
|
|
|
}
|