summaryrefslogtreecommitdiff
path: root/external/gpl2
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2021-12-28 14:59:02 +0000
committerchristos <christos@NetBSD.org>2021-12-28 14:59:02 +0000
commit9a7f9996ae48e2cdee76f1c46a8cdd84b3dac62d (patch)
tree8436c541c6ecd62748df503a3793adbca82030a1 /external/gpl2
parent39088dffbaeddd3ad766e1a242e1783dc6ae87ef (diff)
PR/56584: Andreas Gustafsson: Skip FIFO's when -D
Diffstat (limited to 'external/gpl2')
-rw-r--r--external/gpl2/grep/dist/src/grep.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/external/gpl2/grep/dist/src/grep.c b/external/gpl2/grep/dist/src/grep.c
index 0bd60ef0d64..13c17ff85ab 100644
--- a/external/gpl2/grep/dist/src/grep.c
+++ b/external/gpl2/grep/dist/src/grep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.2 2016/01/10 22:16:40 christos Exp $ */
+/* $NetBSD: grep.c,v 1.3 2021/12/28 14:59:02 christos Exp $ */
/* grep.c - main driver file for grep.
Copyright 1992, 1997-1999, 2000 Free Software Foundation, Inc.
@@ -271,11 +271,15 @@ reset (int fd, char const *file, struct stats *stats)
}
if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode))
return 0;
-#ifndef DJGPP
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode)))
-#else
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode)))
+ if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode)
+ || S_ISBLK(stats->stat.st_mode)
+#ifdef S_ISSOCK
+ || S_ISSOCK(stats->stat.st_mode)
+#endif
+#ifdef S_ISFIFO
+ || S_ISFIFO(stats->stat.st_mode)
#endif
+ ))
return 0;
if (S_ISREG (stats->stat.st_mode))
{