From nobody Mon May 26 03:06:52 2025 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 4b5LJs1Qdfz5x85T; Mon, 26 May 2025 03:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5LJr6nN1z3fJm; Mon, 26 May 2025 03:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748228813; 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=n22Zj27Y5DKKnzw2zRLbMH5Weqqz6PMI1Zu+Ve3z5Fw=; b=quNhW33afyN7fPdiqGUjmkop4Y5okilFJJ2n4+fTx75hQayO4SJWf0jROMQnsAM6eoVpAa WxifnlHpZC0/K15mYnXaorV4NG7jDnFMtT/CQWVAzNJuOlp5AyZOSVmzmFJFykTPQYTvXo YXfZp1qP6+OsQhJLDNncCU8CaEQ9l6JOLhq+OiyUcSdyf9MVDQ/ytDxtSOe5UxhucWbnxS Tvf1Jug7TesV1I0eMVFM51ZUqk9ghWk+KWDW0eZUsDEHh/QXuPXXW90jLjP/Upijaryxsp VaEN/WkXjbdxgL3bafQmVaOM/eeqmDdj+m7sgqYcQSWweoXEwBEkZpMqeAO53Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748228813; 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=n22Zj27Y5DKKnzw2zRLbMH5Weqqz6PMI1Zu+Ve3z5Fw=; b=Scrxi347DM3JcyjNeD2bi5Z3SbXaQcJbbjTenZp4EHjy5yM27/2reZ+nklpyLSYqV4Fn9M DT7puMN8WEU7yrfJFCAVq7+FnIKys+iVqBWAFV/MHB+x1wwU07JJvCc2dyO5pvDjrO7fMv brqkup1wmC3gEH1kAV7PmkNQe0jKWCZD9qkJMkImGSU9xfhZ9ZfxEtp39zF4gc+zLfNKUd /L4IUCVLUCf/5hcAgdPMsLhqkZ8bX0gsdIcSHq77lVBujOQwui+PcrDRP5obFsyaQxn50t Nugk4KSJt8BWykwK8WsQdDnD6oWVvLXosRH6maPM030/bNqaQ5TWMMaKMEAfNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748228813; a=rsa-sha256; cv=none; b=w6p0G+InQwhI0v+zpXcuGek/zs1d+wO+CU9sHodzhS8oMZV9IHcaBkWhR/Pcjy9KhPbGae yUsaJxtAtWxvFMkUcL24QwswzF/tt4Qf5NyQe+wk1DolKoygenIJQtXWj2g0ejpoX5mH1m cZTUkSmqxPiVnUzLM/qg/uScbA8ujUjDGmgnfTvWiZnOEvgb8Z0rGVMZeWB0eLyAqUWrMW UP3ghoHhVmbETO2xbqcj/MHGAKAuXney71xX0RZ7KwAfSHFH/nl/hykGEoKVRntyaFyvRT uofpibUEAm4IOVO0xcxTaP9TTao6ZMNmKInT5yCoLO+46jbwm17DG/QT2cUy8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b5LJr6Nxyzq6l; Mon, 26 May 2025 03:06: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 54Q36qEW042682; Mon, 26 May 2025 03:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q36qrQ042679; Mon, 26 May 2025 03:06:52 GMT (envelope-from git) Date: Mon, 26 May 2025 03:06:52 GMT Message-Id: <202505260306.54Q36qrQ042679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: b0ada425efb3 - main - safe_eval allow : and + in values 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: b0ada425efb3fb1b744d66bd1d0c1bbd5a7f25e6 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b0ada425efb3fb1b744d66bd1d0c1bbd5a7f25e6 commit b0ada425efb3fb1b744d66bd1d0c1bbd5a7f25e6 Author: Simon J. Gerraty AuthorDate: 2025-05-26 03:05:53 +0000 Commit: Simon J. Gerraty CommitDate: 2025-05-26 03:06:47 +0000 safe_eval allow : and + in values --- libexec/rc/safe_eval.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index d03eacbdff72..8aaddcaf2176 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-2-Clause # RCSid: -# $Id: safe_eval.sh,v 1.20 2024/08/16 00:57:58 sjg Exp $ +# $Id: safe_eval.sh,v 1.24 2025/05/23 21:34:54 sjg Exp $ # # @(#) Copyright (c) 2023-2024 Simon J. Gerraty # @@ -17,6 +17,17 @@ _SAFE_EVAL_SH=: +# does local *actually* work? +local_works() { + local _fu +} + +if local_works > /dev/null 2>&1; then + _local=local +else + _local=: +fi + ## # safe_set # @@ -24,7 +35,7 @@ _SAFE_EVAL_SH=: # any non-alphanumeric chars are replaced with '_' # 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_. "$,/=:+-];_;g' } ## @@ -54,7 +65,7 @@ safe_eval_export() { # feed all "file" that exist to safe_eval # safe_dot() { - eval ${local:-:} ef ex f rc + eval $_local ef ex f rc ef= ex= rc=1