system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cat: Check for lack of success rather than a specific failure.

Browse source 
MFC after:	3 days
Sponsored by:	Klara, Inc.
Reviewed by:	oshogbo
Differential Revision:	https://reviews.freebsd.org/D45149
This commit is contained in:
Dag-Erling Smørgrav 2024-05-10 12:59:18 +02:00
parent 634dd430b9
commit c6f9df7064
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/cat/cat.c
View file

@ -198,7 +198,7 @@ main(int argc, char *argv[])
stdout_lock.l_start = 0; stdout_lock.l_start = 0;
stdout_lock.l_type = F_WRLCK; stdout_lock.l_type = F_WRLCK;
stdout_lock.l_whence = SEEK_SET; 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"); err(EXIT_FAILURE, "stdout");
} }
@ -266,7 +266,7 @@ scanfiles(char *argv[], int cooked __unused)
#endif #endif
} else { } else {
#ifndef BOOTSTRAP_CAT #ifndef BOOTSTRAP_CAT
if (in_kernel_copy(fd) == -1) { if (in_kernel_copy(fd) != 0) {
if (errno == EINVAL || errno == EBADF || if (errno == EINVAL || errno == EBADF ||
errno == EISDIR) errno == EISDIR)
raw_cat(fd); raw_cat(fd);
@ -500,12 +500,12 @@ udom_open(const char *path, int flags)
switch (flags & O_ACCMODE) { switch (flags & O_ACCMODE) {
case O_RDONLY: case O_RDONLY:
cap_rights_clear(&rights, CAP_WRITE); cap_rights_clear(&rights, CAP_WRITE);
if (shutdown(fd, SHUT_WR) == -1) if (shutdown(fd, SHUT_WR) != 0)
warn(NULL); warn(NULL);
break; break;
case O_WRONLY: case O_WRONLY:
cap_rights_clear(&rights, CAP_READ); cap_rights_clear(&rights, CAP_READ);
if (shutdown(fd, SHUT_RD) == -1) if (shutdown(fd, SHUT_RD) != 0)
warn(NULL); warn(NULL);
break; break;
default: default:
@ -513,7 +513,7 @@ udom_open(const char *path, int flags)
} }
cap_rights_clear(&rights, CAP_CONNECT, CAP_SHUTDOWN); cap_rights_clear(&rights, CAP_CONNECT, CAP_SHUTDOWN);
if (caph_rights_limit(fd, &rights) < 0) { if (caph_rights_limit(fd, &rights) != 0) {
serrno = errno; serrno = errno;
close(fd); close(fd);
errno = serrno; errno = serrno;