octave-lojdl/gnulib-hg: lib/regex

annotate lib/regex_internal.c @ 6186:7a0537a5ad1b

* lib/regex_internal.c (re_string_reconstruct): Don't assume buffer lengths fit in regoff_t; this isn't true if regoff_t is the same width as size_t. * lib/regex.c (re_search_internal): 5th arg is LAST_START (= START + RANGE) instead of RANGE. This avoids overflow problems when regoff_t is the same width as size_t. All callers changed. (re_search_2_stub): Check for overflow when adding the sizes of the two strings. (re_search_stub): Check for overflow when adding START to RANGE; if it occurs, substitute the extreme value. * config/srclist.txt: Add glibc bug 1284.

author	Paul Eggert <eggert@cs.ucla.edu>
date	Thu, 01 Sep 2005 07:03:01 +0000
parents	6b09f7f6ba73
children	25eaa608fc4e

rev	line source
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1 /* Extended regular expression matching and search library.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2 Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3 This file is part of the GNU C Library.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4 Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	5
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	6 This program is free software; you can redistribute it and/or modify
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	7 it under the terms of the GNU General Public License as published by
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	8 the Free Software Foundation; either version 2, or (at your option)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	9 any later version.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	10
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	11 This program is distributed in the hope that it will be useful,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	12 but WITHOUT ANY WARRANTY; without even the implied warranty of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	14 GNU General Public License for more details.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	15
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	16 You should have received a copy of the GNU General Public License along
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	17 with this program; if not, write to the Free Software Foundation,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	18 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	19
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	20 static void re_string_construct_common (const char *str, Idx len,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	21 re_string_t *pstr,
6101 c9bcd4ba6b3f * config/srclist.txt: Add glibc bug 1237. Paul Eggert <eggert@cs.ucla.edu> parents: 6084 diff changeset	22 REG_TRANSLATE_TYPE trans, int icase,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	23 const re_dfa_t *dfa) internal_function;
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	24 static re_dfastate_t create_ci_newstate (const re_dfa_t dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	25 const re_node_set *nodes,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	26 re_hashval_t hash) internal_function;
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	27 static re_dfastate_t create_cd_newstate (const re_dfa_t dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	28 const re_node_set *nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	29 unsigned int context,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	30 re_hashval_t hash) internal_function;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	31
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	32 /* Functions for string operation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	33
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	34 /* This function allocate the buffers. It is necessary to call
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	35 re_string_reconstruct before using the object. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	36
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	37 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	38 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	39 re_string_allocate (re_string_t pstr, const char str, Idx len, Idx init_len,
6101 c9bcd4ba6b3f * config/srclist.txt: Add glibc bug 1237. Paul Eggert <eggert@cs.ucla.edu> parents: 6084 diff changeset	40 REG_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	41 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	42 reg_errcode_t ret;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	43 Idx init_buf_len;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	44
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	45 /* Ensure at least one character fits into the buffers. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	46 if (init_len < dfa->mb_cur_max)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	47 init_len = dfa->mb_cur_max;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	48 init_buf_len = (len + 1 < init_len) ? len + 1: init_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	49 re_string_construct_common (str, len, pstr, trans, icase, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	50
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	51 ret = re_string_realloc_buffers (pstr, init_buf_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	52 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	53 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	54
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	55 pstr->word_char = dfa->word_char;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	56 pstr->word_ops_used = dfa->word_ops_used;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	57 pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	58 pstr->valid_len = (pstr->mbs_allocated \|\| dfa->mb_cur_max > 1) ? 0 : len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	59 pstr->valid_raw_len = pstr->valid_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	60 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	61 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	62
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	63 /* This function allocate the buffers, and initialize them. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	64
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	65 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	66 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	67 re_string_construct (re_string_t pstr, const char str, Idx len,
6101 c9bcd4ba6b3f * config/srclist.txt: Add glibc bug 1237. Paul Eggert <eggert@cs.ucla.edu> parents: 6084 diff changeset	68 REG_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	69 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	70 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	71 memset (pstr, '\0', sizeof (re_string_t));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	72 re_string_construct_common (str, len, pstr, trans, icase, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	73
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	74 if (len > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	75 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	76 ret = re_string_realloc_buffers (pstr, len + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	77 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	78 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	79 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	80 pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	81
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	82 if (icase)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	83 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	84 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	85 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	86 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	87 while (1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	88 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	89 ret = build_wcs_upper_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	90 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	91 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	92 if (pstr->valid_raw_len >= len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	93 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	94 if (pstr->bufs_len > pstr->valid_len + dfa->mb_cur_max)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	95 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	96 ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	97 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	98 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	99 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	100 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	101 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	102 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	103 build_upper_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	104 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	105 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	106 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	107 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	108 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	109 build_wcs_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	110 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	111 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	112 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	113 if (trans != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	114 re_string_translate_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	115 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	116 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	117 pstr->valid_len = pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	118 pstr->valid_raw_len = pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	119 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	120 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	121 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	122
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	123 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	124 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	125
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	126 /* Helper functions for re_string_allocate, and re_string_construct. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	127
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	128 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	129 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	130 re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	131 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	132 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	133 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	134 {
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	135 wint_t *new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	136 if (BE (new_wcs == NULL, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	137 return REG_ESPACE;
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	138 pstr->wcs = new_wcs;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	139 if (pstr->offsets != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	140 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	141 Idx *new_offsets = re_realloc (pstr->offsets, Idx, new_buf_len);
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	142 if (BE (new_offsets == NULL, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	143 return REG_ESPACE;
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	144 pstr->offsets = new_offsets;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	145 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	146 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	147 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	148 if (pstr->mbs_allocated)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	149 {
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	150 unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	151 new_buf_len);
82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	152 if (BE (new_mbs == NULL, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	153 return REG_ESPACE;
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	154 pstr->mbs = new_mbs;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	155 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	156 pstr->bufs_len = new_buf_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	157 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	158 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	159
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	160
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	161 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	162 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	163 re_string_construct_common (const char str, Idx len, re_string_t pstr,
6101 c9bcd4ba6b3f * config/srclist.txt: Add glibc bug 1237. Paul Eggert <eggert@cs.ucla.edu> parents: 6084 diff changeset	164 REG_TRANSLATE_TYPE trans, int icase,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	165 const re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	166 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	167 pstr->raw_mbs = (const unsigned char *) str;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	168 pstr->len = len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	169 pstr->raw_len = len;
6101 c9bcd4ba6b3f * config/srclist.txt: Add glibc bug 1237. Paul Eggert <eggert@cs.ucla.edu> parents: 6084 diff changeset	170 pstr->trans = (unsigned REG_TRANSLATE_TYPE) trans;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	171 pstr->icase = icase ? 1 : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	172 pstr->mbs_allocated = (trans != NULL \|\| icase);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	173 pstr->mb_cur_max = dfa->mb_cur_max;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	174 pstr->is_utf8 = dfa->is_utf8;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	175 pstr->map_notascii = dfa->map_notascii;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	176 pstr->stop = pstr->len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	177 pstr->raw_stop = pstr->stop;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	178 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	179
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	180 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	181
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	182 /* Build wide character buffer PSTR->WCS.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	183 If the byte sequence of the string are:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	184 <mb1>(0), <mb1>(1), <mb2>(0), <mb2>(1), <sb3>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	185 Then wide character buffer will be:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	186 <wc1> , WEOF , <wc2> , WEOF , <wc3>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	187 We use WEOF for padding, they indicate that the position isn't
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	188 a first byte of a multibyte character.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	189
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	190 Note that this function assumes PSTR->VALID_LEN elements are already
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	191 built and starts from PSTR->VALID_LEN. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	192
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	193 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	194 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	195 build_wcs_buffer (re_string_t *pstr)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	196 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	197 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	198 unsigned char buf[MB_LEN_MAX];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	199 assert (MB_LEN_MAX >= pstr->mb_cur_max);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	200 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	201 unsigned char buf[64];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	202 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	203 mbstate_t prev_st;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	204 Idx byte_idx, end_idx, remain_len;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	205 size_t mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	206
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	207 /* Build the buffers from pstr->valid_len to either pstr->len or
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	208 pstr->bufs_len. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	209 end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	210 for (byte_idx = pstr->valid_len; byte_idx < end_idx;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	211 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	212 wchar_t wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	213 const char *p;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	214
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	215 remain_len = end_idx - byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	216 prev_st = pstr->cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	217 /* Apply the translation if we need. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	218 if (BE (pstr->trans != NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	219 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	220 int i, ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	221
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	222 for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	223 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	224 ch = pstr->raw_mbs [pstr->raw_mbs_idx + byte_idx + i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	225 buf[i] = pstr->mbs[byte_idx + i] = pstr->trans[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	226 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	227 p = (const char *) buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	228 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	229 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	230 p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	231 mbclen = mbrtowc (&wc, p, remain_len, &pstr->cur_state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	232 if (BE (mbclen == (size_t) -2, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	233 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	234 /* The buffer doesn't have enough space, finish to build. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	235 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	236 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	237 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	238 else if (BE (mbclen == (size_t) -1 \|\| mbclen == 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	239 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	240 /* We treat these cases as a singlebyte character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	241 mbclen = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	242 wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	243 if (BE (pstr->trans != NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	244 wc = pstr->trans[wc];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	245 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	246 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	247
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	248 /* Write wide character and padding. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	249 pstr->wcs[byte_idx++] = wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	250 /* Write paddings. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	251 for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	252 pstr->wcs[byte_idx++] = WEOF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	253 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	254 pstr->valid_len = byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	255 pstr->valid_raw_len = byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	256 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	257
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	258 /* Build wide character buffer PSTR->WCS like build_wcs_buffer,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	259 but for REG_ICASE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	260
6119 c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	261 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	262 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	263 build_wcs_upper_buffer (re_string_t *pstr)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	264 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	265 mbstate_t prev_st;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	266 Idx src_idx, byte_idx, end_idx, remain_len;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	267 size_t mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	268 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	269 char buf[MB_LEN_MAX];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	270 assert (MB_LEN_MAX >= pstr->mb_cur_max);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	271 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	272 char buf[64];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	273 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	274
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	275 byte_idx = pstr->valid_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	276 end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	277
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	278 /* The following optimization assumes that ASCII characters can be
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	279 mapped to wide characters with a simple cast. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	280 if (! pstr->map_notascii && pstr->trans == NULL && !pstr->offsets_needed)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	281 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	282 while (byte_idx < end_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	283 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	284 wchar_t wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	285
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	286 if (isascii (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	287 && mbsinit (&pstr->cur_state))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	288 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	289 /* In case of a singlebyte character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	290 pstr->mbs[byte_idx]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	291 = toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	292 /* The next step uses the assumption that wchar_t is encoded
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	293 ASCII-safe: all ASCII values can be converted like this. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	294 pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	295 ++byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	296 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	297 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	298
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	299 remain_len = end_idx - byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	300 prev_st = pstr->cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	301 mbclen = mbrtowc (&wc,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	302 ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	303 + byte_idx), remain_len, &pstr->cur_state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	304 if (BE (mbclen + 2 > 2, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	305 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	306 wchar_t wcu = wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	307 if (iswlower (wc))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	308 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	309 size_t mbcdlen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	310
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	311 wcu = towupper (wc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	312 mbcdlen = wcrtomb (buf, wcu, &prev_st);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	313 if (BE (mbclen == mbcdlen, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	314 memcpy (pstr->mbs + byte_idx, buf, mbclen);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	315 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	316 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	317 src_idx = byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	318 goto offsets_needed;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	319 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	320 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	321 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	322 memcpy (pstr->mbs + byte_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	323 pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx, mbclen);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	324 pstr->wcs[byte_idx++] = wcu;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	325 /* Write paddings. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	326 for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	327 pstr->wcs[byte_idx++] = WEOF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	328 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	329 else if (mbclen == (size_t) -1 \|\| mbclen == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	330 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	331 /* It is an invalid character or '\0'. Just use the byte. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	332 int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	333 pstr->mbs[byte_idx] = ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	334 /* And also cast it to wide char. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	335 pstr->wcs[byte_idx++] = (wchar_t) ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	336 if (BE (mbclen == (size_t) -1, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	337 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	338 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	339 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	340 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	341 /* The buffer doesn't have enough space, finish to build. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	342 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	343 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	344 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	345 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	346 pstr->valid_len = byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	347 pstr->valid_raw_len = byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	348 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	349 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	350 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	351 for (src_idx = pstr->valid_raw_len; byte_idx < end_idx;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	352 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	353 wchar_t wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	354 const char *p;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	355 offsets_needed:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	356 remain_len = end_idx - byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	357 prev_st = pstr->cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	358 if (BE (pstr->trans != NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	359 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	360 int i, ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	361
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	362 for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	363 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	364 ch = pstr->raw_mbs [pstr->raw_mbs_idx + src_idx + i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	365 buf[i] = pstr->trans[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	366 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	367 p = (const char *) buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	368 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	369 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	370 p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	371 mbclen = mbrtowc (&wc, p, remain_len, &pstr->cur_state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	372 if (BE (mbclen + 2 > 2, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	373 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	374 wchar_t wcu = wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	375 if (iswlower (wc))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	376 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	377 size_t mbcdlen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	378
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	379 wcu = towupper (wc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	380 mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	381 if (BE (mbclen == mbcdlen, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	382 memcpy (pstr->mbs + byte_idx, buf, mbclen);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	383 else if (mbcdlen != (size_t) -1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	384 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	385 size_t i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	386
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	387 if (byte_idx + mbcdlen > pstr->bufs_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	388 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	389 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	390 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	391 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	392
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	393 if (pstr->offsets == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	394 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	395 pstr->offsets = re_malloc (Idx, pstr->bufs_len);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	396
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	397 if (pstr->offsets == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	398 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	399 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	400 if (!pstr->offsets_needed)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	401 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	402 for (i = 0; i < (size_t) byte_idx; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	403 pstr->offsets[i] = i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	404 pstr->offsets_needed = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	405 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	406
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	407 memcpy (pstr->mbs + byte_idx, buf, mbcdlen);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	408 pstr->wcs[byte_idx] = wcu;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	409 pstr->offsets[byte_idx] = src_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	410 for (i = 1; i < mbcdlen; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	411 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	412 pstr->offsets[byte_idx + i]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	413 = src_idx + (i < mbclen ? i : mbclen - 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	414 pstr->wcs[byte_idx + i] = WEOF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	415 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	416 pstr->len += mbcdlen - mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	417 if (pstr->raw_stop > src_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	418 pstr->stop += mbcdlen - mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	419 end_idx = (pstr->bufs_len > pstr->len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	420 ? pstr->len : pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	421 byte_idx += mbcdlen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	422 src_idx += mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	423 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	424 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	425 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	426 memcpy (pstr->mbs + byte_idx, p, mbclen);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	427 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	428 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	429 memcpy (pstr->mbs + byte_idx, p, mbclen);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	430
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	431 if (BE (pstr->offsets_needed != 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	432 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	433 size_t i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	434 for (i = 0; i < mbclen; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	435 pstr->offsets[byte_idx + i] = src_idx + i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	436 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	437 src_idx += mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	438
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	439 pstr->wcs[byte_idx++] = wcu;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	440 /* Write paddings. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	441 for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	442 pstr->wcs[byte_idx++] = WEOF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	443 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	444 else if (mbclen == (size_t) -1 \|\| mbclen == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	445 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	446 /* It is an invalid character or '\0'. Just use the byte. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	447 int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	448
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	449 if (BE (pstr->trans != NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	450 ch = pstr->trans [ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	451 pstr->mbs[byte_idx] = ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	452
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	453 if (BE (pstr->offsets_needed != 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	454 pstr->offsets[byte_idx] = src_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	455 ++src_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	456
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	457 /* And also cast it to wide char. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	458 pstr->wcs[byte_idx++] = (wchar_t) ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	459 if (BE (mbclen == (size_t) -1, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	460 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	461 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	462 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	463 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	464 /* The buffer doesn't have enough space, finish to build. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	465 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	466 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	467 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	468 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	469 pstr->valid_len = byte_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	470 pstr->valid_raw_len = src_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	471 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	472 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	473
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	474 /* Skip characters until the index becomes greater than NEW_RAW_IDX.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	475 Return the index. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	476
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	477 static Idx
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	478 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	479 re_string_skip_chars (re_string_t pstr, Idx new_raw_idx, wint_t last_wc)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	480 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	481 mbstate_t prev_st;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	482 Idx rawbuf_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	483 size_t mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	484 wchar_t wc = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	485
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	486 /* Skip the characters which are not necessary to check. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	487 for (rawbuf_idx = pstr->raw_mbs_idx + pstr->valid_raw_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	488 rawbuf_idx < new_raw_idx;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	489 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	490 Idx remain_len;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	491 remain_len = pstr->len - rawbuf_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	492 prev_st = pstr->cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	493 mbclen = mbrtowc (&wc, (const char *) pstr->raw_mbs + rawbuf_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	494 remain_len, &pstr->cur_state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	495 if (BE (mbclen == (size_t) -2 \|\| mbclen == (size_t) -1 \|\| mbclen == 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	496 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	497 /* We treat these cases as a singlebyte character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	498 mbclen = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	499 pstr->cur_state = prev_st;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	500 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	501 /* Then proceed the next character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	502 rawbuf_idx += mbclen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	503 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	504 *last_wc = (wint_t) wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	505 return rawbuf_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	506 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	507 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	508
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	509 /* Build the buffer PSTR->MBS, and apply the translation if we need.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	510 This function is used in case of REG_ICASE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	511
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	512 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	513 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	514 build_upper_buffer (re_string_t *pstr)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	515 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	516 Idx char_idx, end_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	517 end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	518
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	519 for (char_idx = pstr->valid_len; char_idx < end_idx; ++char_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	520 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	521 int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	522 if (BE (pstr->trans != NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	523 ch = pstr->trans[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	524 if (islower (ch))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	525 pstr->mbs[char_idx] = toupper (ch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	526 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	527 pstr->mbs[char_idx] = ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	528 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	529 pstr->valid_len = char_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	530 pstr->valid_raw_len = char_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	531 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	532
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	533 /* Apply TRANS to the buffer in PSTR. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	534
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	535 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	536 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	537 re_string_translate_buffer (re_string_t *pstr)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	538 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	539 Idx buf_idx, end_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	540 end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	541
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	542 for (buf_idx = pstr->valid_len; buf_idx < end_idx; ++buf_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	543 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	544 int ch = pstr->raw_mbs[pstr->raw_mbs_idx + buf_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	545 pstr->mbs[buf_idx] = pstr->trans[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	546 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	547
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	548 pstr->valid_len = buf_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	549 pstr->valid_raw_len = buf_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	550 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	551
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	552 /* This function re-construct the buffers.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	553 Concretely, convert to wide character in case of pstr->mb_cur_max > 1,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	554 convert to upper case in case of REG_ICASE, apply translation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	555
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	556 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	557 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	558 re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	559 {
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	560 Idx offset;
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	561
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	562 if (BE (pstr->raw_mbs_idx <= idx, 0))
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	563 offset = idx - pstr->raw_mbs_idx;
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	564 else
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	565 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	566 /* Reset buffer. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	567 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	568 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	569 memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	570 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	571 pstr->len = pstr->raw_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	572 pstr->stop = pstr->raw_stop;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	573 pstr->valid_len = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	574 pstr->raw_mbs_idx = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	575 pstr->valid_raw_len = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	576 pstr->offsets_needed = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	577 pstr->tip_context = ((eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	578 : CONTEXT_NEWLINE \| CONTEXT_BEGBUF);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	579 if (!pstr->mbs_allocated)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	580 pstr->mbs = (unsigned char *) pstr->raw_mbs;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	581 offset = idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	582 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	583
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	584 if (BE (offset != 0, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	585 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	586 /* Are the characters which are already checked remain? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	587 if (BE (offset < pstr->valid_raw_len, 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	588 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	589 /* Handling this would enlarge the code too much.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	590 Accept a slowdown in that case. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	591 && pstr->offsets_needed == 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	592 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	593 )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	594 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	595 /* Yes, move them to the front of the buffer. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	596 pstr->tip_context = re_string_context_at (pstr, offset - 1, eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	597 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	598 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	599 memmove (pstr->wcs, pstr->wcs + offset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	600 (pstr->valid_len - offset) * sizeof (wint_t));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	601 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	602 if (BE (pstr->mbs_allocated, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	603 memmove (pstr->mbs, pstr->mbs + offset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	604 pstr->valid_len - offset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	605 pstr->valid_len -= offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	606 pstr->valid_raw_len -= offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	607 #if DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	608 assert (pstr->valid_len > 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	609 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	610 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	611 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	612 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	613 /* No, skip all characters until IDX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	614 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	615 if (BE (pstr->offsets_needed, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	616 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	617 pstr->len = pstr->raw_len - idx + offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	618 pstr->stop = pstr->raw_stop - idx + offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	619 pstr->offsets_needed = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	620 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	621 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	622 pstr->valid_len = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	623 pstr->valid_raw_len = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	624 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	625 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	626 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	627 Idx wcs_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	628 wint_t wc = WEOF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	629
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	630 if (pstr->is_utf8)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	631 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	632 const unsigned char raw, p, q, end;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	633
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	634 /* Special case UTF-8. Multi-byte chars start with any
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	635 byte other than 0x80 - 0xbf. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	636 raw = pstr->raw_mbs + pstr->raw_mbs_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	637 end = raw + (offset - pstr->mb_cur_max);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	638 for (p = raw + offset - 1; p >= end; --p)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	639 if ((*p & 0xc0) != 0x80)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	640 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	641 mbstate_t cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	642 wchar_t wc2;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	643 Idx mlen = raw + pstr->len - p;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	644 unsigned char buf[6];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	645
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	646 q = p;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	647 if (BE (pstr->trans != NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	648 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	649 int i = mlen < 6 ? mlen : 6;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	650 while (--i >= 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	651 buf[i] = pstr->trans[p[i]];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	652 q = buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	653 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	654 /* XXX Don't use mbrtowc, we know which conversion
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	655 to use (UTF-8 -> UCS4). */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	656 memset (&cur_state, 0, sizeof (cur_state));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	657 mlen = (mbrtowc (&wc2, (const char *) p, mlen,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	658 &cur_state)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	659 - (raw + offset - p));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	660 if (mlen >= 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	661 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	662 memset (&pstr->cur_state, '\0',
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	663 sizeof (mbstate_t));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	664 pstr->valid_len = mlen;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	665 wc = wc2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	666 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	667 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	668 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	669 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	670
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	671 if (wc == WEOF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	672 pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	673 if (BE (pstr->valid_len, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	674 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	675 for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	676 pstr->wcs[wcs_idx] = WEOF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	677 if (pstr->mbs_allocated)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	678 memset (pstr->mbs, 255, pstr->valid_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	679 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	680 pstr->valid_raw_len = pstr->valid_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	681 pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	682 && IS_WIDE_WORD_CHAR (wc))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	683 ? CONTEXT_WORD
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	684 : ((IS_WIDE_NEWLINE (wc)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	685 && pstr->newline_anchor)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	686 ? CONTEXT_NEWLINE : 0));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	687 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	688 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	689 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	690 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	691 int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	692 if (pstr->trans)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	693 c = pstr->trans[c];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	694 pstr->tip_context = (bitset_contain (pstr->word_char, c)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	695 ? CONTEXT_WORD
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	696 : ((IS_NEWLINE (c) && pstr->newline_anchor)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	697 ? CONTEXT_NEWLINE : 0));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	698 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	699 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	700 if (!BE (pstr->mbs_allocated, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	701 pstr->mbs += offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	702 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	703 pstr->raw_mbs_idx = idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	704 pstr->len -= offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	705 pstr->stop -= offset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	706
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	707 /* Then build the buffers. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	708 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	709 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	710 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	711 if (pstr->icase)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	712 {
6119 c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	713 reg_errcode_t ret = build_wcs_upper_buffer (pstr);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	714 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	715 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	716 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	717 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	718 build_wcs_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	719 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	720 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	721 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	722 if (BE (pstr->mbs_allocated, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	723 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	724 if (pstr->icase)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	725 build_upper_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	726 else if (pstr->trans != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	727 re_string_translate_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	728 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	729 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	730 pstr->valid_len = pstr->len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	731
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	732 pstr->cur_idx = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	733 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	734 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	735
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	736 static unsigned char
6129 2fce0cb93f59 * config/srclist.text: Add glibc bug 1248. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	737 internal_function __attribute ((pure))
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	738 re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	739 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	740 int ch;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	741 Idx off;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	742
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	743 /* Handle the common (easiest) cases first. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	744 if (BE (!pstr->mbs_allocated, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	745 return re_string_peek_byte (pstr, idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	746
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	747 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	748 if (pstr->mb_cur_max > 1
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	749 && ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	750 return re_string_peek_byte (pstr, idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	751 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	752
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	753 off = pstr->cur_idx + idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	754 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	755 if (pstr->offsets_needed)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	756 off = pstr->offsets[off];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	757 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	758
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	759 ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	760
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	761 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	762 /* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	763 this function returns CAPITAL LETTER I instead of first byte of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	764 DOTLESS SMALL LETTER I. The latter would confuse the parser,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	765 since peek_byte_case doesn't advance cur_idx in any way. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	766 if (pstr->offsets_needed && !isascii (ch))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	767 return re_string_peek_byte (pstr, idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	768 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	769
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	770 return ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	771 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	772
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	773 static unsigned char
6129 2fce0cb93f59 * config/srclist.text: Add glibc bug 1248. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	774 internal_function __attribute ((pure))
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	775 re_string_fetch_byte_case (re_string_t *pstr)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	776 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	777 if (BE (!pstr->mbs_allocated, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	778 return re_string_fetch_byte (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	779
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	780 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	781 if (pstr->offsets_needed)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	782 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	783 Idx off;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	784 int ch;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	785
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	786 /* For tr_TR.UTF-8 [[:islower:]] there is
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	787 [[: CAPITAL LETTER I WITH DOT lower:]] in mbs. Skip
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	788 in that case the whole multi-byte character and return
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	789 the original letter. On the other side, with
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	790 [[: DOTLESS SMALL LETTER I return [[:I, as doing
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	791 anything else would complicate things too much. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	792
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	793 if (!re_string_first_byte (pstr, pstr->cur_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	794 return re_string_fetch_byte (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	795
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	796 off = pstr->offsets[pstr->cur_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	797 ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	798
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	799 if (! isascii (ch))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	800 return re_string_fetch_byte (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	801
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	802 re_string_skip_bytes (pstr,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	803 re_string_char_size_at (pstr, pstr->cur_idx));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	804 return ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	805 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	806 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	807
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	808 return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	809 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	810
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	811 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	812 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	813 re_string_destruct (re_string_t *pstr)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	814 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	815 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	816 re_free (pstr->wcs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	817 re_free (pstr->offsets);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	818 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	819 if (pstr->mbs_allocated)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	820 re_free (pstr->mbs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	821 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	822
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	823 /* Return the context at IDX in INPUT. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	824
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	825 static unsigned int
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	826 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	827 re_string_context_at (const re_string_t *input, Idx idx, int eflags)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	828 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	829 int c;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	830 if (BE (! REG_VALID_INDEX (idx), 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	831 /* In this case, we use the value stored in input->tip_context,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	832 since we can't know the character in input->mbs[-1] here. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	833 return input->tip_context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	834 if (BE (idx == input->len, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	835 return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	836 : CONTEXT_NEWLINE \| CONTEXT_ENDBUF);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	837 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	838 if (input->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	839 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	840 wint_t wc;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	841 Idx wc_idx = idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	842 while(input->wcs[wc_idx] == WEOF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	843 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	844 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	845 /* It must not happen. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	846 assert (wc_idx >= 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	847 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	848 --wc_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	849 if (wc_idx < 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	850 return input->tip_context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	851 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	852 wc = input->wcs[wc_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	853 if (BE (input->word_ops_used != 0, 0) && IS_WIDE_WORD_CHAR (wc))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	854 return CONTEXT_WORD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	855 return (IS_WIDE_NEWLINE (wc) && input->newline_anchor
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	856 ? CONTEXT_NEWLINE : 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	857 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	858 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	859 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	860 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	861 c = re_string_byte_at (input, idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	862 if (bitset_contain (input->word_char, c))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	863 return CONTEXT_WORD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	864 return IS_NEWLINE (c) && input->newline_anchor ? CONTEXT_NEWLINE : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	865 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	866 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	867
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	868 /* Functions for set operation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	869
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	870 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	871 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	872 re_node_set_alloc (re_node_set *set, Idx size)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	873 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	874 set->alloc = size;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	875 set->nelem = 0;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	876 set->elems = re_malloc (Idx, size);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	877 if (BE (set->elems == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	878 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	879 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	880 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	881
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	882 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	883 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	884 re_node_set_init_1 (re_node_set *set, Idx elem)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	885 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	886 set->alloc = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	887 set->nelem = 1;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	888 set->elems = re_malloc (Idx, 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	889 if (BE (set->elems == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	890 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	891 set->alloc = set->nelem = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	892 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	893 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	894 set->elems[0] = elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	895 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	896 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	897
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	898 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	899 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	900 re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	901 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	902 set->alloc = 2;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	903 set->elems = re_malloc (Idx, 2);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	904 if (BE (set->elems == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	905 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	906 if (elem1 == elem2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	907 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	908 set->nelem = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	909 set->elems[0] = elem1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	910 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	911 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	912 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	913 set->nelem = 2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	914 if (elem1 < elem2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	915 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	916 set->elems[0] = elem1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	917 set->elems[1] = elem2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	918 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	919 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	920 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	921 set->elems[0] = elem2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	922 set->elems[1] = elem1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	923 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	924 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	925 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	926 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	927
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	928 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	929 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	930 re_node_set_init_copy (re_node_set dest, const re_node_set src)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	931 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	932 dest->nelem = src->nelem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	933 if (src->nelem > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	934 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	935 dest->alloc = dest->nelem;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	936 dest->elems = re_malloc (Idx, dest->alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	937 if (BE (dest->elems == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	938 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	939 dest->alloc = dest->nelem = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	940 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	941 }
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	942 memcpy (dest->elems, src->elems, src->nelem * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	943 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	944 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	945 re_node_set_init_empty (dest);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	946 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	947 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	948
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	949 /* Calculate the intersection of the sets SRC1 and SRC2. And merge it to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	950 DEST. Return value indicate the error code or REG_NOERROR if succeeded.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	951 Note: We assume dest->elems is NULL, when dest->alloc is 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	952
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	953 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	954 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	955 re_node_set_add_intersect (re_node_set dest, const re_node_set src1,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	956 const re_node_set *src2)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	957 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	958 Idx i1, i2, is, id, delta, sbase;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	959 if (src1->nelem == 0 \|\| src2->nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	960 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	961
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	962 /* We need dest->nelem + 2 * elems_in_intersection; this is a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	963 conservative estimate. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	964 if (src1->nelem + src2->nelem + dest->nelem > dest->alloc)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	965 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	966 Idx new_alloc = src1->nelem + src2->nelem + dest->alloc;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	967 Idx *new_elems = re_realloc (dest->elems, Idx, new_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	968 if (BE (new_elems == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	969 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	970 dest->elems = new_elems;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	971 dest->alloc = new_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	972 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	973
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	974 /* Find the items in the intersection of SRC1 and SRC2, and copy
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	975 into the top of DEST those that are not already in DEST itself. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	976 sbase = dest->nelem + src1->nelem + src2->nelem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	977 i1 = src1->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	978 i2 = src2->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	979 id = dest->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	980 for (;;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	981 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	982 if (src1->elems[i1] == src2->elems[i2])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	983 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	984 /* Try to find the item in DEST. Maybe we could binary search? */
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	985 while (REG_VALID_INDEX (id) && dest->elems[id] > src1->elems[i1])
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	986 --id;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	987
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	988 if (! REG_VALID_INDEX (id) \|\| dest->elems[id] != src1->elems[i1])
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	989 dest->elems[--sbase] = src1->elems[i1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	990
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	991 if (! REG_VALID_INDEX (--i1) \|\| ! REG_VALID_INDEX (--i2))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	992 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	993 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	994
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	995 /* Lower the highest of the two items. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	996 else if (src1->elems[i1] < src2->elems[i2])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	997 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	998 if (! REG_VALID_INDEX (--i2))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	999 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1000 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1001 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1002 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1003 if (! REG_VALID_INDEX (--i1))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1004 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1005 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1006 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1007
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1008 id = dest->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1009 is = dest->nelem + src1->nelem + src2->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1010 delta = is - sbase + 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1011
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1012 /* Now copy. When DELTA becomes zero, the remaining
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1013 DEST elements are already in place; this is more or
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1014 less the same loop that is in re_node_set_merge. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1015 dest->nelem += delta;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1016 if (delta > 0 && REG_VALID_INDEX (id))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1017 for (;;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1018 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1019 if (dest->elems[is] > dest->elems[id])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1020 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1021 /* Copy from the top. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1022 dest->elems[id + delta--] = dest->elems[is--];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1023 if (delta == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1024 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1025 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1026 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1027 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1028 /* Slide from the bottom. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1029 dest->elems[id + delta] = dest->elems[id];
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1030 if (! REG_VALID_INDEX (--id))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1031 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1032 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1033 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1034
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1035 /* Copy remaining SRC elements. */
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1036 memcpy (dest->elems, dest->elems + sbase, delta * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1037
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1038 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1039 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1040
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1041 /* Calculate the union set of the sets SRC1 and SRC2. And store it to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1042 DEST. Return value indicate the error code or REG_NOERROR if succeeded. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1043
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1044 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1045 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1046 re_node_set_init_union (re_node_set dest, const re_node_set src1,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1047 const re_node_set *src2)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1048 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1049 Idx i1, i2, id;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1050 if (src1 != NULL && src1->nelem > 0 && src2 != NULL && src2->nelem > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1051 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1052 dest->alloc = src1->nelem + src2->nelem;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1053 dest->elems = re_malloc (Idx, dest->alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1054 if (BE (dest->elems == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1055 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1056 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1057 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1058 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1059 if (src1 != NULL && src1->nelem > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1060 return re_node_set_init_copy (dest, src1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1061 else if (src2 != NULL && src2->nelem > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1062 return re_node_set_init_copy (dest, src2);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1063 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1064 re_node_set_init_empty (dest);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1065 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1066 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1067 for (i1 = i2 = id = 0 ; i1 < src1->nelem && i2 < src2->nelem ;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1068 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1069 if (src1->elems[i1] > src2->elems[i2])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1070 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1071 dest->elems[id++] = src2->elems[i2++];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1072 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1073 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1074 if (src1->elems[i1] == src2->elems[i2])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1075 ++i2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1076 dest->elems[id++] = src1->elems[i1++];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1077 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1078 if (i1 < src1->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1079 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1080 memcpy (dest->elems + id, src1->elems + i1,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1081 (src1->nelem - i1) * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1082 id += src1->nelem - i1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1083 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1084 else if (i2 < src2->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1085 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1086 memcpy (dest->elems + id, src2->elems + i2,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1087 (src2->nelem - i2) * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1088 id += src2->nelem - i2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1089 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1090 dest->nelem = id;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1091 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1092 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1093
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1094 /* Calculate the union set of the sets DEST and SRC. And store it to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1095 DEST. Return value indicate the error code or REG_NOERROR if succeeded. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1096
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1097 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1098 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1099 re_node_set_merge (re_node_set dest, const re_node_set src)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1100 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1101 Idx is, id, sbase, delta;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1102 if (src == NULL \|\| src->nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1103 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1104 if (dest->alloc < 2 * src->nelem + dest->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1105 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1106 Idx new_alloc = 2 * (src->nelem + dest->alloc);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1107 Idx *new_buffer = re_realloc (dest->elems, Idx, new_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1108 if (BE (new_buffer == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1109 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1110 dest->elems = new_buffer;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1111 dest->alloc = new_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1112 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1113
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1114 if (BE (dest->nelem == 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1115 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1116 dest->nelem = src->nelem;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1117 memcpy (dest->elems, src->elems, src->nelem * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1118 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1119 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1120
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1121 /* Copy into the top of DEST the items of SRC that are not
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1122 found in DEST. Maybe we could binary search in DEST? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1123 for (sbase = dest->nelem + 2 * src->nelem,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1124 is = src->nelem - 1, id = dest->nelem - 1;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1125 REG_VALID_INDEX (is) && REG_VALID_INDEX (id); )
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1126 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1127 if (dest->elems[id] == src->elems[is])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1128 is--, id--;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1129 else if (dest->elems[id] < src->elems[is])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1130 dest->elems[--sbase] = src->elems[is--];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1131 else /* if (dest->elems[id] > src->elems[is]) */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1132 --id;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1133 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1134
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1135 if (REG_VALID_INDEX (is))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1136 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1137 /* If DEST is exhausted, the remaining items of SRC must be unique. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1138 sbase -= is + 1;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1139 memcpy (dest->elems + sbase, src->elems,
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1140 (is + 1) * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1141 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1142
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1143 id = dest->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1144 is = dest->nelem + 2 * src->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1145 delta = is - sbase + 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1146 if (delta == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1147 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1148
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1149 /* Now copy. When DELTA becomes zero, the remaining
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1150 DEST elements are already in place. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1151 dest->nelem += delta;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1152 for (;;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1153 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1154 if (dest->elems[is] > dest->elems[id])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1155 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1156 /* Copy from the top. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1157 dest->elems[id + delta--] = dest->elems[is--];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1158 if (delta == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1159 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1160 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1161 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1162 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1163 /* Slide from the bottom. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1164 dest->elems[id + delta] = dest->elems[id];
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1165 if (! REG_VALID_INDEX (--id))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1166 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1167 /* Copy remaining SRC elements. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1168 memcpy (dest->elems, dest->elems + sbase,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1169 delta * sizeof dest->elems[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1170 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1171 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1172 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1173 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1174
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1175 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1176 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1177
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1178 /* Insert the new element ELEM to the re_node_set* SET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1179 SET should not already have ELEM.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1180 return -1 if an error is occured, return 1 otherwise. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1181
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1182 static int
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1183 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1184 re_node_set_insert (re_node_set *set, Idx elem)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1185 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1186 Idx idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1187 /* In case the set is empty. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1188 if (set->alloc == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1189 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1190 if (BE (re_node_set_init_1 (set, elem) == REG_NOERROR, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1191 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1192 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1193 return -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1194 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1195
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1196 if (BE (set->nelem, 0) == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1197 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1198 /* We already guaranteed above that set->alloc != 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1199 set->elems[0] = elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1200 ++set->nelem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1201 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1202 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1203
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1204 /* Realloc if we need. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1205 if (set->alloc == set->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1206 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1207 Idx *new_elems;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1208 set->alloc = set->alloc * 2;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1209 new_elems = re_realloc (set->elems, Idx, set->alloc);
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1210 if (BE (new_elems == NULL, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1211 return -1;
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1212 set->elems = new_elems;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1213 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1214
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1215 /* Move the elements which follows the new element. Test the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1216 first element separately to skip a check in the inner loop. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1217 if (elem < set->elems[0])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1218 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1219 idx = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1220 for (idx = set->nelem; idx > 0; idx--)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1221 set->elems[idx] = set->elems[idx - 1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1222 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1223 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1224 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1225 for (idx = set->nelem; set->elems[idx - 1] > elem; idx--)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1226 set->elems[idx] = set->elems[idx - 1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1227 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1228
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1229 /* Insert the new element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1230 set->elems[idx] = elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1231 ++set->nelem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1232 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1233 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1234
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1235 /* Insert the new element ELEM to the re_node_set* SET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1236 SET should not already have any element greater than or equal to ELEM.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1237 Return -1 if an error is occured, return 1 otherwise. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1238
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1239 static int
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1240 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1241 re_node_set_insert_last (re_node_set *set, Idx elem)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1242 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1243 /* Realloc if we need. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1244 if (set->alloc == set->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1245 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1246 Idx *new_elems;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1247 set->alloc = (set->alloc + 1) * 2;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1248 new_elems = re_realloc (set->elems, Idx, set->alloc);
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1249 if (BE (new_elems == NULL, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1250 return -1;
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1251 set->elems = new_elems;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1252 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1253
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1254 /* Insert the new element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1255 set->elems[set->nelem++] = elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1256 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1257 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1258
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1259 /* Compare two node sets SET1 and SET2.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1260 return 1 if SET1 and SET2 are equivalent, return 0 otherwise. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1261
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1262 static int
6129 2fce0cb93f59 * config/srclist.text: Add glibc bug 1248. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1263 internal_function __attribute ((pure))
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1264 re_node_set_compare (const re_node_set set1, const re_node_set set2)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1265 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1266 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1267 if (set1 == NULL \|\| set2 == NULL \|\| set1->nelem != set2->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1268 return 0;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1269 for (i = set1->nelem ; REG_VALID_INDEX (--i) ; )
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1270 if (set1->elems[i] != set2->elems[i])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1271 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1272 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1273 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1274
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1275 /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1276
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1277 static Idx
6129 2fce0cb93f59 * config/srclist.text: Add glibc bug 1248. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1278 internal_function __attribute ((pure))
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1279 re_node_set_contains (const re_node_set *set, Idx elem)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1280 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1281 __re_size_t idx, right, mid;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1282 if (! REG_VALID_NONZERO_INDEX (set->nelem))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1283 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1284
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1285 /* Binary search the element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1286 idx = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1287 right = set->nelem - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1288 while (idx < right)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1289 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1290 mid = (idx + right) / 2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1291 if (set->elems[mid] < elem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1292 idx = mid + 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1293 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1294 right = mid;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1295 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1296 return set->elems[idx] == elem ? idx + 1 : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1297 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1298
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1299 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1300 internal_function
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1301 re_node_set_remove_at (re_node_set *set, Idx idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1302 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1303 if (idx < 0 \|\| idx >= set->nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1304 return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1305 --set->nelem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1306 for (; idx < set->nelem; idx++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1307 set->elems[idx] = set->elems[idx + 1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1308 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1309
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1310
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1311 /* Add the token TOKEN to dfa->nodes, and return the index of the token.
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1312 Or return REG_MISSING if an error occurred. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1313
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1314 static Idx
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1315 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1316 re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1317 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1318 int type = token.type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1319 if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1320 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1321 Idx new_nodes_alloc = dfa->nodes_alloc * 2;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1322 Idx new_nexts, new_indices;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1323 re_node_set new_edests, new_eclosures;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1324
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1325 re_token_t *new_nodes = re_realloc (dfa->nodes, re_token_t,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1326 new_nodes_alloc);
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1327 if (BE (new_nodes == NULL, 0))
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1328 return REG_MISSING;
6067 82e7d3903d95 (re_string_realloc_buffers, re_node_set_insert): Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	1329 dfa->nodes = new_nodes;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1330 new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1331 new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1332 new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1333 new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1334 if (BE (new_nexts == NULL \|\| new_indices == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1335 \|\| new_edests == NULL \|\| new_eclosures == NULL, 0))
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1336 return REG_MISSING;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1337 dfa->nexts = new_nexts;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1338 dfa->org_indices = new_indices;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1339 dfa->edests = new_edests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1340 dfa->eclosures = new_eclosures;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1341 dfa->nodes_alloc = new_nodes_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1342 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1343 dfa->nodes[dfa->nodes_len] = token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1344 dfa->nodes[dfa->nodes_len].constraint = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1345 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1346 dfa->nodes[dfa->nodes_len].accept_mb =
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1347 (type == OP_PERIOD && dfa->mb_cur_max > 1) \|\| type == COMPLEX_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1348 #endif
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1349 dfa->nexts[dfa->nodes_len] = REG_MISSING;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1350 re_node_set_init_empty (dfa->edests + dfa->nodes_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1351 re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1352 return dfa->nodes_len++;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1353 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1354
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1355 static inline re_hashval_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1356 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1357 calc_state_hash (const re_node_set *nodes, unsigned int context)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1358 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1359 re_hashval_t hash = nodes->nelem + context;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1360 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1361 for (i = 0 ; i < nodes->nelem ; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1362 hash += nodes->elems[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1363 return hash;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1364 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1365
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1366 /* Search for the state whose node_set is equivalent to NODES.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1367 Return the pointer to the state, if we found it in the DFA.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1368 Otherwise create the new one and return it. In case of an error
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1369 return NULL and set the error code in ERR.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1370 Note: - We assume NULL as the invalid state, then it is possible that
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1371 return value is NULL and ERR is REG_NOERROR.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1372 - We never return non-NULL value in case of any errors, it is for
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1373 optimization. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1374
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1375 static re_dfastate_t*
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1376 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1377 re_acquire_state (reg_errcode_t err, re_dfa_t dfa, const re_node_set *nodes)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1378 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1379 re_hashval_t hash;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1380 re_dfastate_t *new_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1381 struct re_state_table_entry *spot;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1382 Idx i;
6073 331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1383 #ifdef lint
331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1384 /* Suppress bogus uninitialized-variable warnings. */
331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1385 *err = REG_NOERROR;
331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1386 #endif
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1387 if (BE (nodes->nelem == 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1388 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1389 *err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1390 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1391 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1392 hash = calc_state_hash (nodes, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1393 spot = dfa->state_table + (hash & dfa->state_hash_mask);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1394
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1395 for (i = 0 ; i < spot->num ; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1396 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1397 re_dfastate_t *state = spot->array[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1398 if (hash != state->hash)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1399 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1400 if (re_node_set_compare (&state->nodes, nodes))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1401 return state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1402 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1403
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1404 /* There are no appropriate state in the dfa, create the new one. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1405 new_state = create_ci_newstate (dfa, nodes, hash);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1406 if (BE (new_state != NULL, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1407 return new_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1408 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1409 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1410 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1411 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1412 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1413 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1414
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1415 /* Search for the state whose node_set is equivalent to NODES and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1416 whose context is equivalent to CONTEXT.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1417 Return the pointer to the state, if we found it in the DFA.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1418 Otherwise create the new one and return it. In case of an error
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1419 return NULL and set the error code in ERR.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1420 Note: - We assume NULL as the invalid state, then it is possible that
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1421 return value is NULL and ERR is REG_NOERROR.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1422 - We never return non-NULL value in case of any errors, it is for
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1423 optimization. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1424
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1425 static re_dfastate_t*
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1426 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1427 re_acquire_state_context (reg_errcode_t err, re_dfa_t dfa,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1428 const re_node_set *nodes, unsigned int context)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1429 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1430 re_hashval_t hash;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1431 re_dfastate_t *new_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1432 struct re_state_table_entry *spot;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1433 Idx i;
6073 331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1434 #ifdef lint
331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1435 /* Suppress bogus uninitialized-variable warnings. */
331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1436 *err = REG_NOERROR;
331a20f7531d (re_acquire_state, re_acquire_state_context) [defined lint]: Paul Eggert <eggert@cs.ucla.edu> parents: 6067 diff changeset	1437 #endif
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1438 if (nodes->nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1439 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1440 *err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1441 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1442 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1443 hash = calc_state_hash (nodes, context);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1444 spot = dfa->state_table + (hash & dfa->state_hash_mask);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1445
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1446 for (i = 0 ; i < spot->num ; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1447 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1448 re_dfastate_t *state = spot->array[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1449 if (state->hash == hash
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1450 && state->context == context
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1451 && re_node_set_compare (state->entrance_nodes, nodes))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1452 return state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1453 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1454 /* There are no appropriate state in `dfa', create the new one. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1455 new_state = create_cd_newstate (dfa, nodes, context, hash);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1456 if (BE (new_state != NULL, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1457 return new_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1458 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1459 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1460 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1461 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1462 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1463 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1464
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1465 /* Finish initialization of the new state NEWSTATE, and using its hash value
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1466 HASH put in the appropriate bucket of DFA's state table. Return value
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1467 indicates the error code if failed. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1468
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1469 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1470 internal_function
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1471 register_state (const re_dfa_t dfa, re_dfastate_t newstate, re_hashval_t hash)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1472 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1473 struct re_state_table_entry *spot;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1474 reg_errcode_t err;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1475 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1476
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1477 newstate->hash = hash;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1478 err = re_node_set_alloc (&newstate->non_eps_nodes, newstate->nodes.nelem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1479 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1480 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1481 for (i = 0; i < newstate->nodes.nelem; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1482 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1483 Idx elem = newstate->nodes.elems[i];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1484 if (!IS_EPSILON_NODE (dfa->nodes[elem].type))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1485 re_node_set_insert_last (&newstate->non_eps_nodes, elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1486 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1487
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1488 spot = dfa->state_table + (hash & dfa->state_hash_mask);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1489 if (BE (spot->alloc <= spot->num, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1490 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1491 Idx new_alloc = 2 * spot->num + 2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1492 re_dfastate_t *new_array = re_realloc (spot->array, re_dfastate_t ,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1493 new_alloc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1494 if (BE (new_array == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1495 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1496 spot->array = new_array;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1497 spot->alloc = new_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1498 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1499 spot->array[spot->num++] = newstate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1500 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1501 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1502
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1503 /* Create the new state which is independ of contexts.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1504 Return the new state if succeeded, otherwise return NULL. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1505
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1506 static re_dfastate_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1507 internal_function
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1508 create_ci_newstate (const re_dfa_t dfa, const re_node_set nodes,
6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1509 re_hashval_t hash)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1510 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1511 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1512 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1513 re_dfastate_t *newstate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1514
6119 c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	1515 newstate = re_calloc (re_dfastate_t, 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1516 if (BE (newstate == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1517 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1518 err = re_node_set_init_copy (&newstate->nodes, nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1519 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1520 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1521 re_free (newstate);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1522 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1523 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1524
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1525 newstate->entrance_nodes = &newstate->nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1526 for (i = 0 ; i < nodes->nelem ; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1527 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1528 re_token_t *node = dfa->nodes + nodes->elems[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1529 re_token_type_t type = node->type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1530 if (type == CHARACTER && !node->constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1531 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1532 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1533 newstate->accept_mb \|= node->accept_mb;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1534 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1535
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1536 /* If the state has the halt node, the state is a halt state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1537 if (type == END_OF_RE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1538 newstate->halt = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1539 else if (type == OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1540 newstate->has_backref = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1541 else if (type == ANCHOR \|\| node->constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1542 newstate->has_constraint = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1543 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1544 err = register_state (dfa, newstate, hash);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1545 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1546 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1547 free_state (newstate);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1548 newstate = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1549 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1550 return newstate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1551 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1552
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1553 /* Create the new state which is depend on the context CONTEXT.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1554 Return the new state if succeeded, otherwise return NULL. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1555
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1556 static re_dfastate_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1557 internal_function
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1558 create_cd_newstate (const re_dfa_t dfa, const re_node_set nodes,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1559 unsigned int context, re_hashval_t hash)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1560 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6129 diff changeset	1561 Idx i, nctx_nodes = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1562 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1563 re_dfastate_t *newstate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1564
6119 c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	1565 newstate = re_calloc (re_dfastate_t, 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1566 if (BE (newstate == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1567 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1568 err = re_node_set_init_copy (&newstate->nodes, nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1569 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1570 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1571 re_free (newstate);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1572 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1573 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1574
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1575 newstate->context = context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1576 newstate->entrance_nodes = &newstate->nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1577
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1578 for (i = 0 ; i < nodes->nelem ; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1579 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1580 unsigned int constraint = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1581 re_token_t *node = dfa->nodes + nodes->elems[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1582 re_token_type_t type = node->type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1583 if (node->constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1584 constraint = node->constraint;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1585
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1586 if (type == CHARACTER && !constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1587 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1588 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1589 newstate->accept_mb \|= node->accept_mb;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1590 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1591
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1592 /* If the state has the halt node, the state is a halt state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1593 if (type == END_OF_RE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1594 newstate->halt = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1595 else if (type == OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1596 newstate->has_backref = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1597 else if (type == ANCHOR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1598 constraint = node->opr.ctx_type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1599
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1600 if (constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1601 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1602 if (newstate->entrance_nodes == &newstate->nodes)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1603 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1604 newstate->entrance_nodes = re_malloc (re_node_set, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1605 if (BE (newstate->entrance_nodes == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1606 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1607 free_state (newstate);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1608 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1609 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1610 re_node_set_init_copy (newstate->entrance_nodes, nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1611 nctx_nodes = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1612 newstate->has_constraint = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1613 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1614
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1615 if (NOT_SATISFY_PREV_CONSTRAINT (constraint,context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1616 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1617 re_node_set_remove_at (&newstate->nodes, i - nctx_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1618 ++nctx_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1619 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1620 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1621 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1622 err = register_state (dfa, newstate, hash);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1623 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1624 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1625 free_state (newstate);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1626 newstate = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1627 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1628 return newstate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1629 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1630
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1631 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1632 internal_function
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6073 diff changeset	1633 free_state (re_dfastate_t *state)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1634 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1635 re_node_set_free (&state->non_eps_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1636 re_node_set_free (&state->inveclosure);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1637 if (state->entrance_nodes != &state->nodes)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1638 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1639 re_node_set_free (state->entrance_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1640 re_free (state->entrance_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1641 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1642 re_node_set_free (&state->nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1643 re_free (state->word_trtable);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1644 re_free (state->trtable);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1645 re_free (state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1646 }

Mercurial > hg > octave-lojdl > gnulib-hg

annotate lib/regex_internal.c @ 6186:7a0537a5ad1b