git: afd1256257f5 - stable/14 - cat: Check for lack of success rather than a specific failure.

[Dag-Erling Smørgrav]

The branch stable/14 has been updated by des:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=afd1256257f524f764627eaabb4d887ddecc6557

commit afd1256257f524f764627eaabb4d887ddecc6557
Author:     Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2024-05-10 10:59:18 +0000
Commit:     Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2024-05-14 06:58:40 +0000

    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
    
    (cherry picked from commit c6f9df7064106a3b016c13ea3b9a930362b53089)
    
    cat: Missed a couple.
    
    MFC after:      3 days
    Sponsored by:   Klara, Inc.
    
    (cherry picked from commit ad4f3bdf733c1a670021f4db378338f5aaedbfd8)
---
 bin/cat/cat.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 81ec5feec240..9d40a3f0fa35 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -139,7 +139,7 @@ init_casper_net(cap_channel_t *casper)
        familylimit = AF_LOCAL;
        cap_net_limit_name2addr_family(limit, &familylimit, 1);
 
-       if (cap_net_limit(limit) < 0)
+       if (cap_net_limit(limit) != 0)
                err(EXIT_FAILURE, "unable to apply limits");
 }
 #endif
@@ -212,7 +212,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");
        }
 
@@ -220,7 +220,7 @@ main(int argc, char *argv[])
 
        caph_cache_catpages();
 
-       if (caph_enter_casper() < 0)
+       if (caph_enter_casper() != 0)
                err(EXIT_FAILURE, "capsicum");
 
        if (bflag || eflag || nflag || sflag || tflag || vflag)
@@ -280,7 +280,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);
@@ -485,7 +485,7 @@ udom_open(const char *path, int flags)
                        errno = serrno;
                        return (-1);
                }
-               if (caph_rights_limit(fd, &rights) < 0) {
+               if (caph_rights_limit(fd, &rights) != 0) {
                        serrno = errno;
                        close(fd);
                        freeaddrinfo(res0);
@@ -514,12 +514,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:
@@ -527,7 +527,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;