diff options
author | ache <ache@FreeBSD.org> | 2004-03-01 08:24:49 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2004-03-01 08:24:49 +0000 |
commit | 3bd1cc91fa82df69a394975cab714630e838f683 (patch) | |
tree | 95554c3104baf591ed6f8503658d0c73fce744d0 /gnu/usr.bin/grep | |
parent | 0b1110f652c0173c7a2fe53a62e2217f8a4bdb51 (diff) | |
parent | a28ccb3d69be53479d581654919168403fb79f65 (diff) | |
download | FreeBSD-src-3bd1cc91fa82df69a394975cab714630e838f683.zip FreeBSD-src-3bd1cc91fa82df69a394975cab714630e838f683.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r126432,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'gnu/usr.bin/grep')
-rw-r--r-- | gnu/usr.bin/grep/ChangeLog | 77 | ||||
-rw-r--r-- | gnu/usr.bin/grep/NEWS | 5 | ||||
-rw-r--r-- | gnu/usr.bin/grep/THANKS | 1 | ||||
-rw-r--r-- | gnu/usr.bin/grep/doc/grep.texi | 4 | ||||
-rw-r--r-- | gnu/usr.bin/grep/doc/version.texi | 6 | ||||
-rw-r--r-- | gnu/usr.bin/grep/grepmat.c | 6 | ||||
-rw-r--r-- | gnu/usr.bin/grep/savedir.c | 3 | ||||
-rw-r--r-- | gnu/usr.bin/grep/system.h | 2 |
8 files changed, 94 insertions, 10 deletions
diff --git a/gnu/usr.bin/grep/ChangeLog b/gnu/usr.bin/grep/ChangeLog index 1e279c3..c98848a 100644 --- a/gnu/usr.bin/grep/ChangeLog +++ b/gnu/usr.bin/grep/ChangeLog @@ -1,3 +1,70 @@ +2000-03-08 Alain Magloire + + * configure.in: version 2.4.2 + +2000-03-07 Paul Eggert + + * Make intl subdirectory match fileutils, tar, etc.; + see intl/ChangeLog for details. + + * src/getpagesize.h: Reformat to match latest fileutils. + + * src/savedir.c (savedir): Work even if directory size is + negative; this can happen with some NFS screwups. + +2000-03-03 Jim Meyering + + * regex.m4: Make sure re_compile_pattern accepts patterns like `{1'. + +2000-03-02 Alain Magloire + + * 2.4.1 Release + +2000-02-25 Paul Eggert + + * configure.in (LIBOBJS): Work around automake 1.4 bug: + regex.c wasn't being passed through ansi2knr on pre-ANSI hosts. + (ac_use_included_regex): Fix typo in warning. + * src/Makefile.am (EXTRA_DIST): Remove regex.c, as the LIBOBJS + workaround means that automake now puts regex.c into DIST_COMMON. + +2000-02-25 Alain Magloire + + * po/*.po: update of the PO files. + +2000-02-22 Eli Zaretskii + + * doc/grep.1: Two small glitches(typos). + +2000-02-18 Eli Zaretskii + + * djgpp/config.site (prefix, INSTALL): Use /dev/env/DJDIR instead + of ${DJDIR}, so that the produced Makefile's work on any DJGPP + installation. + +2000-01-30 Alain Magloire + + * doc/grep.1: corrected typo. + Noted by Ruslan Ermilob. + +2000-01-30 Alain Magloire + + * vms/Makefile.am: added config_vms.h to EXTRA_DIST. + * vms/config_vms.h: New File, contains macros specific to VMS and + avoid namespace collision with operating system supplied C library. + * vms/make.com: Better compiler auto-detection; information for builds + on pre-OpenVMS 7.x systems; general overhaul. + * src/getpagesize.h: Reinstate support for different pagesizes on + VAX and Alpha. Work around problem with DEC C compiler. + * src/vms_fab.c: Cast to some assigments; fixed typo argcp vs. argp. + * src/vms_fab.h: Added new include files to avoid warnings about + undefined function prototypes. + Those patches were provided by Martin P.J. Zinser (zinser@decus.de). + +2000-01-30 Paul Eggert + + * src/grep.c (main): Update copyright notice. + 2000-01-28 Alain Magloire * src/grep.c (usage): The example "%s -i 'hello.*world' could @@ -6,14 +73,14 @@ * configure.in: Reenable, jm_INCLUDE_REGEX() since we now track GNU lib C. - * src/Makefile.am: EXTRA_DIST new macros with regex.c regex.h. + * src/Makefile.am: EXTRA_DIST new macros with regex.c regex.h. Requested By Ulrich Drepper. - + 2000-01-25 Paul Eggert * src/grep.c (grep): If the final byte of an input file is not a newline, grep now silently supplies one. - * doc/grep.texi, NEWS: Likewise. + * doc/grep.texi, NEWS: Likewise. 2000-01-25 Paul Eggert @@ -121,6 +188,10 @@ name_size is zero and the directory is empty. Reported by Dima Barsky <dima@pwd.hp.com>. +1999-12-03 Alain Magloire + + * 2.4 Release. + 1999-11-18 Paul Eggert * m4/largefile.m4 (AC_SYS_LARGEFILE_FLAGS): Work around a diff --git a/gnu/usr.bin/grep/NEWS b/gnu/usr.bin/grep/NEWS index e763647..115952f 100644 --- a/gnu/usr.bin/grep/NEWS +++ b/gnu/usr.bin/grep/NEWS @@ -1,3 +1,8 @@ +Version 2.4.2 + + - Added more check in configure to default the grep-${version}/src/regex.c + instead of the one in GNU Lib C. + Version 2.4.1 - If the final byte of an input file is not a newline, grep now silently diff --git a/gnu/usr.bin/grep/THANKS b/gnu/usr.bin/grep/THANKS index b0c23f9..40295fc 100644 --- a/gnu/usr.bin/grep/THANKS +++ b/gnu/usr.bin/grep/THANKS @@ -25,6 +25,7 @@ Kazuro Furukawa <furukawa@apricot.kek.jp> Keith Bostic <bostic@bsdi.com> Krishna Sethuraman <krishna@sgihub.corp.sgi.com> Mark Waite <markw@mddmew.fc.hp.com> +Martin P.J. Zinser <zinser@decus.de> Martin Rex <martin.rex@sap-ag.de> Michael Aichlmayr <mikla@nx.com> Miles Bader <miles@ccs.mt.nec.co.jp> diff --git a/gnu/usr.bin/grep/doc/grep.texi b/gnu/usr.bin/grep/doc/grep.texi index 49493de..beb2410 100644 --- a/gnu/usr.bin/grep/doc/grep.texi +++ b/gnu/usr.bin/grep/doc/grep.texi @@ -35,7 +35,7 @@ Published by the Free Software Foundation, 59 Temple Place - Suite 330 Boston, MA 02111-1307, USA -Copyright 1999 Free Software Foundation, Inc. +Copyright 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -68,7 +68,7 @@ by the Foundation. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1999 Free Software Foundation, Inc. +Copyright @copyright{} 2000 Free Software Foundation, Inc. @sp 2 Published by the Free Software Foundation, @* diff --git a/gnu/usr.bin/grep/doc/version.texi b/gnu/usr.bin/grep/doc/version.texi index 5246f40..c87a09f 100644 --- a/gnu/usr.bin/grep/doc/version.texi +++ b/gnu/usr.bin/grep/doc/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 27 January 2000 -@set EDITION 2.4d -@set VERSION 2.4d +@set UPDATED 2 February 2000 +@set EDITION 2.4.2 +@set VERSION 2.4.2 diff --git a/gnu/usr.bin/grep/grepmat.c b/gnu/usr.bin/grep/grepmat.c new file mode 100644 index 0000000..7947a65 --- /dev/null +++ b/gnu/usr.bin/grep/grepmat.c @@ -0,0 +1,6 @@ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif +#include "system.h" +#include "grep.h" +char const *matcher; diff --git a/gnu/usr.bin/grep/savedir.c b/gnu/usr.bin/grep/savedir.c index 29b3842..e969407 100644 --- a/gnu/usr.bin/grep/savedir.c +++ b/gnu/usr.bin/grep/savedir.c @@ -89,7 +89,8 @@ savedir (const char *dir, off_t name_size) /* Be sure name_size is at least `1' so there's room for the final NUL byte. */ - name_size += !name_size; + if (name_size <= 0) + name_size = 1; name_space = (char *) malloc (name_size); if (name_space == NULL) diff --git a/gnu/usr.bin/grep/system.h b/gnu/usr.bin/grep/system.h index 3cd9b56..a6654b6 100644 --- a/gnu/usr.bin/grep/system.h +++ b/gnu/usr.bin/grep/system.h @@ -1,5 +1,5 @@ /* Portability cruft. Include after config.h and sys/types.h. - Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc. + Copyright 1996, 1998, 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 |