From owner-svn-src-head@freebsd.org Tue Feb 20 17:29:00 2018 Return-Path: Delivered-To: svn-src-head@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 27285F175C7; Tue, 20 Feb 2018 17:29:00 +0000 (UTC) (envelope-from imp@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 C256481C46; Tue, 20 Feb 2018 17:28:59 +0000 (UTC) (envelope-from imp@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 BD3704AC4; Tue, 20 Feb 2018 17:28:59 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KHSxOt054660; Tue, 20 Feb 2018 17:28:59 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KHSxZR054659; Tue, 20 Feb 2018 17:28:59 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201802201728.w1KHSxZR054659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 20 Feb 2018 17:28:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329643 - head/stand/liblua X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand/liblua X-SVN-Commit-Revision: 329643 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 17:29:00 -0000 Author: imp Date: Tue Feb 20 17:28:59 2018 New Revision: 329643 URL: https://svnweb.freebsd.org/changeset/base/329643 Log: Implement loader.command This is just like loader.perform, except it takes pre-parsed arguments. Review: https://reviews.freebsd.org/D14448 Modified: head/stand/liblua/lutils.c Modified: head/stand/liblua/lutils.c ============================================================================== --- head/stand/liblua/lutils.c Tue Feb 20 14:59:29 2018 (r329642) +++ head/stand/liblua/lutils.c Tue Feb 20 17:28:59 2018 (r329643) @@ -34,7 +34,32 @@ __FBSDID("$FreeBSD$"); #include "lutils.h" #include "bootstrap.h" +/* + * Like loader.perform, except args are passed already parsed + * on the stack. + */ static int +lua_command(lua_State *L) +{ + int i; + int res = 1; + int argc = lua_gettop(L); + char **argv; + + argv = malloc(sizeof(char *) * (argc + 1)); + if (argv == NULL) + return 0; + for (i = 0; i < argc; i++) + argv[i] = (char *)(intptr_t)luaL_checkstring(L, i + 1); + argv[argc] = NULL; + res = interp_builtin_cmd(argc, argv); + free(argv); + lua_pushinteger(L, res); + + return 1; +} + +static int lua_perform(lua_State *L) { int argc; @@ -213,6 +238,7 @@ lua_readfile(lua_State *L) #define REG_SIMPLE(n) { #n, lua_ ## n } static const struct luaL_Reg loaderlib[] = { REG_SIMPLE(delay), + REG_SIMPLE(command), REG_SIMPLE(getenv), REG_SIMPLE(perform), REG_SIMPLE(printc),