From nobody Tue May 14 06:59:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdnK96wTQz5KYWS; Tue, 14 May 2024 06:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdnK95DH6z4pWx; Tue, 14 May 2024 06:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VZ/BF6uqE6yBDw4yC0kYmOdN9zxgsJ1uNRSW/rWYvoc=; b=m6Xga9Si6AbnGWGOacf3eipKfZG+2LF2PJVyd/8pShtNCua+7RA/w6vwB9U7Z5cEbYO226 cWkUyZpiqOymGApC0R1NKmLm8B7wi087MgH+Q+uEgFenZjHKG9y+BObkCCpwMQnN2tVrcK JI9+K31qKbPmBtRMB2XxE56dld7j+jZ+Jpzlj9S73QBjZEYkh6MHVUuCKMtPniaFqLF17y z+61Mj3qk35tjk/vK4t7q2YHylUo22JbWhKdNO9b0Y+VHtj2/PKUj8Dbs5fm8/wbVT1C43 LjU1kwmP8ndBr497C94lETOFt/knt9pE5TYWPw1ClQOsrbvd4dtdcwit22vuZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715669965; a=rsa-sha256; cv=none; b=Sl56M9S0Zq9Jva3CHOo9+FOWKD7IyWMtbbQJ/nCIZCLscECoxb/UKPdCq+Q4RNA169eXXg DJdj/T2TKFs2PSJ8mvEwQZ4PmQ+dUhNwWfIBUSe6A5BmaowAxZcB5uGXyXF2UXSSpSaPcV RdiRWGZwOnDILr4cYfc5FoQFg/JY3D/tUXy003qtqeIHINcgzKreCc+5u9+meFqJqRpoEY FyvA/w3mba7hOnnnLW8HCmTfXOdys8isJtxgiwUw16G7tqnXhpf4imfHSsdLyaA09PCNJn juXh3p1FPK0bdr33A0HI7mEoHiib2GkhVibTYHkUy4v46X/rSMKy7GsDBei/GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VZ/BF6uqE6yBDw4yC0kYmOdN9zxgsJ1uNRSW/rWYvoc=; b=qJO0+B1lxNw+DXqrlBAwc766ByzF9o802JP0/ars8kBt6zhqoNcI9h23NBawODRzFL1ELB trLKDCXSr2kcMV/lf36mmvxX9LZVhYG6Ql6r/Xz8L60HZQvOgB2R1KmAMIMzDIyYN9DvcW /O0Pv1lTh9KNr6cgAwRfz6wh5V0MNC1Km8fnO0IoiY5W1A5N6aMsNc7nCrx4OwdvvtrYvv 5cguZuXUIzaSbcGRBNYb7leFQ/Q+KkQHdFHR61SKAAooTLnUyZ5+wyAuykkMWOH+/4t/qq 0x1fLZXdP4clE6T3Ymjt/pQMZFNmeemQLlTkIyoeGt9iHbuXkS+XFAibEQSwWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VdnK94nXGzLxY; Tue, 14 May 2024 06:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E6xPIZ005112; Tue, 14 May 2024 06:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E6xPN5005108; Tue, 14 May 2024 06:59:25 GMT (envelope-from git) Date: Tue, 14 May 2024 06:59:25 GMT Message-Id: <202405140659.44E6xPN5005108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b6fb1131e64f - stable/13 - cat: Check for lack of success rather than a specific failure. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6fb1131e64f47854c08ab8ee733aed1f6f81180 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b6fb1131e64f47854c08ab8ee733aed1f6f81180 commit b6fb1131e64f47854c08ab8ee733aed1f6f81180 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-10 10:59:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-14 06:59:12 +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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index dc6e6417dc49..48294be5c5b5 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -138,7 +138,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 @@ -211,7 +211,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"); } @@ -219,7 +219,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) @@ -456,7 +456,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); @@ -494,7 +494,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;