From nobody Tue Sep 5 02:28:38 2023 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 4RfqF31mwWz4sSb1; Tue, 5 Sep 2023 02:28:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfqF31HkTz3Y0f; Tue, 5 Sep 2023 02:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693880919; 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=iXZOEmelohrhBkJ8H0FmWw3quP9rq5vk0phwRigx+1c=; b=slnc7BNepxtgNLQvQ1r9g9WUZtQ5ExiLbByDjOm1H0VpFy+mY7RNANakUpKUAVTEzGo3NS UQnGGNFSv4KTEKZcX2nm+RafIdvfI9UajAH2y0O4mbeJIWERHV09MWWW4WDm5ltoGsQX58 1PPVYGK6QftDd7mWI45FEfQ8YUwQvjAp+EAr08U0D2IvPGdog635HPBLwnzykj0ofo5rtG tSOXJNgF2atfULsfhYx5fBe50pJCKzHQNBzy8AqE1LZ88+DGsuS5FYzFBaFuVoDUodfSvq aIEWsvxwt013sJww62ygG4qr0Ytw/jKatr+3fWPQUCDzzIeeKREdS5Bajzra9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693880919; a=rsa-sha256; cv=none; b=v6y7clwkD76GK6CL3H4LoRC1nfLcTftrzIED6dt3l59KhV8BqGpmteDstoy9m1putGyePD rI+MAr9yw8Zs9EwP6a75XZMByv0cCe5t0NrlE2AlTRhlrac7K8huZybLPFr1/xIHovh9F0 090X8ubb/Id1Vh7RzzexMlEshrTM6XAzN5cihq/PFTma+KHpAjXVfRTVr324U4WMRqwchb q9GLin8nPf/X5AoGs5o7IVUKVl24VOSvp0h47IkRPsvBtBoPnKG4hLDuHZpD8FB7G0vcdT +zXh06xuZYU1tg9SaMmjuGvUYYpmMwNTfjeos1bvOEztyOWDx5vJOVj4GhAULQ== 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=1693880919; 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=iXZOEmelohrhBkJ8H0FmWw3quP9rq5vk0phwRigx+1c=; b=ymtRwUcMte1weNdh+AxOReMSJRwJtBMwDhD0Q8bRXxMNapJjazxrn6Q/AzUvow35eYt4PX EbtHo0mY5kcQpyVZ7n8sCqo0miU/2Li55SpVZtFpClgMnuvIoGtAhwo8TcllUdpTd892NE ++mJf4WRJ6c9+6ieFFjHwFEwqKGIjjpV4lKp9bCyA89Pbj7QMdYZX9Sb7oGdLgq0zW2+hE 1kojHCIor4M4fpdx3kpM+4cXZym5StBsTzFoes1aLwg5YuOs2KcvGWt8f5mWh6RChW0v8m lOjjglh9Y0PmPPD3/12ctZF0yMZlIzqKUm2kGOHuDtHsoUpvKm8MJ5DrNOby4Q== 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 4RfqF30LgJz1Lt; Tue, 5 Sep 2023 02:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3852ScBw082333; Tue, 5 Sep 2023 02:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3852ScQk082330; Tue, 5 Sep 2023 02:28:38 GMT (envelope-from git) Date: Tue, 5 Sep 2023 02:28:38 GMT Message-Id: <202309050228.3852ScQk082330@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: 5bc1e0c2285e - main - stand: lua: module names should permit more 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 02:28:11 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ MFC after: 1 week --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)"