From owner-svn-src-all@freebsd.org Thu Feb 22 01:44:31 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 9B90DF16E67; Thu, 22 Feb 2018 01:44:31 +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 4FC857FFD4; Thu, 22 Feb 2018 01:44:31 +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 49F2720A5F; Thu, 22 Feb 2018 01:44:31 +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 w1M1iVgh048058; Thu, 22 Feb 2018 01:44:31 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1M1iV2W048057; Thu, 22 Feb 2018 01:44:31 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802220144.w1M1iV2W048057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 22 Feb 2018 01:44:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329784 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329784 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: Thu, 22 Feb 2018 01:44:31 -0000 Author: kevans Date: Thu Feb 22 01:44:30 2018 New Revision: 329784 URL: https://svnweb.freebsd.org/changeset/base/329784 Log: lualoader: Pull argument extraction for cli functions into cli.arguments This will be the translation layer for varargs -> cmd_name, argv for cli commands. We reserve the right to break exactly what the varargs inclulde, but this gives us a stable way to pull the arguments out of varargs. Modified: head/stand/lua/cli.lua Modified: head/stand/lua/cli.lua ============================================================================== --- head/stand/lua/cli.lua Thu Feb 22 01:42:13 2018 (r329783) +++ head/stand/lua/cli.lua Thu Feb 22 01:44:30 2018 (r329784) @@ -67,9 +67,7 @@ end -- Globals function boot(...) - local argv = {...} - local cmd_name = "" - cmd_name, argv = core.popFrontTable(argv) + local cmd_name, argv = cli.arguments(...) local kernel, argstr = parse_boot_args(argv) if kernel ~= nil then loader.perform("unload") @@ -79,9 +77,7 @@ function boot(...) end function autoboot(...) - local argv = {...} - local cmd_name = "" - cmd_name, argv = core.popFrontTable(argv) + local cmd_name, argv = cli.arguments(...) local argstr = parse_boot_args(argv, false) core.autoboot(argstr) end @@ -109,6 +105,15 @@ function cli_execute(...) loader.command(...) end +end + +-- Module exports + +function cli.arguments(...) + local argv = {...} + local cmd_name = "" + cmd_name, argv = core.popFrontTable(argv) + return cmd_name, argv end return cli