From nobody Fri Apr 10 16:12:15 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 4fshdr0VGfz6Xy10 for ; Fri, 10 Apr 2026 16:12:16 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fshdq6wyjz3k7g for ; Fri, 10 Apr 2026 16:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775837536; 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=UEbclGDVyBlDUil3DOiJ8CKOix9pNFMfCXBiX1xY/FA=; b=H26RZYipeoqPzY3vZ52bmUsqZo2p4YAT2gdBHpGs0P75ojwORGs8dU7RNKxnIFSG097CES m5lxcjIFGU2VWRK4J67Tg+qlEC7b72sdRDxQqAytx0nO5hhYnkX5PKjs7DWsWH0Y6Fq2Gq TagGZ9BG/MVwgduviBCIP3myCwuxTt9s5gNZdpOmI1iTmFmbIhMn1/mxF48jmFIP8/Pjox 0LuGmySk7zIqU5MNGMTXh998i6FKvAjEQ856nBiVJ0iwJVLSN73EZGjyL7R6vUUPqGDjQH MAGy9k77R8+ACVjTnlRly15KBdLIBPLUHNkT+eaQyQ8rdJ0L9SkvlS3c4q6dgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775837536; a=rsa-sha256; cv=none; b=uEMl4i4vU+aWkFbJ95OePzlWmTBDtBjnhAc0jX/1sMXkikhO1Rzcg+mGo+UINUc8EBaYZF EF2WnGfyNWgGzK+za2jozSO/PH8dcpSH7jygIx6I6Ivs1EW1FnRLmhqLUoicW9D1Z0UxBa GnpJtP/kp3JmK4UM+FZS68D0RccjGnjA3YZqhqvksyv+oh1QwWopLhpHyYOSZWZ7GWkfsy lRoj7NToW5+wjtl0RlHPM5DXa94fAeIi2VC5NOoIatgzArehaEg1+9U4ho9hy0kBFcZLLo s0lJrK8zO5mHn5odAkz4ha4GVDfGAeP5UMce7J1yN2kjSu0Y4YZGjKk6HkTt+A== 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=1775837536; 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=UEbclGDVyBlDUil3DOiJ8CKOix9pNFMfCXBiX1xY/FA=; b=Ifc0lk08kHN8gkAsTzNRX9XLHrSPMEn4f87b2JBVJdaxwq0ahWsLokl49xLpdBSuiemMGD CuIIjV2JZ+kCIizwyJIitxLi0PHHFBipXu5yOJOdAM7KdVt7n0QZD1Nhct0sxkWcbvhNIU GaTLKobabfqvBzJoGUpo15frCMy5wMHFuBLHJyowAvPlDGjVUmMOFaJ0hzH0PkXHhQ8mFz Ep/j3fehazXPqnSoJ8N49ttvr/Tnh6nFr9daW8ir6X5OMMSF8KfUIKrtvyg6EBYQB0/6PY Ay7oCVfAq/iXyYnQE3CPp4fzBmhHM1yVvSYSH4tQAVnH5oocjRNjJqERqQVBNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fshdq6KBTzrXX for ; Fri, 10 Apr 2026 16:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22dd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 16:12:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: de9fe28ab847 - main - Allow passing xtras to safe_set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: de9fe28ab8476ca25a63066503f5fb40dcdd5719 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 16:12:15 +0000 Message-Id: <69d9215f.22dd8.4790d0bc@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=de9fe28ab8476ca25a63066503f5fb40dcdd5719 commit de9fe28ab8476ca25a63066503f5fb40dcdd5719 Author: Simon J. Gerraty AuthorDate: 2026-04-10 16:08:02 +0000 Commit: Simon J. Gerraty CommitDate: 2026-04-10 16:11:21 +0000 Allow passing xtras to safe_set This allows safe_set to be leveraged in other contexts where additional chars like '*' or '!' or even '\[\]' need to be preserved in the result. --- libexec/rc/safe_eval.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index 6c23b4c98218..e12b17c787d2 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,8 +1,8 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.25 2025/08/07 22:13:03 sjg Exp $ +# $Id: safe_eval.sh,v 1.26 2026/04/10 16:03:39 sjg Exp $ # -# @(#) Copyright (c) 2023-2024 Simon J. Gerraty +# @(#) Copyright (c) 2023-2026 Simon J. Gerraty # # SPDX-License-Identifier: BSD-2-Clause # @@ -23,13 +23,16 @@ else fi ## -# safe_set +# safe_set [xtras] # # return a safe variable setting -# any non-alphanumeric chars are replaced with '_' +# any non-alphanumeric chars other than those in "xtras" +# will be replaced with '_' # +# "xtras" should be used with caution and cannot include ';' +# safe_set() { - ${SED:-sed} 's/[ ]*#.*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "$,/=:+-];_;g' + ${SED:-sed} 's/[ ]*#.*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "'"$1"'$,/=:+-];_;g' } ##