From nobody Sun Oct 11 21:55:18 2026 X-Original-To: dev-commits-src-main@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 4j2vXl2GBsz6w5DH for ; Sun, 11 Oct 2026 21:55:19 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2vXl1gVTz54Fw for ; Sun, 11 Oct 2026 21:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791755719; 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=Ar8lq7o5OfE3X8KXQ0Glsn1w0D1Yy09IDp9BuFP/4vU=; b=N2zYWOFfAPcqy1eyelyXNcci/1uqTXc6ILV7wlZz3roUSfmc+FbSXVXXWyWKqq1dlSAX6U wcrcBpvnsSdMul4xHAGb9IpgDI4k0xjAcjusJf7v+vaRA9usXM2dmAetjpDZyt6ns3jjRm SVKSvxWMXdOACtgqD0tMX+SSO4RNEPqrasjB2HVk9fobRZkkgus95C8YCDz8qtxaqu4M8q 5qLiwUnWz2j75vemimy8ZsTgAE9vBxywi6+F/Fzr2tE2TPELrpNwgzS0a9EFkgs5kyS+72 LPdppJqqpzMO5AALDczCpQ6RgdiX3x4fQyTkI7ymMXw4+7+7wG5ZZVKNaG8+4g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791755719; b=EMaDElh6oT0kcxuyTx5mrSERrIE3aTUxxyGcKL2csI4n0F/SYmfgxftxDe4yh3RHZlmPUK T7rEBpWO04F9chSyMbjQ9F9uHXd38/PrtpZExlqUp9M875xYmyPgXuubiuL4/moxqvSGwL R2vqNMvGGwxvg9KdtZF6RE8xnZ1h/Y06GXvCAS/GdDljfrdEJt0orwwz2BUC+I3zT8OVgQ 8Gmkk/m1/pHjG4bO3xZZ+j+MISGHdtOWTDewKm36zpGtFYLJ6P1T/BDzOD3ej+i7zn4VwS WUrLO9nIMBhjQcC+/O5JwuTtXO/3cr2rkZBQwSGFIkId3ILzYgLJ43ovIb2heQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791755719; 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=Ar8lq7o5OfE3X8KXQ0Glsn1w0D1Yy09IDp9BuFP/4vU=; b=xwT0kpK5U6q0YlbHZ/e7uqu7480Ic1r+l4vjrJrO9zrwq1UXXErg1lp6v5Ct93gDicgD+E moq305wkLnHICFcSDbv9N/h03wSRh3dauKwRSf7Sj3EcOJ2KNNtKrNvwRYBs9HZpnIZcDi P9SlSSduGptTAg3/LB5loPHGqrtWexnO/YTxLiB3S6PKAHTdhklINs0T9tkiXuA5GHqU53 jiECG6ndMI3o25SLglvmb+d6l3QEwCreqwVXS7FkMC9GwAK1RP8H9TeoHglq5aEAUDzmJG w3YxYxRlcwAETpoXhrjwt8kafDAXdVyja3Px0+8TtOK0x3X8LMIE+dGJ3SbiKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2vXl064jz10NQ for ; Sun, 11 Oct 2026 21:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18daf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 21:55:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 58a8f100a6fd - main - safe_eval.sh: safe_set_var use [:space:] if possible List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58a8f100a6fdb84997ed4740bd794779375e376f Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 21:55:18 +0000 Message-Id: <6acc05c6.18daf.7c2edf17@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=58a8f100a6fdb84997ed4740bd794779375e376f commit 58a8f100a6fdb84997ed4740bd794779375e376f Author: Simon J. Gerraty AuthorDate: 2026-10-11 21:55:11 +0000 Commit: Simon J. Gerraty CommitDate: 2026-10-11 21:55:11 +0000 safe_eval.sh: safe_set_var use [:space:] if possible Also use $ssv_extra$ssv_only as the default for $ssv_only has '-' which must be last in the character class. --- libexec/rc/safe_eval.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index 597c9e79ef9e..0fd085869397 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,6 +1,6 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.34 2026/10/11 18:08:28 sjg Exp $ +# $Id: safe_eval.sh,v 1.35 2026/10/11 21:48:58 sjg Exp $ # # @(#) Copyright (c) 2023-2026 Simon J. Gerraty # @@ -57,8 +57,13 @@ fi # If we pass all that, we eval "var=val" and return 0. # safe_set_var() { - eval $_local ssv_allow ssv_extra ssv_only ssv_rc - ssv_only="A-Za-z0-9_. \$,/=:+-" + eval $_local ssv_allow ssv_extra ssv_only ssv_space ssv_rc + # use [:space:] if we can as it includes \n + case " " in + [[:space:]]) ssv_space="[:space:]";; + *) ssv_space=" ";; + esac + ssv_only="${ssv_space}A-Za-z0-9_.,/=:+\$-" ssv_rc= while : @@ -84,9 +89,9 @@ safe_set_var() { ssv_rc=1 ;; esac - : is ssv_val ok - "$ssv_val" + : is ssv_val ok - "$ssv_val" match only [$ssv_extra$ssv_only] case "$ssv_val" in - *[!$ssv_only$ssv_extra]*) + *[!$ssv_extra$ssv_only]*) ssv_val=invalid ssv_rc=${ssv_rc:-2} ;;