]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
tail: fix regression in open() flags used
authorPádraig Brady <P@draigBrady.com>
Mon, 13 Jan 2025 16:37:06 +0000 (16:37 +0000)
committerPádraig Brady <P@draigBrady.com>
Mon, 13 Jan 2025 17:24:16 +0000 (17:24 +0000)
* src/tail.c (tail_file): Fix precedence issue introduced
in commit v9.5-231-g177fcec66 so that we pass correct flags to open().
Effectively this meant we would have dropped the O_BINARY flag
on windows, since O_RDONLY is generally 0.
Issue spotted by coverity.

src/tail.c

index 30207e288feecde2230c8172f876bd7f586f6f30..1ed1c4fab3d858ffd25bc3655254e5a8ebf28cd2 100644 (file)
@@ -2020,8 +2020,7 @@ tail_file (struct File_spec *f, uintmax_t n_files, uintmax_t n_units)
       xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
-    fd = open (f->name, O_RDONLY | O_BINARY
-               | nonblocking ? O_NONBLOCK : 0);
+    fd = open (f->name, O_RDONLY | O_BINARY | (nonblocking ? O_NONBLOCK : 0));
 
   f->tailable = !(reopen_inaccessible_files && fd == -1);