From 3d9a8073c236b4cb2f7a237ca83c133e55d49f49 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Fri, 31 Jul 2015 15:01:30 +0200 Subject: 35963: simplify condition found by coverity to include tautology --- ChangeLog | 3 +++ Src/Modules/system.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa46e98ce..c638e5f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-07-31 Oliver Kiddle + * 35963: Src/Modules/system.c: simplify condition found by + coverity scan to include tautology + * Matthew Martin: 35960 (tweaked): Completion/Unix/Command/_find: complete correct options for OpenBSD's find diff --git a/Src/Modules/system.c b/Src/Modules/system.c index a1ed33a96..1ab1fb17e 100644 --- a/Src/Modules/system.c +++ b/Src/Modules/system.c @@ -311,8 +311,7 @@ bin_sysopen(char *nam, char **args, Options ops, UNUSED(int func)) int write = OPT_ISSET(ops, 'w'); int append = OPT_ISSET(ops, 'a') ? O_APPEND : 0; int flags = O_NOCTTY | append | ((append || write) ? - (read ? O_RDWR : O_WRONLY) : - (!append || read) ? O_RDONLY : O_WRONLY); + (read ? O_RDWR : O_WRONLY) : O_RDONLY); char *opt, *ptr, *nextopt, *fdvar; int o, fd, explicit = -1; mode_t perms = 0666; -- cgit 1.4.1