From nobody Mon Sep 11 22:02:55 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 4Rl11D09mQz4tQkx; Mon, 11 Sep 2023 22:02:56 +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 4Rl11C6WF2z3Sgq; Mon, 11 Sep 2023 22:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469775; 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=FXsVrW1O5NQnSxX8dKbTdX0k3An651rLLLF7RoUGaiA=; b=LtXz+CAwBXzQ8V69doZO8iE8FroVdNdBoiEHkBPRL/ZIAeTy8wYSWXLvlZ+7QS7pYvtDhE IjP7f14b2RZlPWAlxJxcj9myOsNo1S5KFBK+Wgwk7dV/VAa44wz+piaQnEgkZYQOtlwka2 xigftDft3pJr6Pfjuy0muWAZBkSx1/hlzwzeDQtC2Ul40jfVxLmxunTUnz9y1Wy30EA6CO J5hsLHS5YTSlZJ7C+OcdDcoj6rGCnwHdahXpJ2INadwU7G7+yyi7UhzT7jON3niZ0vMAav FiL7D7fYAkkpkyWJrVSoctNwVhYvhnVRoeEm5vQysWlhg2fvVAxtehlRA5z4xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469775; a=rsa-sha256; cv=none; b=ikeYF9Emwqc8mpOa5wpj5RxiDFMCkyq+sKwYKXBJwUdXJNqIYjjuWuoSoW59fvHVJ40u4+ jyrt35xdVLofnzXxEPaOrbQ1qnw72Z2i+n65X5Cz2JXocwAb9+NFwbmGLki6Qj3vwt3H30 3PpqwCusxjh0Nsw4ZFihbYpbYz6mbh9V+k9GImXVZyNETkYsLvujab/23j3O+SvJMuTghS 7vPqFqxtq7Y5PhxtUz6Rc7FDarn7bPqgcU0cQX1/p541lNukSQXDdFH/4rKTfeIdN1nVU6 +3lAntOm72QGwSVPBL5ZzVrPHRWZFHhfszEKlKJVFjfjzaB3rMyqyqDASV3vtg== 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=1694469775; 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=FXsVrW1O5NQnSxX8dKbTdX0k3An651rLLLF7RoUGaiA=; b=vFwRqy3gbLKQR5NWLhOiliA0JQFuQeSClOAcm3gaoUrZ78IrzRowuleanukgmELJcwvW5R Osr3pmTAo8yVwunGzjSiO1gKOWMBCtSmN1iJg6akrazs+NQAcdwIi6Jcl4PSFVSZNz89aF iax36CYWhMFmazy6nzUo+iOans8sSdgMu5EnHyW7Q+gi5dmNI6aPCtdu9h8IjyWki5ud2e WzD8fVa1b+0+ipWzrNupzrHWdQhO2vhDFKvd3Y7yoz/dd327Ktmmwpni6YAJ9d4Qo7MlVj 2fAdGkoPVDD7vlSa4ZYq4KfTsYLyHmZNWcELJ4akXSJ52PRx+klctNzxOS0yuQ== 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 4Rl11C5dQvz15cK; Mon, 11 Sep 2023 22:02:55 +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 38BM2tKd006346; Mon, 11 Sep 2023 22:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM2tsE006343; Mon, 11 Sep 2023 22:02:55 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:02:55 GMT Message-Id: <202309112202.38BM2tsE006343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: babfcc0aa662 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: babfcc0aa66256ffa5142a621ee9eba67d564efb Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=babfcc0aa66256ffa5142a621ee9eba67d564efb commit babfcc0aa66256ffa5142a621ee9eba67d564efb Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:02:38 +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@ (cherry picked from commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e) --- 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 2f66d715016e..2f22056efde2 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -60,7 +60,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_.]*)"