2004-01-28  Paolo Bonzini  <bonzini@gnu.org>

	Merge regex changes in gawk.
	* posix/regcomp.c (build_range_exp) [!_LIBC]: Check validity
	of collation elements.
	* posix/regex.c: Include limits.h.
	* posix/regex.h: Document REG_ECOLLATE correctly.
	* posix/regex_internal.h [!_LIBC && !ENABLE_NLS]: Disable NLS.
This commit is contained in:
Ulrich Drepper 2004-01-30 05:22:32 +00:00
parent 4bb333cdd2
commit df759c2a21
4 changed files with 17 additions and 3 deletions

View File

@ -1,3 +1,12 @@
2004-01-28 Paolo Bonzini <bonzini@gnu.org>
Merge regex changes in gawk.
* posix/regcomp.c (build_range_exp) [!_LIBC]: Check validity
of collation elements.
* posix/regex.c: Include limits.h.
* posix/regex.h: Document REG_ECOLLATE correctly.
* posix/regex_internal.h [!_LIBC && !ENABLE_NLS]: Disable NLS.
2004-01-24 Andreas Jaeger <aj@suse.de>
* malloc/obstack.h: Import gnulib version.

View File

@ -74,6 +74,12 @@
/* POSIX says that <sys/types.h> must be included (by the caller) before
<regex.h>. */
#include <sys/types.h>
/* On some systems, limits.h sets RE_DUP_MAX to a lower value than
GNU regex allows. Include it before <regex.h>, which correctly
#undefs RE_DUP_MAX and sets it to the right value. */
#include <limits.h>
#include <regex.h>
#include "regex_internal.h"

View File

@ -313,7 +313,7 @@ typedef enum
/* POSIX regcomp return error codes. (In the order listed in the
standard.) */
REG_BADPAT, /* Invalid pattern. */
REG_ECOLLATE, /* Not implemented. */
REG_ECOLLATE, /* Inalid collating element. */
REG_ECTYPE, /* Invalid character class name. */
REG_EESCAPE, /* Trailing backslash. */
REG_ESUBREG, /* Invalid back reference. */

View File

@ -23,7 +23,6 @@
#include <assert.h>
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -53,7 +52,7 @@
#endif
/* This is for other GNU distributions with internationalized messages. */
#if HAVE_LIBINTL_H || defined _LIBC
#if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
# include <libintl.h>
# ifdef _LIBC
# undef gettext