From nobody Thu Sep 07 14:51:01 2023 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 4RhMcj4h9vz4snR1; Thu, 7 Sep 2023 14:51:01 +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 4RhMcj470Bz4kYj; Thu, 7 Sep 2023 14:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098261; 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=U1TWzP/us5vi9LJlgVsUiD3BldLgpMjoJOFzNW+vlSs=; b=hzTqy2FuFiTOPqd6Jgv5iLFZQEgGaN4DiFV41OAiLYHZP6wuMr+kGcgVn2PRxuOB2w2nyI t+BWykeCWr4WzNLhw7wx8v29pLP1/pCbdrnaRU4f27IZ3oAwF0S4i/fQVwUFsfXrj1ldjA 5AGxAW9earYh4qwpGbJau+hjGsk6CO1whACrl0U611JZT238UUrywChr+GpQXeZeWRRcCc cnCcdzBh8ZEN5YLaklbgxY7uOjXTzoAiwmCaQ10R+zfjouliGeW6bMSXLlpre5V4t+YB/V F0rw31y8aa8SKww+m10tPHknGT3Uag+tvUhQugeZqyeqOJriKrYmphvrH7GqGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098261; a=rsa-sha256; cv=none; b=aQcdI/BJ5C9amRXlSHQyLuFas9fVG73bsZok6D9kAGi9GAvAb0hRswjdolXrBwkT2rlVdI MdRLpd6WnCgzKTWXCPEo8bQZ5HC56CLMoRG3FmIpqMHu3RmAIrsYP0rXkYVasJBFRbcQyS wCcKJkdwhbRgiL50iXoJj1EC7qmZPDmI9/fNbDkPdpnvxgh9E5cANyjN+K0VyV4l+qR3N2 BQitfDg05nUjPMFlmonmaWYzPaSGb28whOaIAT+iqLGMCwu71iu9dbFVnuFoUU0QY7ERTz cb9+IQK++SLGhrTCFzZK3utStWGTkwIE0KOvbQzmF9KUmvbI2qKznpC2L1I2lA== 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=1694098261; 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=U1TWzP/us5vi9LJlgVsUiD3BldLgpMjoJOFzNW+vlSs=; b=OKxrmMpIrjmPXTYiM1UnqRyV1y3o0QLtmsoiJndCYpjsbTUuRX+EYrQMkYSbyKl7SRRhWz PyWszZWX9BroNPvN0OlBg2SGLZejGH5wowszsrXTvZRX+kdC1wFtNhiHgRiHyGbq04cn6R v0f2UBOK9MyEUdxs/tzoDx38C5DSwP2hA8HYY5tkM2W+5zTzvHGBfVH4mIFJN8Ei0egt5d kpruHPB4jHPDXewbvNh5dzvaJi4+2q6nMF7MkOrF879aKoSM0pgWLw8szCRf+FgizCWnOb nyrEZgQspmZfvSRctmejN91v0lvFSjd2V8lLLVeKGoEWZfzg0bABrh2YnAWpCg== 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 4RhMcj2p4mz13hk; Thu, 7 Sep 2023 14:51:01 +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 387Ep1xq011584; Thu, 7 Sep 2023 14:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep1bH011570; Thu, 7 Sep 2023 14:51:01 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:01 GMT Message-Id: <202309071451.387Ep1bH011570@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: e4dee290ff0b - stable/13 - stdbuf: Code cleanup. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e4dee290ff0b37b96d9f0b83b109b3cd6d50450c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e4dee290ff0b37b96d9f0b83b109b3cd6d50450c commit e4dee290ff0b37b96d9f0b83b109b3cd6d50450c Author: Dag-Erling Smørgrav AuthorDate: 2023-06-29 15:30:05 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:56:25 +0000 stdbuf: Code cleanup. * Factor out path-setting code. * Normalize usage(). * Remove unnecessary switch case. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D40799 (cherry picked from commit 78baa632092a87707481a47f47bfd45de9a072ef) libstdbuf: Add proper SEE ALSO section. Sponsored by: Klara, Inc. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D40800 (cherry picked from commit c09909ed889f4722e68b192e206dff1b03182edb) --- lib/libstdbuf/libstdbuf.3 | 7 +++++-- usr.bin/stdbuf/stdbuf.c | 52 +++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/lib/libstdbuf/libstdbuf.3 b/lib/libstdbuf/libstdbuf.3 index 6f3256c88e18..4857f7096499 100644 --- a/lib/libstdbuf/libstdbuf.3 +++ b/lib/libstdbuf/libstdbuf.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 28, 2012 +.Dd June 29, 2023 .Dt LIBSTDBUF 3 .Os .Sh NAME @@ -80,9 +80,12 @@ output will not stall until the full buffer fills. STDBUF_1=L awk '$2 > 1 || $3 > 1' | cat -n .Ed .Pp -See also the manpage of +See .Xr stdbuf 1 for a simpler way to do this. +.Sh SEE ALSO +.Xr rtld 1 , +.Xr stdbuf 1 .Sh HISTORY The .Nm diff --git a/usr.bin/stdbuf/stdbuf.c b/usr.bin/stdbuf/stdbuf.c index 02716ad60b06..6b09bb6149f5 100644 --- a/usr.bin/stdbuf/stdbuf.c +++ b/usr.bin/stdbuf/stdbuf.c @@ -34,22 +34,38 @@ #define LIBSTDBUF "/usr/lib/libstdbuf.so" #define LIBSTDBUF32 "/usr/lib32/libstdbuf.so" -extern char *__progname; +static int +appendenv(const char *key, const char *value) +{ + char *curval, *newpair; + int ret; + + curval = getenv(key); + if (curval == NULL) + ret = asprintf(&newpair, "%s=%s", key, value); + else + ret = asprintf(&newpair, "%s=%s:%s", key, curval, value); + if (ret > 0) + ret = putenv(newpair); + if (ret < 0) + warn("Failed to set environment variable: %s", key); + return (ret); +} static void -usage(int s) +usage(void) { - fprintf(stderr, "Usage: %s [-e 0|L|B|] [-i 0|L|B|] [-o 0|L|B|] " - " [args ...]\n", __progname); - exit(s); + fprintf(stderr, + "usage: stdbuf [-e 0|L|B|] [-i 0|L|B|] [-o 0|L|B|] " + " [args ...]\n"); + exit(1); } int main(int argc, char *argv[]) { char *ibuf, *obuf, *ebuf; - char *preload0, *preload1; int i; ibuf = obuf = ebuf = NULL; @@ -64,9 +80,8 @@ main(int argc, char *argv[]) case 'o': obuf = optarg; break; - case '?': default: - usage(1); + usage(); break; } } @@ -85,25 +100,8 @@ main(int argc, char *argv[]) warn("Failed to set environment variable: %s=%s", "_STDBUF_E", ebuf); - preload0 = getenv("LD_PRELOAD"); - if (preload0 == NULL) - i = asprintf(&preload1, "LD_PRELOAD=" LIBSTDBUF); - else - i = asprintf(&preload1, "LD_PRELOAD=%s:%s", preload0, - LIBSTDBUF); - - if (i < 0 || putenv(preload1) == -1) - warn("Failed to set environment variable: LD_PRELOAD"); - - preload0 = getenv("LD_32_PRELOAD"); - if (preload0 == NULL) - i = asprintf(&preload1, "LD_32_PRELOAD=" LIBSTDBUF32); - else - i = asprintf(&preload1, "LD_32_PRELOAD=%s:%s", preload0, - LIBSTDBUF32); - - if (i < 0 || putenv(preload1) == -1) - warn("Failed to set environment variable: LD_32_PRELOAD"); + appendenv("LD_PRELOAD", LIBSTDBUF); + appendenv("LD_32_PRELOAD", LIBSTDBUF32); execvp(argv[0], argv); err(2, "%s", argv[0]);