From nobody Sun Apr 27 18:59:50 2025 X-Original-To: dev-commits-src-branches@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 4Zlwqp6KgDz5vCJM; Sun, 27 Apr 2025 18:59:50 +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 4Zlwqp3WkWz3SgS; Sun, 27 Apr 2025 18:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745780390; 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=gvjtDxHtBewbWBDFs09nWE/tOKGCIpk0XHBdutDY/E8=; b=XPQ3sXeVHiY9RmzZpMjgBTAEqfK1NLI4h9tFoIFODw47cEAdnlI0lPAsQ6rqe7xE3trjiX 8xQx2dntMjKBnGyCzECzBASN8WvXeTCfXVzbjRqQWFBkBZOewh5WTBbOsVathoT+T9dwD5 zLzCNKuUDtb+lLeckSiRBUPfCo9uQDCTMf+dV3mjvQgAJKSuWH+8T4MXZfo+1NzRAJuvOv WtLgwX7z1uDqKo+3lIZ47pydbz1u+3dSMWGv9CrUnF17zLoAcmMLNGxxihsJ0eN8jq5NC9 Tk303G+Vy+yEd9i95lR+k/xqEu6N0DWKj2sXT3IIVDYtrnFkxap3jFUf9YYBgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745780390; a=rsa-sha256; cv=none; b=umdKepvwSLgwFdU2es0U6mkKo1iDJJPYbYJ4SOBQpqHwJTUJLH7Gh6mePL9X3Fm26q6oSG W8naJRAN9uAHiYrofdLfri2bBhW3UAdbisD0AnyzSRm/mpFqAuRHnfdrcpVYhhw6lI8UmY 3oNtzLk0fY3XEocItGoWSMVdfMWSqjbj0H2q8nnbCHfhfOh91NCOfX2096FAZdP+whHZ51 wXc0WPajOUVphcwpv2G2ztrDfsL8hn0GjhMx/6cH4TUm9t1OTEOtiP60XdPsYe9wulec40 X6w6AE+DsW7SqT9LRs/sTDMhC0ddnIQth2MtAOjXhE7N5FMKGVhNG7xShGUPgw== 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=1745780390; 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=gvjtDxHtBewbWBDFs09nWE/tOKGCIpk0XHBdutDY/E8=; b=iSyvM1VBm4uACj6juo1yhfqehIp2J332yG3OhuUUhjKZnfP2To9ZeV7qQcxtKzAQaLmXRb FQwidkcg70sheAyScdcdy4H8q0TJmSbbqJvcPHHR34s4daRRmy1poWxjjBwEM78IFU2Ts5 HBQKEvJWa3KBzwV+8jyw3DP3FgGrrVjKJiQ6PLh2Q1CuAiBqhZzt/U4dTUpeDKL5JY5+PE RCFjIp/TS8rhcf9mWMz2BDW+5lltdVq2aayHr0LcTaIlkcJCKJAupoqC1xt/YWswJPGgV5 hHdJADzdu7W8Xpda2oSUFqhsTzq3whntjd/JVA58MgsWTQNsbrycPmHX/UkuEA== 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 4Zlwqp2r97z1HBV; Sun, 27 Apr 2025 18:59:50 +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 53RIxoPw058975; Sun, 27 Apr 2025 18:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53RIxoR1058972; Sun, 27 Apr 2025 18:59:50 GMT (envelope-from git) Date: Sun, 27 Apr 2025 18:59:50 GMT Message-Id: <202504271859.53RIxoR1058972@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: 09e0a909fb07 - stable/14 - tee: try opening as a UNIX socket if open(2) fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 09e0a909fb07615ed97c8648a24b541840bc1fa7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=09e0a909fb07615ed97c8648a24b541840bc1fa7 commit 09e0a909fb07615ed97c8648a24b541840bc1fa7 Author: Kyle Evans AuthorDate: 2025-04-20 16:34:52 +0000 Commit: Kyle Evans CommitDate: 2025-04-27 18:59:34 +0000 tee: try opening as a UNIX socket if open(2) fails If we get EOPNOTSUPP from open() failing, then it may just be that we're looking at a unix(4) socket instead of a normal file/device or whatnot. Fallback to trying to open it as a unix(4) socket, which is a useful feature that doesn't add much complexity. Reviewed by: des, emaste, markj (cherry picked from commit 1b3748977f28c70e0b161fb476bf4e075bcc5940) --- usr.bin/tee/tee.1 | 8 +++++++- usr.bin/tee/tee.c | 46 +++++++++++++++++++++++++++++++++++++++++-- usr.bin/tee/tests/tee_test.sh | 32 ++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1 index b7673ea0ce61..b4d38fbb5b24 100644 --- a/usr.bin/tee/tee.1 +++ b/usr.bin/tee/tee.1 @@ -30,7 +30,7 @@ .\" .\" @(#)tee.1 8.1 (Berkeley) 6/6/93 .\" -.Dd October 30, 2022 +.Dd December 25, 2024 .Dt TEE 1 .Os .Sh NAME @@ -71,6 +71,12 @@ utility takes the default action for all signals, except in the event of the .Fl i option. +.Pp +This implementation of the +.Nm +utility may also write to +.Xr unix 4 +sockets. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index aeda9c34ac45..92c8913210aa 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -41,10 +41,12 @@ static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93"; #endif #endif /* not lint */ +#include #include #include +#include #include -#include +#include #include #include @@ -64,6 +66,7 @@ struct entry { static STAILQ_HEAD(, entry) head = STAILQ_HEAD_INITIALIZER(head); static void add(int, const char *); +static int tee_open(const char *, int); static void usage(void) __dead2; int @@ -105,7 +108,7 @@ main(int argc, char *argv[]) oflags |= O_TRUNC; for (exitval = 0; *argv; ++argv) { - if ((fd = open(*argv, oflags, DEFFILEMODE)) < 0) { + if ((fd = tee_open(*argv, oflags)) < 0) { warn("%s", *argv); exitval = 1; } else { @@ -161,3 +164,42 @@ add(int fd, const char *name) p->name = name; STAILQ_INSERT_HEAD(&head, p, entries); } + +static int +tee_open(const char *path, int oflags) +{ + struct sockaddr_un sun = { .sun_family = AF_UNIX }; + size_t pathlen; + int fd; + + if ((fd = open(path, oflags, DEFFILEMODE)) >= 0) + return (fd); + + if (errno != EOPNOTSUPP) + return (-1); + + pathlen = strnlen(path, sizeof(sun.sun_path)); + if (pathlen >= sizeof(sun.sun_path)) + goto failed; + + /* + * For EOPNOTSUPP, we'll try again as a unix(4) socket. Any errors here + * we'll just surface as the original EOPNOTSUPP since they may not have + * intended for this. + */ + fd = socket(PF_UNIX, SOCK_STREAM, 0); + if (fd < 0) + goto failed; + + (void)strlcpy(&sun.sun_path[0], path, sizeof(sun.sun_path)); + sun.sun_len = SUN_LEN(&sun); + + if (connect(fd, (const struct sockaddr *)&sun, sun.sun_len) == 0) + return (fd); + +failed: + if (fd >= 0) + close(fd); + errno = EOPNOTSUPP; + return (-1); +} diff --git a/usr.bin/tee/tests/tee_test.sh b/usr.bin/tee/tests/tee_test.sh index 6ac733f2e58f..cf8e74dd47e7 100644 --- a/usr.bin/tee/tests/tee_test.sh +++ b/usr.bin/tee/tests/tee_test.sh @@ -64,6 +64,37 @@ sigint_ignored_body() atf_check -o inline:"text\ntext\n" cat file } +atf_test_case unixsock "cleanup" +unixsock_pidfile="nc.pid" + +unixsock_body() +{ + outfile=out.log + + nc -lU logger.sock > "$outfile" & + npid=$! + + atf_check -o save:"$unixsock_pidfile" echo "$npid" + + # Wait for the socket to come online, just in case. + while [ ! -S logger.sock ]; do + sleep 0.1 + done + + atf_check -o inline:"text over socket\n" -x \ + 'echo "text over socket" | tee logger.sock' + + atf_check rm "$unixsock_pidfile" + atf_check -o inline:"text over socket\n" cat "$outfile" +} +unixsock_cleanup() +{ + if [ -s "$unixsock_pidfile" ]; then + read npid < "$unixsock_pidfile" + kill "$npid" + fi +} + atf_init_test_cases() { atf_add_test_case single_file @@ -71,4 +102,5 @@ atf_init_test_cases() atf_add_test_case multiple_file atf_add_test_case append atf_add_test_case sigint_ignored + atf_add_test_case unixsock }