From 25b0d01442dada3bf59424651ac8b8c53e71d70f Mon Sep 17 00:00:00 2001 From: tjr Date: Sun, 4 Jul 2004 10:05:37 +0000 Subject: Update for grep 2.5.1. --- gnu/usr.bin/grep/Makefile | 6 +- gnu/usr.bin/grep/config.h | 368 +++++++++++++++++++++++++++++++--------------- 2 files changed, 254 insertions(+), 120 deletions(-) (limited to 'gnu/usr.bin/grep') diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 17fa75e..b0c3988 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -3,7 +3,9 @@ GREP_LIBZ=YES PROG= grep -SRCS= dfa.c grep.c grepmat.c kwset.c obstack.c savedir.c search.c +SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \ + isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \ + xstrtoumax.c CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H @@ -50,6 +52,6 @@ check: all fi TESTS= warning.sh khadafy.sh spencer1.sh bre.sh ere.sh status.sh empty.sh \ - options.sh + options.sh backref.sh file.sh .include diff --git a/gnu/usr.bin/grep/config.h b/gnu/usr.bin/grep/config.h index 0a83503..88f83d8 100644 --- a/gnu/usr.bin/grep/config.h +++ b/gnu/usr.bin/grep/config.h @@ -1,200 +1,304 @@ /* $FreeBSD$ */ +/* config.h. Generated by configure. */ +/* config.hin. Generated from configure.in by autoheader. */ -/* config.h. Generated automatically by configure. */ -/* config.hin. Generated automatically from configure.in by autoheader. */ +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +/* #undef CLOSEDIR_VOID */ -/* Define if using alloca.c. */ -/* #undef C_ALLOCA */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ -/* Define if the closedir function returns void instead of int. */ -/* #undef CLOSEDIR_VOID */ +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* We are building grep */ +#define GREP 1 -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ /* #undef HAVE_ALLOCA_H */ -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ +/* Define to 1 if you have the `atexit' function. */ +#define HAVE_ATEXIT 1 -/* Define to `long' if doesn't define. */ -/* #undef off_t */ +/* Define to 1 if you have the `btowc' function. */ +#define HAVE_BTOWC 1 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Define to 1 if you have the `dcgettext' function. */ +/* #undef HAVE_DCGETTEXT */ -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ +/* Define to 1 if strerror_r is declared. */ +#define HAVE_DECL_STRERROR_R 1 -/* Define if the `S_IS*' macros in do not work properly. */ -/* #undef STAT_MACROS_BROKEN */ +/* Define if declares strtoul. */ +#define HAVE_DECL_STRTOUL 1 -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define if declares strtoull. */ +#define HAVE_DECL_STRTOULL 1 -/* Define to use grep's error-checking malloc in the kwset routines. */ -#define GREP 1 +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 -/* Package name. */ -#define PACKAGE "grep" +/* Define if the malloc check has been performed. */ +#define HAVE_DONE_WORKING_MALLOC_CHECK 1 -/* Version number. */ -#define VERSION "2.4.2" +/* Define if the realloc check has been performed. */ +#define HAVE_DONE_WORKING_REALLOC_CHECK 1 -/* Define to `int' if doesn't define. */ -/* #undef ssize_t */ +/* Define to 1 if you have the `doprnt' function. */ +/* #undef HAVE_DOPRNT */ -/* Hack for Visual C++ suggested by irox. */ -/* #undef alloca */ +/* Define if text file lines end in CRLF. */ +/* #undef HAVE_DOS_FILE_CONTENTS */ -#define HAVE_STPCPY 1 +/* Define if your OS uses backslashes as directory separators */ +/* #undef HAVE_DOS_FILE_NAMES */ -/* #undef ENABLE_NLS */ +/* Define to 1 if you have the `feof_unlocked' function. */ +#define HAVE_FEOF_UNLOCKED 1 -/* #undef HAVE_CATGETS */ +/* Define to 1 if you have the `fgets_unlocked' function. */ +/* #undef HAVE_FGETS_UNLOCKED */ -/* #undef HAVE_GETTEXT */ +/* Define to 1 if you have the `fnmatch' function. */ +#define HAVE_FNMATCH 1 -#define HAVE_LC_MESSAGES 1 +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 -/* - * DOS specific - */ -/* #undef HAVE_DOS_FILE_NAMES */ +/* Define to 1 if you have the `getegid' function. */ +#define HAVE_GETEGID 1 -/* Define if you have the __argz_count function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 -/* Define if you have the __argz_next function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Define to 1 if you have the `getgid' function. */ +#define HAVE_GETGID 1 -/* Define if you have the __argz_stringify function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 -/* Define if you have the btowc function. */ -#define HAVE_BTOWC 1 +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ -/* Define if you have the dcgettext function. */ -/* #undef HAVE_DCGETTEXT */ +/* Define to 1 if you have the `getuid' function. */ +#define HAVE_GETUID 1 -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 +/* Define if you have the iconv() function. */ +/* #undef HAVE_ICONV */ -/* Define if you have the getpagesize function. */ -#define HAVE_GETPAGESIZE 1 +/* Define if exists, doesn't clash with , and + declares uintmax_t. */ +#define HAVE_INTTYPES_H 1 -/* Define if you have the isascii function. */ +/* Define to 1 if you have the `isascii' function. */ #define HAVE_ISASCII 1 -/* Define if you have the memchr function. */ +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define to 1 if you have the `pcre' library (-lpcre). */ +/* #undef HAVE_LIBPCRE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the `mbrtowc' function. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 -/* Define if you have the memmove function. */ +/* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 -/* Define if you have the munmap function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 -/* Define if you have the putenv function. */ +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 -/* Define if you have the setmode function. */ +/* Define to 1 if you have the `setmode' function. */ #define HAVE_SETMODE 1 -/* Define if you have the stpcpy function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ #define HAVE_STPCPY 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the strdup function. */ +/* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 -/* Define if you have the strerror function. */ +/* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 -/* Define if you have the wctype function. */ -#define HAVE_WCTYPE 1 +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_LIBINTL_H */ +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* Define to 1 if you have the `strtoull' function. */ +/* #undef HAVE_STRTOULL */ -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 +/* Define to 1 if you have the `strtoumax' function. */ +#define HAVE_STRTOUMAX 1 -/* Define if you have the header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define if you have the header file. */ -#define HAVE_MEMORY_H 1 +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ -/* Define if you have the header file. */ -/* #undef HAVE_NDIR_H */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ -/* Define if you have the header file. */ -#define HAVE_NL_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_SYS_DIR_H */ +/* Define to 1 if you have the `tsearch' function. */ +#define HAVE_TSEARCH 1 -/* Define if you have the header file. */ -/* #undef HAVE_SYS_NDIR_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +/* Define if you have the unsigned long long type. */ +#define HAVE_UNSIGNED_LONG_LONG 1 -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the `wctype' function. */ +#define HAVE_WCTYPE 1 + +/* Define to 1 if you have the header file. */ #define HAVE_WCTYPE_H 1 -/* Define if you have the i library (-li). */ -/* #undef HAVE_LIBI */ +/* Define to 1 if strerror_r returns a string. */ +/* #undef HAVE_WORKING_STRERROR_R */ + +/* Define to 1 if you have the `__argz_count' function. */ +/* #undef HAVE___ARGZ_COUNT */ + +/* Define to 1 if you have the `__argz_next' function. */ +/* #undef HAVE___ARGZ_NEXT */ + +/* Define to 1 if you have the `__argz_stringify' function. */ +/* #undef HAVE___ARGZ_STRINGIFY */ + +/* Define as const if the declaration of iconv() needs const. */ +/* #undef ICONV_CONST */ + +/* Name of package */ +#define PACKAGE "grep" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define if compiler has function prototypes */ +#define PROTOTYPES 1 + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "2.5.1" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ @@ -205,6 +309,34 @@ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ -/* Define if compiler has function prototypes */ -#define PROTOTYPES 1 +/* Define if your compiler is broken */ +/* #undef alloca */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +/* #undef inline */ + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to a type if does not define. */ +/* #undef mbstate_t */ + +/* Define to `long' if does not define. */ +/* #undef off_t */ + +/* Define to rpl_realloc if the replacement function should be used. */ +/* #undef realloc */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ +/* Define to unsigned long or unsigned long long if doesn't + define. */ +/* #undef uintmax_t */ -- cgit v1.1