From owner-svn-src-all@freebsd.org Tue Feb 20 20:29:41 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8FA0F28AF8; Tue, 20 Feb 2018 20:29:41 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BC916D455; Tue, 20 Feb 2018 20:29:41 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 669C56906; Tue, 20 Feb 2018 20:29:41 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KKTfEZ052716; Tue, 20 Feb 2018 20:29:41 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KKTfvM052715; Tue, 20 Feb 2018 20:29:41 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802202029.w1KKTfvM052715@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 20 Feb 2018 20:29:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329662 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329662 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 20:29:41 -0000 Author: kevans Date: Tue Feb 20 20:29:41 2018 New Revision: 329662 URL: https://svnweb.freebsd.org/changeset/base/329662 Log: lualoader: Replace invalid construct with valid construct It only worked by coincidence, but it did work. Store varargs in a table instead and work off of that. Modified: head/stand/lua/loader.lua Modified: head/stand/lua/loader.lua ============================================================================== --- head/stand/lua/loader.lua Tue Feb 20 20:26:48 2018 (r329661) +++ head/stand/lua/loader.lua Tue Feb 20 20:29:41 2018 (r329662) @@ -35,7 +35,14 @@ local password = require("password"); -- arguments passed as a lua function. This gives lua a chance to intercept -- builtin CLI commands like "boot" function cli_execute(...) - local cmd_name, cmd_args = ...; + local argv = {...}; + -- Just in case... + if (#argv == 0) then + loader.command(...); + return; + end + + local cmd_name = argv[1]; local cmd = _G[cmd_name]; if (cmd ~= nil) and (type(cmd) == "function") then -- Pass argv wholesale into cmd. We could omit argv[0] since the