Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts from import.

This commit is contained in:
simonb 1999-02-20 11:34:28 +00:00
parent 5eed3256fe
commit dd5548c01e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/dist/grep/doc/grep.texi vendored
View File

@ -119,7 +119,7 @@ This document was produced for version @value{VERSION} of @sc{GNU} @sc{grep}.
@cindex Searching for a pattern.
@sc{grep} searches the input files for lines containing a match to a given
pattern list. When it finds a match in a line, it copies the line to standard
output (by default), or does whatever othre sort of output you have requested
output (by default), or does whatever other sort of output you have requested
with options. @sc{grep} expects to do the matching on text.
Since newline is also a separator for the list of patterns, there
is no way to match newline characters in a text.

7
gnu/dist/grep/src/grep.c vendored
View File

@ -1,5 +1,5 @@
/* grep.c - main driver file for grep.
Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc.
Copyright (C) 1992, 1997, 1998, 1999 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
@ -128,6 +128,9 @@ static void nlscan PARAMS ((char *));
static int grep PARAMS ((int, char const *, struct stats *));
static int grepdir PARAMS ((char const *, struct stats *));
static int grepfile PARAMS ((char const *, struct stats *));
#if O_BINARY
static inline int undossify_input PARAMS ((register char *, size_t));
#endif
/* Functions we'll use to search. */
static void (*compile) PARAMS ((char *, size_t));
@ -1254,7 +1257,7 @@ main (argc, argv)
printf (_("grep (GNU grep) %s\n"), VERSION);
printf ("\n");
printf (_("\
Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"));
Copyright (C) 1988, 1992-1998, 1999 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"));