From 857fa1b81d522573da671e54e5d3149698e54a0d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 25 Mar 1996 17:48:26 +0000 Subject: Mon Mar 25 03:35:16 1996 Roland McGrath * malloc/malloc.c (morecore): Don't attempt recursive realloc of info table when _heaplimit==0 during realloc growing large block. * MakeTAGS (extract): Remove /dev/null from xgettext command line. (text-srcs): New variable: extract only C sources from $(tags_sources). (po/$(domain).pot): Depend on that. If it's empty, cp /dev/null $@ instead of $(extract). * misc/Makefile (headers): Add iovec.h. * sysdeps/unix/sysv/linux/iovec.h: New file. * sysdeps/generic/iovec.h: New file. * misc/sys/uio.h (struct iovec): Type replaced with #include . * configure.in (NO_UNDERSCORES check): Use AC_TRY_LINK instead of AC_TRY_COMPILE. * misc/sys/cdefs.h [__USE_BSD] (const, signed, volatile): Move these macros inside [! __STDC__]. * stdlib/rpmatch.c: New file. * stdlib/Makefile (routines): Add rpmatch. * stdlib/stdlib.h [__USE_SVID]: Declare rpmatch. * MakeTAGS (MSGJOIN): Variable removed. (po/SYS_libc.pot): Use $(XGETTEXT) instead of $(MSGJOIN). Wed Mar 20 20:08:46 1996 Andreas Schwab * sysdeps/unix/sysdep.h: Don't define C_SYMBOL_NAME. * sysdeps/unix/sysv/linux/m68k/sysdep.h: Don't define NO_UNDERSCORES. --- stdlib/Makefile | 5 +++-- stdlib/rpmatch.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ stdlib/stdlib.h | 9 ++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 stdlib/rpmatch.c (limited to 'stdlib') diff --git a/stdlib/Makefile b/stdlib/Makefile index 77940d15eb..54a95fda05 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -41,7 +41,8 @@ routines := \ strtol strtoul strtoq strtouq \ strtof strtod strtold \ system \ - a64l l64a + a64l l64a \ + rpmatch distribute := exit.h grouping.h tests := tst-strtol tst-strtod testmb testrand testsort testdiv diff --git a/stdlib/rpmatch.c b/stdlib/rpmatch.c new file mode 100644 index 0000000000..0dcaa6dc87 --- /dev/null +++ b/stdlib/rpmatch.c @@ -0,0 +1,62 @@ +/* rpmatch - determine whether string value is affirmation or negative + response according to current locale's data +Copyright (C) 1996 Free Software Foundation, Inc. + +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include +#include +#include + + +int +rpmatch (response) + const char *response; +{ + /* Match against one of the response patterns, compiling the pattern + first if necessary. */ + inline int try (const int tag, const int match, + const char **lastp, regex_t *re) + { + const char *pattern = nl_langinfo (tag); + if (pattern != *lastp) + { + /* The pattern has changed. */ + if (*lastp) + { + /* Free the old compiled pattern. */ + regfree (re); + *lastp = NULL; + } + /* Compile the pattern and cache it for future runs. */ + if (regcomp (re, pattern, REG_EXTENDED) != 0) + return -1; + *lastp = pattern; + } + + /* Try the pattern. */ + return regexec (re, response, 0, NULL, 0) == 0 ? match : !match; + } + + /* We cache the response patterns and compiled regexps here. */ + static const char *yesexpr, *noexpr; + static regex_t yesre, nore; + + return (try (YESEXPR, 1, &yesexpr, &yesre) ?: + try (NOEXPR, 0, &noexpr, &nore)); +} diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 65932e3d17..793c641671 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -444,6 +444,15 @@ extern size_t mbstowcs __P ((wchar_t * __pwcs, __const char *__s, size_t __n)); extern size_t wcstombs __P ((char *__s, __const wchar_t * __pwcs, size_t __n)); +#ifdef __USE_SVID +/* Determine whether the string value of RESPONSE matches the affirmation + or negative response expression as specified by the LC_MESSAGES category + in the program's current locale. Returns 1 if affirmative, 0 if + negative, and -1 if not matching. */ +extern int rpmatch __P ((__const char *__response)); +#endif + + __END_DECLS #endif /* stdlib.h */ -- cgit v1.2.1