summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorsimonb <simonb@NetBSD.org>1999-02-20 11:34:28 +0000
committersimonb <simonb@NetBSD.org>1999-02-20 11:34:28 +0000
commitdd5548c01e75e05cdcb608a6080a3d2df9e93b0c (patch)
treee39b32599ce8dca73df9ebb00bd5ace3d2eb48de /gnu
parent5eed3256fef185d234bec6f2543fb4ebc94dd4e6 (diff)
Resolve conflicts from import.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/dist/grep/doc/grep.texi2
-rw-r--r--gnu/dist/grep/src/grep.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/dist/grep/doc/grep.texi b/gnu/dist/grep/doc/grep.texi
index aa68628e28e..2f21079e2a0 100644
--- a/gnu/dist/grep/doc/grep.texi
+++ b/gnu/dist/grep/doc/grep.texi
@@ -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.
diff --git a/gnu/dist/grep/src/grep.c b/gnu/dist/grep/src/grep.c
index da5a203b9af..de93ade084a 100644
--- a/gnu/dist/grep/src/grep.c
+++ b/gnu/dist/grep/src/grep.c
@@ -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"));