aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/grep.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2016-09-05 00:55:24 -0500
committerRob Landley <rob@landley.net>2016-09-05 00:55:24 -0500
commiteed9ed41aa73023af8f79cd5353b96b80585490f (patch)
tree9b1a36022b0748b06224c48239d0c0e2ebbefddc /toys/posix/grep.c
parent7f7907f53ecaeabb00929feb0ede85a456683ddc (diff)
downloadtoybox-eed9ed41aa73023af8f79cd5353b96b80585490f.tar.gz
Replace loopfiles' failok with WARN_ONLY open flag.
Diffstat (limited to 'toys/posix/grep.c')
-rw-r--r--toys/posix/grep.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/toys/posix/grep.c b/toys/posix/grep.c
index 6423ea6b..2fe6ac27 100644
--- a/toys/posix/grep.c
+++ b/toys/posix/grep.c
@@ -81,17 +81,12 @@ static void outline(char *line, char dash, char *name, long lcount, long bcount,
static void do_grep(int fd, char *name)
{
struct double_list *dlb = 0;
- FILE *file = fdopen(fd, "r");
+ FILE *file = xfdopen(fd, "r");
long lcount = 0, mcount = 0, offset = 0, after = 0, before = 0;
char *bars = 0;
if (!fd) name = "(standard input)";
- if (!file) {
- perror_msg_raw(name);
- return;
- }
-
// Loop through lines of input
for (;;) {
char *line = 0, *start;
@@ -368,5 +363,5 @@ void grep_main(void)
if (!strcmp(*ss, "-")) do_grep(0, *ss);
else dirtree_read(*ss, do_grep_r);
}
- } else loopfiles_rw(ss, O_RDONLY, 0, 1, do_grep);
+ } else loopfiles_rw(ss, O_RDONLY|WARN_ONLY, 0, do_grep);
}