From nobody Sun Apr 20 16:35:47 2025 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 4ZgYyq6Hkqz5tKfY; Sun, 20 Apr 2025 16:35:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgYyq2qHxz4D4g; Sun, 20 Apr 2025 16:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745166947; 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=T5hTbq2CuMehiZ3psNUAPn3nEKjgVMJO6NnAvwEBRiw=; b=sAeq+wNTWLqVIzo4J1P9OabofUkHVGWoV7rKXRxQJVz1MDJmPA6nHvCPBfINKipLoYH6/o tnvem03U/SEAvE0WK+vA6mD5dYCragNHDZQIboWqCM+LHhqEPpGrZCSKMy/T+QaBDJ6PTP 5ThWYTKckOT6DMzKwbXLPpBIdwYw/4WS66WMameyKOa4Y77Ks1I7NyIFSUlrDrYhSknbpH ioJszyYKkwzXR1QNLJD7J1AogTVjWMW/iWSfCpLQK/E7k6VwaHyu8U8CntLjXYp7jVOpYT wjZgglEuYUEqne2C3dHcUJUtIp6Z+HLVQKCsb0ns49wHwcPZIRPP4Gt95T64ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745166947; a=rsa-sha256; cv=none; b=iDhYfDGacnDIQqXO8dw0PijJaCLJCNq1/i3FImh0Ek84Acmnbnbs5v9p4826Y9Sb3QXDLj jMT0RFyWgcw/VOfLa3zP+qCLmY5KjLK6NM5d+EkzXZESz53zgW6Ecd9OvG+ottVRO9VFVk VmRA/8oBr6xvMbQi2TUnQQo3nngwBlY0kO0Ms2Al0GyC6TrNo+EN8rwRA69ZW8z9tXV0Pq 0ZbFqXxe8eEc25VUtMpEmfDuse6jgDqxmfzxI4WkG3IPS05QQNE/RGX3sMrdm5echrHpKK gvZNUIVyClHAoS22ryMHDp5GgT35UV2C8bboXs5JnxF7TpGBvG3XyDlNZvyqWQ== 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=1745166947; 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=T5hTbq2CuMehiZ3psNUAPn3nEKjgVMJO6NnAvwEBRiw=; b=G2MeSQXO1wb9dAF3hMzQC2Ry1wHWmvVKioF8tdjCRVGJDUpRGBvMM9dc1J6L6bNGKmNJEY NpAKpYHg6dtsF7JfMHKJ51oT27KfVGsXwmDbtNIS+Ons6Ye1e6c49TdpcbY4avc5ka6AoP 5ZWeV+u1lZTbk3oYyPP5jTbc8bLs4ekxz6E9Lcn0yamGZmsfb5eGNRRv0++tHNlCd4P2TF EnQTFA9TkANM8ByBW0Ps3lFvmGIyGRjA7H6XZlILbPhWsXl0L4ChiYz5IhU2JhwyRuTB86 2iVO0zb7GQEamDR3tT+gOExFhgw204FyYLA0c1wDpmRKY1DwUxpPtAWVZABIiA== 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 4ZgYyq2DN8z1B2k; Sun, 20 Apr 2025 16:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53KGZlkY004724; Sun, 20 Apr 2025 16:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KGZlfs004721; Sun, 20 Apr 2025 16:35:47 GMT (envelope-from git) Date: Sun, 20 Apr 2025 16:35:47 GMT Message-Id: <202504201635.53KGZlfs004721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 414c2b8d1e5a - main - tee: minor cleanup 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 414c2b8d1e5abe7186c1aa4dc3ab28147ce46f47 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=414c2b8d1e5abe7186c1aa4dc3ab28147ce46f47 commit 414c2b8d1e5abe7186c1aa4dc3ab28147ce46f47 Author: Kyle Evans AuthorDate: 2025-04-20 16:34:51 +0000 Commit: Kyle Evans CommitDate: 2025-04-20 16:35:33 +0000 tee: minor cleanup Pull the open flags out of the loop into a local var. They won't be changing, so this is marginally more readable. Adds some extra brackets around the loop in preparation for a future change that may try to fallback to opening the path as a socket if we get an EOPNOTSUPP. No functional change. Reviewed by: asomers, des, emaste, ngie Differential Revision: https://reviews.freebsd.org/D48196 --- usr.bin/tee/tee.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index 384fabf40f33..f1d192ff315f 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -57,11 +57,9 @@ static void usage(void) __dead2; int main(int argc, char *argv[]) { + char *bp, *buf; struct entry *p; - int n, fd, rval, wval; - char *bp; - int append, ch, exitval; - char *buf; + int append, ch, exitval, fd, n, oflags, rval, wval; #define BSIZE (8 * 1024) append = 0; @@ -88,13 +86,20 @@ main(int argc, char *argv[]) add(STDOUT_FILENO, "stdout"); - for (exitval = 0; *argv; ++argv) - if ((fd = open(*argv, append ? O_WRONLY|O_CREAT|O_APPEND : - O_WRONLY|O_CREAT|O_TRUNC, DEFFILEMODE)) < 0) { + oflags = O_WRONLY | O_CREAT; + if (append) + oflags |= O_APPEND; + else + oflags |= O_TRUNC; + + for (exitval = 0; *argv; ++argv) { + if ((fd = open(*argv, oflags, DEFFILEMODE)) < 0) { warn("%s", *argv); exitval = 1; - } else + } else { add(fd, *argv); + } + } if (caph_enter() < 0) err(EXIT_FAILURE, "unable to enter capability mode");