From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 13 Jan 2025 16:37:06 +0000 (+0000)
Subject: tail: fix regression in open() flags used
X-Git-Tag: v9.6~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=527d331af451f809f87fac846a8bd5a93ac4efb0;p=thirdparty%2Fcoreutils.git

tail: fix regression in open() flags used

* 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.
---

diff --git a/src/tail.c b/src/tail.c
index 30207e288f..1ed1c4fab3 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -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);