diff options
author | ache <ache@FreeBSD.org> | 2004-03-01 08:37:20 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2004-03-01 08:37:20 +0000 |
commit | 15469f77d238e7b63ee6d19a2f7b8fe12a2d7cca (patch) | |
tree | ad7f14d8e041571bfa51496aa6bc1485685c9a27 /gnu | |
parent | 3bd1cc91fa82df69a394975cab714630e838f683 (diff) | |
download | FreeBSD-src-15469f77d238e7b63ee6d19a2f7b8fe12a2d7cca.zip FreeBSD-src-15469f77d238e7b63ee6d19a2f7b8fe12a2d7cca.tar.gz |
Merge conflicts, upgrade
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/grep/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/grep/config.h | 11 | ||||
-rw-r--r-- | gnu/usr.bin/grep/dfa.c | 2 | ||||
-rw-r--r-- | gnu/usr.bin/grep/getpagesize.h | 56 | ||||
-rw-r--r-- | gnu/usr.bin/grep/grep.1 | 10 | ||||
-rw-r--r-- | gnu/usr.bin/grep/grep.c | 5 | ||||
-rw-r--r-- | gnu/usr.bin/grep/kwset.c | 4 | ||||
-rw-r--r-- | gnu/usr.bin/grep/search.c | 2 |
8 files changed, 51 insertions, 41 deletions
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index c854695..17fa75e 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -3,7 +3,7 @@ GREP_LIBZ=YES PROG= grep -SRCS= dfa.c grep.c kwset.c obstack.c savedir.c search.c +SRCS= dfa.c grep.c grepmat.c kwset.c obstack.c savedir.c search.c CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H diff --git a/gnu/usr.bin/grep/config.h b/gnu/usr.bin/grep/config.h index 2bae7dc..0a83503 100644 --- a/gnu/usr.bin/grep/config.h +++ b/gnu/usr.bin/grep/config.h @@ -56,7 +56,7 @@ #define PACKAGE "grep" /* Version number. */ -#define VERSION "2.4d" +#define VERSION "2.4.2" /* Define to `int' if <sys/types.h> doesn't define. */ /* #undef ssize_t */ @@ -89,7 +89,7 @@ /* #undef HAVE___ARGZ_STRINGIFY */ /* Define if you have the btowc function. */ -/* #undef HAVE_BTOWC */ +#define HAVE_BTOWC 1 /* Define if you have the dcgettext function. */ /* #undef HAVE_DCGETTEXT */ @@ -140,7 +140,7 @@ #define HAVE_STRERROR 1 /* Define if you have the wctype function. */ -/* #undef HAVE_WCTYPE */ +#define HAVE_WCTYPE 1 /* Define if you have the <argz.h> header file. */ /* #undef HAVE_ARGZ_H */ @@ -188,10 +188,10 @@ #define HAVE_UNISTD_H 1 /* Define if you have the <wchar.h> header file. */ -/* #undef HAVE_WCHAR_H */ +#define HAVE_WCHAR_H 1 /* Define if you have the <wctype.h> header file. */ -/* #undef HAVE_WCTYPE_H */ +#define HAVE_WCTYPE_H 1 /* Define if you have the i library (-li). */ /* #undef HAVE_LIBI */ @@ -207,3 +207,4 @@ /* Define if compiler has function prototypes */ #define PROTOTYPES 1 + diff --git a/gnu/usr.bin/grep/dfa.c b/gnu/usr.bin/grep/dfa.c index 977aace..df6880e 100644 --- a/gnu/usr.bin/grep/dfa.c +++ b/gnu/usr.bin/grep/dfa.c @@ -1,5 +1,5 @@ /* dfa.c - deterministic extended regexp routines for GNU - Copyright (C) 1988, 1998 Free Software Foundation, Inc. + Copyright 1988, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/usr.bin/grep/getpagesize.h b/gnu/usr.bin/grep/getpagesize.h index 4e513c3..daf7f81 100644 --- a/gnu/usr.bin/grep/getpagesize.h +++ b/gnu/usr.bin/grep/getpagesize.h @@ -1,35 +1,43 @@ /* Emulate getpagesize on systems that lack it. */ -#ifndef HAVE_GETPAGESIZE +/* $FreeBSD$ */ -#ifdef VMS -#define getpagesize() 512 -#endif +#ifndef HAVE_GETPAGESIZE #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif -#ifdef _SC_PAGESIZE -#define getpagesize() sysconf(_SC_PAGESIZE) -#else +#if !defined getpagesize && defined _SC_PAGESIZE +# if !(defined VMS && __VMS_VER < 70000000) +# define getpagesize() sysconf (_SC_PAGESIZE) +# endif +#endif -#include <sys/param.h> +#if !defined getpagesize && defined VMS +# ifdef __ALPHA +# define getpagesize() 8192 +# else +# define getpagesize() 512 +# endif +#endif -#ifdef EXEC_PAGESIZE -#define getpagesize() EXEC_PAGESIZE -#else -#ifdef NBPG -#define getpagesize() NBPG * CLSIZE -#ifndef CLSIZE -#define CLSIZE 1 -#endif /* no CLSIZE */ -#else /* no NBPG */ -#ifdef NBPC -#define getpagesize() NBPC -#endif /* NBPC */ -#endif /* no NBPG */ -#endif /* no EXEC_PAGESIZE */ -#endif /* no _SC_PAGESIZE */ +#ifndef getpagesize +# include <sys/param.h> +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else +# ifdef NBPG +# ifndef CLSIZE +# define CLSIZE 1 +# endif +# define getpagesize() (NBPG * CLSIZE) +# else +# ifdef NBPC +# define getpagesize() NBPC +# endif +# endif +# endif +#endif #endif /* not HAVE_GETPAGESIZE */ diff --git a/gnu/usr.bin/grep/grep.1 b/gnu/usr.bin/grep/grep.1 index 0c7e990..6d8b17e 100644 --- a/gnu/usr.bin/grep/grep.1 +++ b/gnu/usr.bin/grep/grep.1 @@ -13,7 +13,7 @@ .de Id .ds Dt \\$4 .. -.Id $Id: grep.1,v 1.9 2000/01/26 03:42:16 alainm Exp $ +.Id $Id: grep.1,v 1.11 2000/02/26 03:18:40 alainm Exp $ .TH GREP 1 \*(Dt "GNU Project" .SH NAME grep, egrep, fgrep, zgrep, zegrep, zfgrep, @@ -110,7 +110,7 @@ If is .BR without-match , .B grep -assumes that a binary file does not match; this is equivalent to the +assumes that a binary file does not match; this is equivalent to the .B \-I option. If @@ -151,8 +151,8 @@ If .I ACTION is .BR recurse , -.B -grep reads all files under each directory, recursively; +.B grep +reads all files under each directory, recursively; this is equivalent to the .B \-r option. @@ -178,7 +178,7 @@ any of which is to be matched. Obtain patterns from .IR FILE , one per line. -The empty file contains zero patterns, and therfore matches nothing. +The empty file contains zero patterns, and therefore matches nothing. .TP .BR \-G ", " \-\^\-basic-regexp Interpret diff --git a/gnu/usr.bin/grep/grep.c b/gnu/usr.bin/grep/grep.c index c553edb..bee3b88 100644 --- a/gnu/usr.bin/grep/grep.c +++ b/gnu/usr.bin/grep/grep.c @@ -1,5 +1,5 @@ /* grep.c - main driver file for grep. - Copyright (C) 1992, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright 1992, 1997-1999, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -121,7 +121,6 @@ static struct option long_options[] = }; /* Define flags declared in grep.h. */ -char const *matcher; int match_icase; int match_words; int match_lines; @@ -1492,7 +1491,7 @@ main (int argc, char **argv) printf (_("%s (GNU grep) %s\n"), matcher, VERSION); printf ("\n"); printf (_("\ -Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n")); +Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n")); printf (_("\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")); diff --git a/gnu/usr.bin/grep/kwset.c b/gnu/usr.bin/grep/kwset.c index 92dbf09..51deca4 100644 --- a/gnu/usr.bin/grep/kwset.c +++ b/gnu/usr.bin/grep/kwset.c @@ -1,5 +1,5 @@ /* kwset.c - search for any of a set of keywords. - Copyright (C) 1989, 1998 Free Software Foundation, Inc. + Copyright 1989, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD$ */ + /* Written August 1989 by Mike Haertel. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c index 6a5d640..d73f6d4 100644 --- a/gnu/usr.bin/grep/search.c +++ b/gnu/usr.bin/grep/search.c @@ -1,5 +1,5 @@ /* search.c - searching subroutines using dfa, kwset and regex for grep. - Copyright (C) 1992, 1998 Free Software Foundation, Inc. + Copyright 1992, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |