From nobody Sun Apr 20 16:35:48 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 4ZgYys1CYJz5tKcJ; Sun, 20 Apr 2025 16:35:49 +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 4ZgYyr3Tgkz4Cps; Sun, 20 Apr 2025 16:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745166948; 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=HFSoruseJUk2upyQj5IQf6HN5H5Ao14yakIHKg0lxP0=; b=ji3Hpim+b0YvNq5198G5XO0Kkdw0eDyaqbzFRmo07dWC+xviV0uwd4k/9SykVboxN/+c1G yjVNwmDws4V67QvtDu1/rOyp/MdDP4xaeTIYau8oQyMpoI0Zn3ck26BNBgySCnTghLjNfm 4QK+0+BsPPlc8fuB2ZuqKn3THnmd57bTv7WbBMt9aD/ieeuZcRg9PEl2cKhFfbFsFcq8iE PG8jOPEmy0IST4mLAZks3YXfeVLw+7jgB2pUe4DgMfN5MtVITQhd1STnoxZ6CJFUrLSa9e KdcPiBEGwtjAiXxMghvvoeHd/HcvPKtqF0Kqw8H7juQ+ea7ApcGNM3WU+FuQjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745166948; a=rsa-sha256; cv=none; b=Zh+iNHPzg5ylDW2i2wbw1n8S/tTBZ7Uzt/EdvmcWnTdHB2hRmhIAil2ROmz0P29N8Itlkz X70upI0q+y2XxpD/ipa1Fth8ARO78Il71GFlFatCS9zNYzS1VR1yY6+YYlYFokaXWve/AP NCBj38SMRUy7ZVqH8mj9Q1yVEUszZWJphkbRBOLPnlx3CjL4sanqYo2TKXBoV5L47a/nN3 b1mCgdRBJfTuz4uYSSusxIXaZpU65d9th7O+ek5lzHGEiGOQWZOE7t4mce03YIgTGslKOm dZwez6TGBVOExDKAv2xinm0y2EX0eSXCaW3DGGoVc+q2gC+S0xXh0uSd0rtwzg== 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=1745166948; 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=HFSoruseJUk2upyQj5IQf6HN5H5Ao14yakIHKg0lxP0=; b=pRRHdx5WgQoK0FEpl3UcA2Wdy3kGgy+rKZrr+9HSyMEm/zdkttxtgPIVJiAcASGBvBuCCi L22mS28J7m8k1560ekXkVLzt0uGfAimcRR9DwaEaMll+57RfdnAv2ZDNGLqgCF1tFDcyfU T7JvbgDc9+IsyXvoOOaDI0+AqIsA6P8O9ZRRiBK7Qm/dapKWZkDGqzEfWEBtnNTMqItG6G t27OsOtcAxGDfDVg0acm8hPyfWZN2443dh793kRT0dULb2NB8pqES0C59FQ4G8tDsKn+Ew 6ReCZF8L7RibIHT7ZRPsXyTZQPcgnNkOhBLxCB0LWAldQMJQnlsbKIf/t3ezfg== 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 4ZgYyr34bwz1BDY; Sun, 20 Apr 2025 16:35:48 +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 53KGZmWK004757; Sun, 20 Apr 2025 16:35:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KGZmVQ004754; Sun, 20 Apr 2025 16:35:48 GMT (envelope-from git) Date: Sun, 20 Apr 2025 16:35:48 GMT Message-Id: <202504201635.53KGZmVQ004754@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: 1b3748977f28 - main - tee: try opening as a UNIX socket if open(2) fails 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: 1b3748977f28c70e0b161fb476bf4e075bcc5940 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1b3748977f28c70e0b161fb476bf4e075bcc5940 commit 1b3748977f28c70e0b161fb476bf4e075bcc5940 Author: Kyle Evans AuthorDate: 2025-04-20 16:34:52 +0000 Commit: Kyle Evans CommitDate: 2025-04-20 16:35: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 Differential Revision: https://reviews.freebsd.org/D48197 --- 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 9497a2aa921e..9884dcf37919 100644 --- a/usr.bin/tee/tee.1 +++ b/usr.bin/tee/tee.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 30, 2022 +.Dd December 25, 2024 .Dt TEE 1 .Os .Sh NAME @@ -69,6 +69,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 f1d192ff315f..fb73b311a31b 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -29,10 +29,12 @@ * SUCH DAMAGE. */ +#include #include #include +#include #include -#include +#include #include #include @@ -52,6 +54,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 @@ -93,7 +96,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 { @@ -149,3 +152,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 }