From 8784d8d968c72328db11a72d50c836fc1650fa9a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 8 Jan 2016 19:13:38 -0600 Subject: Fix cat -. Commit 4b4ab6a50998 broke loopfiles' handling of "-". This broke the existing cat tests, so no new test is necessary here. --- lib/lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/lib.c') diff --git a/lib/lib.c b/lib/lib.c index 8d12b983..c4191d6c 100644 --- a/lib/lib.c +++ b/lib/lib.c @@ -548,12 +548,12 @@ void loopfiles_rw(char **argv, int flags, int permissions, int failok, // Inability to open a file prints a warning, but doesn't exit. if (!strcmp(*argv, "-")) fd=0; - else if (0>(fd = open(*argv, flags, permissions)) && !failok) + else if (0>(fd = open(*argv, flags, permissions)) && !failok) { perror_msg_raw(*argv); - else { - function(fd, *argv); - if (flags & O_CLOEXEC) close(fd); + continue; } + function(fd, *argv); + if (flags & O_CLOEXEC) close(fd); } while (*++argv); } -- cgit v1.2.3