diff options
Diffstat (limited to 'libc/misc/regex')
| -rw-r--r-- | libc/misc/regex/Makefile.in | 21 | ||||
| -rw-r--r-- | libc/misc/regex/regcomp.c | 21 | ||||
| -rw-r--r-- | libc/misc/regex/regex.c | 78 | ||||
| -rw-r--r-- | libc/misc/regex/regex_internal.c | 9 | ||||
| -rw-r--r-- | libc/misc/regex/regex_internal.h | 3 | ||||
| -rw-r--r-- | libc/misc/regex/regex_old.c | 82 | ||||
| -rw-r--r-- | libc/misc/regex/regexec.c | 12 |
7 files changed, 121 insertions, 105 deletions
diff --git a/libc/misc/regex/Makefile.in b/libc/misc/regex/Makefile.in index 9cd403add..4e76dee36 100644 --- a/libc/misc/regex/Makefile.in +++ b/libc/misc/regex/Makefile.in @@ -1,29 +1,26 @@ # Makefile for uClibc # # Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # ifeq ($(UCLIBC_HAS_REGEX_OLD),y) -CSRC:=regex_old.c +CSRC := regex_old.c else -CSRC:=regex.c +CSRC := regex.c endif -MISC_REGEX_DIR:=$(top_srcdir)libc/misc/regex -MISC_REGEX_OUT:=$(top_builddir)libc/misc/regex +MISC_REGEX_DIR := $(top_srcdir)libc/misc/regex +MISC_REGEX_OUT := $(top_builddir)libc/misc/regex -MISC_REGEX_SRC:=$(patsubst %.c,$(MISC_REGEX_DIR)/%.c,$(CSRC)) -MISC_REGEX_OBJ:=$(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC)) +MISC_REGEX_SRC := $(patsubst %.c,$(MISC_REGEX_DIR)/%.c,$(CSRC)) +MISC_REGEX_OBJ := $(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC)) -libc-a-$(UCLIBC_HAS_REGEX)+=$(MISC_REGEX_OBJ) -libc-so-$(UCLIBC_HAS_REGEX)+=$(MISC_REGEX_OBJ:.o=.os) +libc-$(UCLIBC_HAS_REGEX) += $(MISC_REGEX_OBJ) -libc-multi-$(UCLIBC_HAS_REGEX)+=$(MISC_REGEX_SRC) - -objclean-y+=misc_regex_objclean +objclean-y += misc_regex_objclean misc_regex_objclean: $(RM) $(MISC_REGEX_OUT)/*.{o,os} diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 419d879be..8d464db2d 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -233,7 +233,7 @@ re_compile_pattern (pattern, length, bufp) return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_compile_pattern, re_compile_pattern) +strong_alias(__re_compile_pattern, re_compile_pattern) #endif /* Set by `re_set_syntax' to the current regexp syntax to recognize. Can @@ -261,7 +261,7 @@ re_set_syntax (syntax) return ret; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_set_syntax, re_set_syntax) +strong_alias(__re_set_syntax, re_set_syntax) #endif int @@ -283,7 +283,7 @@ re_compile_fastmap (bufp) return 0; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_compile_fastmap, re_compile_fastmap) +strong_alias(__re_compile_fastmap, re_compile_fastmap) #endif static inline void @@ -499,7 +499,7 @@ regcomp (preg, pattern, cflags) return (int) ret; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regcomp, regcomp) +strong_alias(__regcomp, regcomp) #endif /* Returns a message corresponding to an error code, ERRCODE, returned @@ -546,7 +546,7 @@ regerror (errcode, preg, errbuf, errbuf_size) return msg_size; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regerror, regerror) +strong_alias(__regerror, regerror) #endif @@ -630,7 +630,7 @@ regfree (preg) preg->translate = NULL; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regfree, regfree) +strong_alias(__regfree, regfree) #endif /* Entry points compatible with 4.2 BSD regex library. We don't define @@ -805,6 +805,10 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length, /* Initialize DFA. We use the length of the regular expression PAT_LEN as the initial length of some arrays. */ +#ifdef __UCLIBC_HAS_WCHAR__ +libc_hidden_proto(_stdlib_mb_cur_max) +#endif + static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len) { @@ -834,9 +838,6 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) dfa->state_hash_mask = table_size - 1; #ifdef __UCLIBC_HAS_WCHAR__ -# undef MB_CUR_MAX -# define MB_CUR_MAX (_stdlib_mb_cur_max_internal ()) -extern size_t _stdlib_mb_cur_max_internal (void) __THROW __wur attribute_hidden; dfa->mb_cur_max = MB_CUR_MAX; #else dfa->mb_cur_max = 1; @@ -1651,8 +1652,6 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root) && dfa->edests[node].nelem && !dfa->nodes[dfa->edests[node].elems[0]].duplicated) { - int org_node, cur_node; - org_node = cur_node = node; err = duplicate_node_closure (dfa, node, node, node, constraint); if (BE (err != REG_NOERROR, 0)) return err; diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index 99de9fd6c..77c09a011 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -28,48 +28,64 @@ #ifdef __UCLIBC__ #undef _LIBC #define _REGEX_RE_COMP +#define HAVE_MEMPCPY +#define HAVE_LANGINFO +#define HAVE_LANGINFO_CODESET #include <stdbool.h> #include <stdint.h> +#include <string.h> +#include <stdlib.h> #ifdef __UCLIBC_HAS_WCHAR__ #define RE_ENABLE_I18N -#define wcscoll __wcscoll -#define wcrtomb __wcrtomb -#define mbrtowc __mbrtowc -#define iswctype __iswctype -#define iswlower __iswlower -#define iswalnum __iswalnum -#define towlower __towlower -#define towupper __towupper -#define mbsinit __mbsinit #include <wchar.h> #include <wctype.h> -/* attribute_hidden produces text relocation */ -//extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2) __THROW /*attribute_hidden*/; +#define __iswctype iswctype +#define __wcrtomb wcrtomb +#define __btowc btowc +#define __wctype wctype +libc_hidden_proto(wcscoll) +libc_hidden_proto(wcrtomb) +libc_hidden_proto(mbrtowc) +libc_hidden_proto(iswctype) +libc_hidden_proto(iswlower) +libc_hidden_proto(iswalnum) +libc_hidden_proto(towlower) +libc_hidden_proto(towupper) +libc_hidden_proto(mbsinit) +libc_hidden_proto(btowc) +libc_hidden_proto(wctype) -extern size_t __wcrtomb (char *__restrict __s, wchar_t __wc, - mbstate_t *__restrict __ps) attribute_hidden; - -extern wint_t __btowc (int __c) attribute_hidden; - -extern wctype_t __wctype (__const char *__property) attribute_hidden; +#endif -//extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/; +#include <ctype.h> +#ifdef __UCLIBC_HAS_CTYPE_TABLES__ +#define __toupper toupper +#define __tolower tolower +#endif +#define __mempcpy mempcpy +#ifdef __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(__ctype_b_loc) +libc_hidden_proto(__ctype_toupper_loc) +#else +libc_hidden_proto(__ctype_b) +libc_hidden_proto(__ctype_toupper) #endif +libc_hidden_proto(toupper) +libc_hidden_proto(tolower) +libc_hidden_proto(memcmp) +libc_hidden_proto(memcpy) +libc_hidden_proto(memmove) +libc_hidden_proto(memset) +libc_hidden_proto(strchr) +libc_hidden_proto(strcmp) +libc_hidden_proto(strlen) +libc_hidden_proto(strncpy) +libc_hidden_proto(getenv) +libc_hidden_proto(strcasecmp) +libc_hidden_proto(mempcpy) +libc_hidden_proto(abort) -#define memcmp __memcmp -#define memcpy __memcpy -#define memmove __memmove -#define memset __memset -#define strchr __strchr -#define strcmp __strcmp -#define strlen __strlen -#define strncpy __strncpy -#define getenv __getenv -#define strcasecmp __strcasecmp - -extern void *__mempcpy (void *__restrict __dest, - __const void *__restrict __src, size_t __n) attribute_hidden; #endif /* Make sure noone compiles this code with a C++ compiler. */ diff --git a/libc/misc/regex/regex_internal.c b/libc/misc/regex/regex_internal.c index c1ee85040..3fc62d731 100644 --- a/libc/misc/regex/regex_internal.c +++ b/libc/misc/regex/regex_internal.c @@ -195,7 +195,7 @@ static void internal_function build_wcs_buffer (re_string_t *pstr) { -#ifdef _LIBC +#if defined _LIBC || defined __UCLIBC__ unsigned char buf[MB_LEN_MAX]; assert (MB_LEN_MAX >= pstr->mb_cur_max); #else @@ -266,7 +266,7 @@ build_wcs_upper_buffer (re_string_t *pstr) mbstate_t prev_st; int src_idx, byte_idx, end_idx, remain_len; size_t mbclen; -#ifdef _LIBC +#if defined _LIBC || defined __UCLIBC__ char buf[MB_LEN_MAX]; assert (MB_LEN_MAX >= pstr->mb_cur_max); #else @@ -882,8 +882,9 @@ re_node_set_alloc (re_node_set *set, int size) { set->alloc = size; set->nelem = 0; - set->elems = re_malloc (int, size); - if (BE (set->elems == NULL, 0)) + set->elems = re_malloc (int, size); /* can be NULL if size == 0 + (see re_node_set_init_empty(set)) */ + if (BE (set->elems == NULL && size != 0, 0)) return REG_ESPACE; return REG_NOERROR; } diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h index 4782883c1..d82cf6d42 100644 --- a/libc/misc/regex/regex_internal.h +++ b/libc/misc/regex/regex_internal.h @@ -29,6 +29,7 @@ #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC # include <langinfo.h> +libc_hidden_proto(nl_langinfo) #endif #if defined HAVE_LOCALE_H || defined _LIBC # include <locale.h> @@ -52,7 +53,7 @@ #endif /* In case that the system doesn't have isblank(). */ -#if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank +#if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank && !defined __UCLIBC__ # define isblank(ch) ((ch) == ' ' || (ch) == '\t') #endif diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index 9031cebff..29640734d 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -20,46 +20,35 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define HAVE_MEMPCPY -#define memset __memset -#define memcmp __memcmp -#define strcmp __strcmp -#define strlen __strlen -#define wcslen __wcslen -/* for some reason this does not work */ -#define memcpy __memcpy -#define mbrtowc __mbrtowc -#define wcrtomb __wcrtomb -#define wcscoll __wcscoll -#define wctype __wctype -#define iswctype __iswctype -#define iswalnum __iswalnum -#define printf __printf -#define btowc __btowc - /* To exclude some unwanted junk.... */ #undef emacs -#define _REGEX_RE_COMP #include <features.h> #ifdef __UCLIBC__ # undef _LIBC +# define _REGEX_RE_COMP +# define HAVE_MEMPCPY +# define STDC_HEADERS +# define RE_TRANSLATE_TYPE char * #endif #include <stdlib.h> +#include <stdint.h> #include <string.h> -#define STDC_HEADERS -#define RE_TRANSLATE_TYPE char * +#include <stdio.h> -extern void *__mempcpy (void *__restrict __dest, - __const void *__restrict __src, size_t __n) /*attribute_hidden*/; +libc_hidden_proto(memset) +libc_hidden_proto(memcmp) +libc_hidden_proto(memcpy) +libc_hidden_proto(strcmp) +libc_hidden_proto(strlen) +libc_hidden_proto(printf) +libc_hidden_proto(mempcpy) +libc_hidden_proto(abort) /* AIX requires this to be the first thing in the file. */ #if defined _AIX && !defined REGEX_MALLOC #pragma alloca #endif -#undef _GNU_SOURCE -#define _GNU_SOURCE - #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -89,6 +78,15 @@ extern void *__mempcpy (void *__restrict __dest, /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ # include <wchar.h> # include <wctype.h> +libc_hidden_proto(wcslen) +libc_hidden_proto(mbrtowc) +libc_hidden_proto(wcrtomb) +libc_hidden_proto(wcscoll) +libc_hidden_proto(wctype) +libc_hidden_proto(iswctype) +libc_hidden_proto(iswalnum) +libc_hidden_proto(btowc) + # endif # if defined _LIBC || defined __UCLIBC__ @@ -113,10 +111,10 @@ extern void *__mempcpy (void *__restrict __dest, __re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop) # define re_compile_fastmap(bufp) __re_compile_fastmap (bufp) +# ifndef __UCLIBC__ # define btowc __btowc /* We are also using some library internals. */ -# ifndef __UCLIBC__ # include <locale/localeinfo.h> # include <locale/elem-hash.h> # include <langinfo.h> @@ -334,7 +332,7 @@ init_syntax_once () # endif /* emacs */ /* Integer type for pointers. */ -# if !defined _LIBC +# if !defined _LIBC && !defined __intptr_t_defined typedef unsigned long int uintptr_t; # endif @@ -1389,7 +1387,7 @@ re_set_syntax (syntax) return ret; } # if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_set_syntax, re_set_syntax) +strong_alias(__re_set_syntax, re_set_syntax) # endif /* This table gives an error message for each of the error codes listed @@ -3315,11 +3313,15 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp) PATFETCH (c); if ((c == ':' && *p == ']') || p == pend) break; +#if CHAR_CLASS_MAX_LENGTH != 256 if (c1 < CHAR_CLASS_MAX_LENGTH) str[c1++] = c; else /* This is in any case an invalid class name. */ str[0] = '\0'; +#else + str[c1++] = c; +#endif } str[c1] = '\0'; @@ -5009,7 +5011,7 @@ re_compile_fastmap (bufp) return byte_re_compile_fastmap(bufp); } /* re_compile_fastmap */ #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_compile_fastmap, re_compile_fastmap) +strong_alias(__re_compile_fastmap, re_compile_fastmap) #endif @@ -5048,7 +5050,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends) } } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_set_registers, re_set_registers) +strong_alias(__re_set_registers, re_set_registers) #endif /* Searching routines. */ @@ -5067,7 +5069,7 @@ re_search (bufp, string, size, startpos, range, regs) regs, size); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_search, re_search) +strong_alias(__re_search, re_search) #endif @@ -5112,7 +5114,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) range, regs, stop); } /* re_search_2 */ #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_search_2, re_search_2) +strong_alias(__re_search_2, re_search_2) #endif #endif /* not INSIDE_RECURSION */ @@ -5571,7 +5573,7 @@ re_match (bufp, string, size, pos, regs) return result; } # if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_match, re_match) +strong_alias(__re_match, re_match) # endif #endif /* not emacs */ @@ -5632,7 +5634,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) return result; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_match_2, re_match_2) +strong_alias(__re_match_2, re_match_2) #endif #endif /* not INSIDE_RECURSION */ @@ -7971,7 +7973,7 @@ re_compile_pattern (pattern, length, bufp) return gettext (re_error_msgid + re_error_msgid_idx[(int) ret]); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_compile_pattern, re_compile_pattern) +strong_alias(__re_compile_pattern, re_compile_pattern) #endif /* Entry points compatible with 4.2 BSD regex library. We don't define @@ -8167,7 +8169,7 @@ regcomp (preg, pattern, cflags) return (int) ret; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regcomp, regcomp) +strong_alias(__regcomp, regcomp) #endif @@ -8245,7 +8247,7 @@ regexec (preg, string, nmatch, pmatch, eflags) return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regexec, regexec) +strong_alias(__regexec, regexec) #endif @@ -8280,7 +8282,7 @@ regerror (errcode, preg, errbuf, errbuf_size) if (msg_size > errbuf_size) { #if defined HAVE_MEMPCPY || defined _LIBC - *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; + *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; #else memcpy (errbuf, msg, errbuf_size - 1); errbuf[errbuf_size - 1] = 0; @@ -8293,7 +8295,7 @@ regerror (errcode, preg, errbuf, errbuf_size) return msg_size; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regerror, regerror) +strong_alias(__regerror, regerror) #endif @@ -8320,7 +8322,7 @@ regfree (preg) preg->translate = NULL; } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__regfree, regfree) +strong_alias(__regfree, regfree) #endif #endif /* not emacs */ diff --git a/libc/misc/regex/regexec.c b/libc/misc/regex/regexec.c index e8e2946b4..c56fb9d4a 100644 --- a/libc/misc/regex/regexec.c +++ b/libc/misc/regex/regexec.c @@ -275,7 +275,7 @@ __compat_regexec (const regex_t *__restrict preg, compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0); # endif #elif __UCLIBC__ -weak_alias(__regexec,regexec) +strong_alias(__regexec,regexec) #endif /* Entry points for GNU code. */ @@ -317,7 +317,7 @@ re_match (bufp, string, length, start, regs) return re_search_stub (bufp, string, length, start, 0, length, regs, 1); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_match, re_match) +strong_alias(__re_match, re_match) #endif int @@ -330,7 +330,7 @@ re_search (bufp, string, length, start, range, regs) return re_search_stub (bufp, string, length, start, range, length, regs, 0); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_search, re_search) +strong_alias(__re_search, re_search) #endif int @@ -344,7 +344,7 @@ re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop) start, 0, regs, stop, 1); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_match_2, re_match_2) +strong_alias(__re_match_2, re_match_2) #endif int @@ -358,7 +358,7 @@ re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop) start, range, regs, stop, 0); } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_search_2, re_search_2) +strong_alias(__re_search_2, re_search_2) #endif static int @@ -593,7 +593,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends) } } #if defined _LIBC || defined __UCLIBC__ -weak_alias (__re_set_registers, re_set_registers) +strong_alias(__re_set_registers, re_set_registers) #endif /* Entry points compatible with 4.2 BSD regex library. We don't define |