From 45b3882a1187f0e957efbc4fc5d797ba9603f545 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 27 Oct 2014 18:08:59 -0500 Subject: O_CLOEXEC was confusing the O_RDONLY test in loopfiles(), resulting in attempts to read from stdout instead of stdin for "-" or no arguments. --- lib/lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/lib.c b/lib/lib.c index dc2de121..5923176c 100644 --- a/lib/lib.c +++ b/lib/lib.c @@ -437,12 +437,12 @@ void loopfiles_rw(char **argv, int flags, int permissions, int failok, int fd; // If no arguments, read from stdin. - if (!*argv) function(flags ? 1 : 0, "-"); + if (!*argv) function((flags & O_ACCMODE) != O_RDONLY ? 1 : 0, "-"); else do { // Filename "-" means read from stdin. // Inability to open a file prints a warning, but doesn't exit. - if (!strcmp(*argv,"-")) fd=0; + if (!strcmp(*argv, "-")) fd=0; else if (0>(fd = open(*argv, flags, permissions)) && !failok) { perror_msg("%s", *argv); toys.exitval = 1; -- cgit v1.2.3