From nobody Sat Apr 26 03:21:16 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 4Zkw3K1D2Dz5tXQ7; Sat, 26 Apr 2025 03:21:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zkw3J5zsKz3LCP; Sat, 26 Apr 2025 03:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637676; 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=33OuN0WS0M47YxGfqR42NJOd0DuIW8QEnWXecDX2818=; b=hczWTjmNsR7ras1dAWxfZWe8QEH0T8o+dzt7o4qmV1aMbB2m0NfyJBtkk+AA8jPyMyAdUX Z1fNka6+74LNfKcC6mtwUn4Ny0kWpZqhdQE6m3Oq2tNsq1iEqpfQ7prl74E1TzkpECYJi5 MkvyTEBIg2OtE7dgjxVfeXacSHymOnp0NfoYaI/lld5x+vFbbAwfDog2WpcSIxYXJC/nll ggGqJC7WPQb242BnnaRyLAVezY6zVnL9RTtZP42SXZlqmgMf+ltP/SZ0/EpxZRh3X7fGgB n12dA/qSNIZkIze9rLiSsSGhKJGzNSCxFfODysy4jaNZNK1J2DjtMm/55PXmJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745637676; a=rsa-sha256; cv=none; b=xwawjX1jOcTqK4TOAKS0GVddcqPRFFTAOrkaL1obyGqGakYhX8KoSzqa3Pl2gl/1AkhCtX /ug1QMGFxtY2J7bMr0YpOkO0GQnERKV382GREtMritbzlXT7fJjPcuVKT0ac3J/9FHz+tQ vd07uRdwlAyKpwFAGQ7N1L7ddgbD+LSiO8wP8qFa+XsNWUBTZzoGDSCPuefZ8ewd7A1+7D z7hCJ9TESvlMNYTUzNStlOKYGi9FO9snSV0/9A0RICqV1zkB1rlqNP0mKHH79y/xS9pp60 /+xC2uy6rqU3qQPTvSwLUROQtJDgFK4L59o3jKpyd73+HLqN8tJzOHhg7DeUiw== 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=1745637676; 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=33OuN0WS0M47YxGfqR42NJOd0DuIW8QEnWXecDX2818=; b=Q8P2jgs3EAdH2y+EGJnhzujZ62Y5DtZ0DgGHf1j6IL7fSmWSslW6j3CJbhz+8Ho0wMWZwp 9HNFmUxv0BR8FlNqDKQDS3C+HoCZxBTFtXgI8wmX3eEqrePPsWv7UO4JdymvWV1HKV/V8y 9/l1XOKAaECe4LuqdbyHsX5BcRZN5NJIHIAxTVcke4OKO+lDo37s19O/8W1kKwUNnYUO0Z Mj4yNq0OTHV5fZDJ4JxjXneHRd8IdZ0DGZQYdq7NEcQAbCxdHSm/WPtwGnNhHINao4GbLR RDfacXeiC8DljKZhh1fmLpAXZtwHeyQ7LoOQ0iS8V0408TSj5zu0XJQkA3fSiA== 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 4Zkw3J5Sd7z12x4; Sat, 26 Apr 2025 03:21:16 +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 53Q3LGsE009728; Sat, 26 Apr 2025 03:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53Q3LGCH009725; Sat, 26 Apr 2025 03:21:16 GMT (envelope-from git) Date: Sat, 26 Apr 2025 03:21:16 GMT Message-Id: <202504260321.53Q3LGCH009725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 99509fcc8733 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 99509fcc8733022e54bac6a9249a03d2e1489271 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=99509fcc8733022e54bac6a9249a03d2e1489271 commit 99509fcc8733022e54bac6a9249a03d2e1489271 Author: Kyle Evans AuthorDate: 2025-04-20 16:34:51 +0000 Commit: Kyle Evans CommitDate: 2025-04-26 03:19:48 +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 (cherry picked from commit 414c2b8d1e5abe7186c1aa4dc3ab28147ce46f47) --- 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 c4fe945d6d12..aeda9c34ac45 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -69,11 +69,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; @@ -100,13 +98,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");