Grep: Reintroducing local modification for HAMMER

This reintroduces the fix by Matthias Schmidt for the previous version of
grep.  The unmodified Grep 2.7 still displays the same directory errors as
Grep 2.4d.

diff --git a/contrib/grep/src/main.c b/contrib/grep/src/main.c
index 0a91b7f..04a4220 100644 (file)
--- a/contrib/grep/src/main.c
+++ b/contrib/grep/src/main.c
@@ -57,7 +57,7 @@
 
 #define AUTHORS \
   proper_name ("Mike Haertel"), \
-  _("others, see <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>")
+  _("others, see\n<http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>")
 
 struct stats
 {
@@ -1093,7 +1093,10 @@ grep (int fd, char const *file, struct stats *stats)
   if (! fillbuf (save, stats))
     {
       if (! is_EISDIR (errno, file))
-        suppressible_error (filename, errno);
+        {
+          if (errno != EINVAL)
+            suppressible_error (filename, errno);
+        }
       return 0;
     }