diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2024-05-10 10:59:18 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2024-05-10 10:59:30 +0000 |
| commit | c6f9df7064106a3b016c13ea3b9a930362b53089 (patch) | |
| tree | ac778899d945f1096b9cf8b627d226283d059882 /bin | |
| parent | 634dd430b966405f7bd9c2d647b0d7c1281c3de9 (diff) | |
| download | src-c6f9df7064106a3b016c13ea3b9a930362b53089.tar.gz src-c6f9df7064106a3b016c13ea3b9a930362b53089.zip | |
cat: Check for lack of success rather than a specific failure.
MFC after: 3 days
Sponsored by: Klara, Inc.
Reviewed by: oshogbo
Differential Revision: https://reviews.freebsd.org/D45149
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/cat/cat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 5dceb1cad94b..5db2781e9912 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -198,7 +198,7 @@ main(int argc, char *argv[]) stdout_lock.l_start = 0; stdout_lock.l_type = F_WRLCK; stdout_lock.l_whence = SEEK_SET; - if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1) + if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) != 0) err(EXIT_FAILURE, "stdout"); } @@ -266,7 +266,7 @@ scanfiles(char *argv[], int cooked __unused) #endif } else { #ifndef BOOTSTRAP_CAT - if (in_kernel_copy(fd) == -1) { + if (in_kernel_copy(fd) != 0) { if (errno == EINVAL || errno == EBADF || errno == EISDIR) raw_cat(fd); @@ -500,12 +500,12 @@ udom_open(const char *path, int flags) switch (flags & O_ACCMODE) { case O_RDONLY: cap_rights_clear(&rights, CAP_WRITE); - if (shutdown(fd, SHUT_WR) == -1) + if (shutdown(fd, SHUT_WR) != 0) warn(NULL); break; case O_WRONLY: cap_rights_clear(&rights, CAP_READ); - if (shutdown(fd, SHUT_RD) == -1) + if (shutdown(fd, SHUT_RD) != 0) warn(NULL); break; default: @@ -513,7 +513,7 @@ udom_open(const char *path, int flags) } cap_rights_clear(&rights, CAP_CONNECT, CAP_SHUTDOWN); - if (caph_rights_limit(fd, &rights) < 0) { + if (caph_rights_limit(fd, &rights) != 0) { serrno = errno; close(fd); errno = serrno; |