From nobody Mon Sep 11 22:01:59 2023 X-Original-To: dev-commits-src-branches@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 4Rl1073NRpz4tQQb; Mon, 11 Sep 2023 22:01:59 +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 4Rl1072rwCz3S9y; Mon, 11 Sep 2023 22:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694469719; 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=Hrv5BABoNGo6M+csIy4UL/6qjf3Zt/yZthYyk+SoK44=; b=YTM/X/ZCmc0xHpXUtYRe+/0vieJelBck5TqQ2IN6qBSlMb0ttgXdyvZFEPMSdzw6U0XSgi EDopQPGqdmy1DcmWVZw/77oB1K0rJsaqqJtgQ8v8HHwCPRHA6b/GFUxUz+OtFyVhEi+iuN toqz4McM6wNeM6wFJ3ce/h0AGeQ/aIz5BwU5cQ5+WJr9cp8PJ3poYWW8J+ryDVkyagYF0h OSbcuW5xVTZ1JvG0elI6DpauSdpZL+8xIalj3r8wsX9C2pwrjDvKhGY16MH+oHDGH0d/E2 gRYUdRW6dZUCbxQDq7zaNA3Hx4mwVKcHSWO9IfdwDfMlcSTxSeT4KFpMeMkkMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694469719; a=rsa-sha256; cv=none; b=DPE8s+qVj7DaVIQOUalZ2sVJyUTuZXZNSQ6Gi7Oi9AvjEm8B5BmLQacfkWQWa9q4Lq/DtD Yy/sBJYpqA9HmanbgYCBlzNqgHn3RgapLLPPdxp2yzVSuI7Nf453ZUvcJEiKI/tZHMtnAz p1ptK/DHNmLiMTf9aWujd7/crwyLNjtnQpB0WRdcvJVIRiHV4EGj4LFoBDddXMHWSfcA9v iLNGn8bM4IYVo9LU8WW369BkC5AfV7vgqwhONUD++kHCoQv3CglPzKqSyx/SWaQ5XRY3p3 EcQovZH3NYhTQZtuRC/j89SpMqqt8DNQ3kFaKyM5HJvJczXpeBQ1HGPoFrLj5g== 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=1694469719; 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=Hrv5BABoNGo6M+csIy4UL/6qjf3Zt/yZthYyk+SoK44=; b=WPSgIuD+fVg8EMzEZF9jk6BnrqaOQf4FCiFiKujBb6mWVmDm5ibUTI5doMVtHyneerfAmn qKelrcAxYyQQVJiHiYireuatjhTQeSTLBAReOZa/gY190t9yzLCxSCt7gu71MH+/kyBh59 CIcYtwFI/ysTqDnprsg5WPcaWdDOBd13yurcU2qMvrlh9PqGfo6IwCiVkCgzkV8a6joxqa JjCnTgiYs/D6XjpbP0JRCW5cqp8mFyxpwCkafu2z/N7bP6KSuEhy+VoIfOXnYP6WFp9fQf eMf/nfg1kiWS6VwE+51plR59x8iAGi7SxEdmpY3BFYYtcCdytQPZsruGh90Gvw== 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 4Rl1071ypkz15fS; Mon, 11 Sep 2023 22:01:59 +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 38BM1xxe005024; Mon, 11 Sep 2023 22:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BM1xWU005021; Mon, 11 Sep 2023 22:01:59 GMT (envelope-from git) Date: Mon, 11 Sep 2023 22:01:59 GMT Message-Id: <202309112201.38BM1xWU005021@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: 6b2f0a3c31db - stable/14 - stand: lua: module names should permit more List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 6b2f0a3c31dbf9268b49d64c859da136ca8dc201 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2f0a3c31dbf9268b49d64c859da136ca8dc201 commit 6b2f0a3c31dbf9268b49d64c859da136ca8dc201 Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-11 22:01:52 +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 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_.]*)"