From nobody Mon Apr 21 03:49:52 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 4Zgrwd1LRjz5sqS6; Mon, 21 Apr 2025 03:49:53 +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 4Zgrwc3F2Xz3L25; Mon, 21 Apr 2025 03:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745207392; 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=ghqxd/fUuiAASh3ng3qhtOtA/gdJbOTQNHaOtOfydCY=; b=sh90jhXYcn2L9a2BqMj/VvvqGsgK+k6MTwDtr0GccxiSIIxYhRZFcT9t6qtXFujUIBeshu VdMluhNgxQYpFvkemu/ztRvIbK3xtKSGEGCzYbRKehirY1si3YSdOy11FrjbYZN3DIQ2/M o1K62L1QSxot9t6IGCodz/3meStju5ZQY1eKuiHCyc/0v9FV0WR5ATXLG3ouhAboQ6tyv6 HFBOf2NfOGEoT+X1lySOe5j2wbhk7tdDcG9IFNX0qiRA/9DJ/0+J/v1kCfMRrk3lDY5GTR 7JAxrlG6z3Gap07DySuesMJ+kk48ZFiHRx/gJgd0+can+4LPdd5MhfqJN6ZAjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745207392; a=rsa-sha256; cv=none; b=X0zjKzMmbwXvQP9nMmAozRomwEPt9fjBf7v2/sIeAi3Q3YzXWTgON0x/HtmnTgfUuWYadk ZYCMh2seQAu+OViPVDEA1Qekj3DeobOhhP6Q/hZhe7lL2VD1zCj6b5EFh3KGgVYcVHxbGI k9qcke52uPS38AMbBEZ32l7haE6ZRTmpyoflBq9UUBL0X8tXmbQCf6VgEs+7+xxnAMHBk1 ROPwJmh+3XorFpRKBdJ7ey5FRLmkR2bwXh1WBwplyX6fXLU3CrglGWpO5o8inlwJBHOx0W EpzmuSsKU+pqG8tiOQNLdO5Va97mK9sXtkLgyGDHO82c8CXBCzpHrfWkgJt44g== 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=1745207392; 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=ghqxd/fUuiAASh3ng3qhtOtA/gdJbOTQNHaOtOfydCY=; b=MOZAfUzV/wueQhXKtNvxr1yfXCrZsjQZbqXPv+TArRB3MJloYm4AbdKzBXuTMwpxYqD8Z7 EX9YoZK3q8elBGseop6yY0k3r9hpcajIvbtTpmqlOUqEQQ0wwiqbwRCSuP5oH9Dq1bX9xA GTl6JEyDvuYM14JCOS9CxVLB7n+cJnaHTLP05bMihkZqoKvZCzYRFe3J0SXHwce67JqzBd IgmP3vBGelPuJMfCpx9mamSTC9ZFzmqgoO88Zdz2JOUjFFWuXCtU7Q0ybJ01BUqfmAGAgD aP1sw8JJtzExyjslOS2/aVtc6slXfIkKjIj7O751TTi6MLvPcYaRPSV4viocFw== 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 4Zgrwc2q2YzZYP; Mon, 21 Apr 2025 03:49:52 +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 53L3nqjD062451; Mon, 21 Apr 2025 03:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L3nqqp062448; Mon, 21 Apr 2025 03:49:52 GMT (envelope-from git) Date: Mon, 21 Apr 2025 03:49:52 GMT Message-Id: <202504210349.53L3nqqp062448@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: 2f11393fee4d - main - libbe: don't hardcode /tmp 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: 2f11393fee4d60d38634a261edf9aa9fea39c75c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2f11393fee4d60d38634a261edf9aa9fea39c75c commit 2f11393fee4d60d38634a261edf9aa9fea39c75c Author: Kyle Evans AuthorDate: 2025-04-21 03:47:59 +0000 Commit: Kyle Evans CommitDate: 2025-04-21 03:49:28 +0000 libbe: don't hardcode /tmp Respect $TMPDIR if it's set, fallback to _PATH_TMP (not hardcoded /tmp) if it's not. Bump .Dd after recent commits. Reviewed by: rcm Differential Revision: https://reviews.freebsd.org/D42244 --- lib/libbe/be_access.c | 14 ++++++++++++-- lib/libbe/libbe.3 | 6 +++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index 51f5a75e957d..44e7eb1e651c 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -33,7 +33,7 @@ #include "be.h" #include "be_impl.h" -#define LIBBE_MOUNT_PREFIX "be_mount." /* XXX */ +#define LIBBE_MOUNT_PREFIX "be_mount." struct be_mountcheck_info { const char *path; @@ -261,7 +261,17 @@ be_mount(libbe_handle_t *lbh, const char *bootenv, const char *mountpoint, /* Create mountpoint if it is not specified */ if (mountpoint == NULL) { - strlcpy(mnt_temp, "/tmp/be_mount.XXXX", sizeof(mnt_temp)); + const char *tmpdir; + + tmpdir = getenv("TMPDIR"); + if (tmpdir == NULL) + tmpdir = _PATH_TMP; + + if (snprintf(mnt_temp, sizeof(mnt_temp), "%s%s%sXXXX", tmpdir, + tmpdir[strlen(tmpdir) - 1] == '/' ? "" : "/", + LIBBE_MOUNT_PREFIX) >= (int)sizeof(mnt_temp)) + return (set_error(lbh, BE_ERR_PATHLEN)); + if (mkdtemp(mnt_temp) == NULL) return (set_error(lbh, BE_ERR_IO)); } diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 113763311796..3b10711dd0f9 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 9, 2024 +.Dd April 20, 2025 .Dt LIBBE 3 .Os .Sh NAME @@ -358,6 +358,10 @@ If is .Dv NULL , a mount point will be generated in +.Ev TMPDIR +or, if +.Ev TMPDIR +is not set, .Pa /tmp using .Xr mkdtemp 3 .