From nobody Wed Apr 22 16:15:21 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 4g147t282kz6ZqvH for ; Wed, 22 Apr 2026 16:15:22 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g147s6jCFz3vLT for ; Wed, 22 Apr 2026 16:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776874521; 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=ifilZU96dwedQfcn3NbzneXxJA4We5Kq6T9/EWlfc9I=; b=B3KFBTjnJcmGxdDviDZm85oCXzDpSQf4bxZBKkA1odrXeNI9ut8JUnOIXjN6Y5PMb/FVuu pMZ7tr3sk83AGmCq3xRVp4fvXG9ofY0oqIRiIg8ldHBqwqXBmfZFN5t0cb6etcKUnpkno1 HejJ5aLyMj5cNHUC7bY3GCsJG5HZWsxhxnvI3HohdLNCSOLDuezbgJUv651D+UU4eXIk04 36FgZ78mNcF3TU5QjlWPmxHcgqXx/TAyoq+HImsqHBmdZKJpIkiP2+Sd+3I1LkzOuLVPfs z4b5c60532mAXogn9u3bEO70HkyLb4mBRg2fRrQErsap3/LGQijhYs18kEq2dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776874521; a=rsa-sha256; cv=none; b=ZgJtimBpnCg0BWIAmTnQSMRNzq7qho4xiZ+pT5hSbyWpkiQNFXwJX3hmrcSDbVbooZMkeA ZiaPabp/R/Q6RMjl++FSzNDsWXQ0KbjabB+pmB0IPUcEin82XPbryTLcV5qdY8lpWD+tap 95YWrVe8901VoOVhVS0s0H1WrzqkJ4aKQOfZeRbjVyUe8BdwUM3LXdfOOFgFDX/937PjEf gGc5oo8vz036+jCQVdd5AUTWWC1wqUaByDdXRwUmyb/EiSYKuOk3A/RdkMov2aYGqAs7o8 +vbW3grDcv49CRc8TGI0i/idQRbto1Gb1pd2Mx3Kr783Z1Kk08XGvseII41WCA== 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=1776874521; 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=ifilZU96dwedQfcn3NbzneXxJA4We5Kq6T9/EWlfc9I=; b=kk2QaI7OgyHM5qhWSN8jCoJB8Yc2BWtfppWgbpRiOpQbbI8tzzmcoZlBPTr/IDhZBmWpm4 HQsoR27ZLwdEpeHeIM0aDB0kQG5lDuS9j6ZPiLpJlMXuTyzZKxtHHV8Q9KIEzm404CYapg aLFksocRKergLSwr0Z77NozLIRjANX0j2dlQ3k7G9N6NtVZQ2w1vamNBquivsnyTVLl4Fi Zvdjn3bVVYDA2PStzaWYcl5CxWROWfqe9h+U7ION7Jnlp6a7KkDCOTAoTi0+SBbSd4CCVG IKmpxz3wq+X7OPy0dIsh6suinVZEgsJAwTO0cdkuGEGRmPjDn/BGUYvDMe2RQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g147s5gG3zdHy for ; Wed, 22 Apr 2026 16:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 16:15:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 69cc351c4c91 - main - safe_set ignore leading white-space 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: 69cc351c4c911cfeda1851f3c18a4b61281708cb Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 16:15:21 +0000 Message-Id: <69e8f419.39c44.c87a294@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=69cc351c4c911cfeda1851f3c18a4b61281708cb commit 69cc351c4c911cfeda1851f3c18a4b61281708cb Author: Simon J. Gerraty AuthorDate: 2026-04-22 16:15:13 +0000 Commit: Simon J. Gerraty CommitDate: 2026-04-22 16:15:13 +0000 safe_set ignore leading white-space Also treate ':' at the start of a line as for '#' ie. a comment. --- libexec/rc/safe_eval.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index e12b17c787d2..f96c34dda936 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,6 +1,6 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.26 2026/04/10 16:03:39 sjg Exp $ +# $Id: safe_eval.sh,v 1.27 2026/04/22 16:11:57 sjg Exp $ # # @(#) Copyright (c) 2023-2026 Simon J. Gerraty # @@ -32,7 +32,7 @@ fi # "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_. "'"$1"'$,/=:+-];_;g' + ${SED:-sed} 's/^[ ]*//;s/^[:#].*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "'"$1"'$,/=:+-];_;g' } ##