mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
(set_fd_flags): Undo part of today's change: it's a little
cleaner -- and more efficient in the common case -- to go ahead and OR in the -1 when fcntl fails.
This commit is contained in:
1 parent
1af4fd3a54
commit
82024e9938
1 file changed
+2
-2
@@ -1014,7 +1014,7 @@ copy_with_unblock (char const *buf, size_t nread)
|
||||
}
|
||||
|
||||
/* Set the file descriptor flags for FD that correspond to the nonzero bits
|
||||
in FLAGS. The file's name is NAME. */
|
||||
in ADD_FLAGS. The file's name is NAME. */
|
||||
|
||||
static void
|
||||
set_fd_flags (int fd, int add_flags, char const *name)
|
||||
@@ -1022,7 +1022,7 @@ set_fd_flags (int fd, int add_flags, char const *name)
|
||||
if (add_flags)
|
||||
{
|
||||
int old_flags = fcntl (fd, F_GETFL);
|
||||
int new_flags = old_flags < 0 ? add_flags : (old_flags | add_flags);
|
||||
int new_flags = old_flags | add_flags;
|
||||
if (old_flags < 0
|
||||
|| (new_flags != old_flags && fcntl (fd, F_SETFL, new_flags) == -1))
|
||||
error (EXIT_FAILURE, errno, _("setting flags for %s"), quote (name));
|
||||
|
||||
Reference in new issue
Block a user