From nobody Thu Sep 1 17:11:21 2022 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 4MJSHt1k8Fz4b0SQ; Thu, 1 Sep 2022 17:11:22 +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 4MJSHt1Bprz3Vc4; Thu, 1 Sep 2022 17:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662052282; 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=aqaUByFDk+BFcK6Opv7WovtssCshcWsAmMD0DkHfXXc=; b=CxuxMzpTBLCkHeQ4ZrYS3CgJaLZ57ZAhLKV1Dde/Okzzxxcs+JEJp8J57Bd7jk89wApKlV 2xf5mXCG47rwcWgACh9kIdEQIN8WP3L7R2L3Jto+6fV/dx6OM7sZsDsE/jl8AmrHNspAld OWDNPoH0gQjJcflQJZm3OK8xBt5Ox6gYym1gD/r4uFEWmmV5elERc4/yLMfd+2UKjwSEw0 OSh34Lt3q+0ZVwSyutzRubIJ+hcwB4N/yQe/H53P4YuLMBGz+1yZwy74WfhGIV7ykvSXK/ /k9NvEvENYSIk9JEl+Ht2nDk3+Ax2AwDzDub6WPeHM56eSU+LI6uDsiYA/sKrQ== 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 4MJSHt0HGVzXwR; Thu, 1 Sep 2022 17:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 281HBLj8002643; Thu, 1 Sep 2022 17:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 281HBLPs002642; Thu, 1 Sep 2022 17:11:21 GMT (envelope-from git) Date: Thu, 1 Sep 2022 17:11:21 GMT Message-Id: <202209011711.281HBLPs002642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 29fc4075e69f - main - stand: Add lua binding loader.has_command 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29fc4075e69fd27de0cded313ac6000165d99f8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662052282; 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=aqaUByFDk+BFcK6Opv7WovtssCshcWsAmMD0DkHfXXc=; b=SAMonP0cKyw+e+yws28EpbHT8/NiTDzZWmHNUYjxpuXHpLd2doxMtEkIHFRrQIYpbw9XRx hwbqQaH+rXDJZDq3DqjzM9ZBYnNvOq1sjXqZc5if2OPsKHAPsoUgc0OLo9eP8coJlYbrbs ScV65YbDm6etlJq7jae6Q6GVJtu1yPxYsSpDb5U4UVLC2QZbumtBeyoGlOZpdKXu4RYb1B tuq2SAKvTgJB3ZEShzGkR/fLIlJmcuwkLjmPCCC3I3e24Q9utzI3UTAqwqQA8IEqG2Rhzf RV0+c5m1MVtND0OXDCNle2QX/BAU1pspycTytS3MHtj/TlZOXkxQXxmrdZHNTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662052282; a=rsa-sha256; cv=none; b=ZV6BA22rqZGRppm/tw0q5jPyrYyhKrBO/hLyL/hI8BitPhuMkSAOawsyLSImPnGJcwopjy mwaeQzeaxSxCoi15sB6HDOTBuXIcxhejGsEyb7SY73h2mMMezAgTnzd1/s+x1Hh+pEbSwb JaBLwucOma6xmiCdz85TMV7BqyiVUZlOJDyssi70FHa85MJT37HFEXaERUqN1bx/Z5Afh6 zUvG8Foz2+ILufQ0iOSL2pAUf7zl8p6EEODBUTOuA/eXYo7hF6wt7QM5oems6+v/pTEdKq UB6PeHzighA0gYGCK0eDATS3yBVcpYw2Yjk2tDGVcfaAD2T8swfkjC8NTRqj5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=29fc4075e69fd27de0cded313ac6000165d99f8b commit 29fc4075e69fd27de0cded313ac6000165d99f8b Author: Warner Losh AuthorDate: 2022-09-01 17:06:19 +0000 Commit: Warner Losh CommitDate: 2022-09-01 17:08:22 +0000 stand: Add lua binding loader.has_command Give scripts the ability to determine if the currently running loader has provided a command. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36365 --- stand/liblua/lutils.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 9243edd07e8f..1649ac9fd508 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -63,6 +63,21 @@ lua_command(lua_State *L) return 1; } +static int +lua_has_command(lua_State *L) +{ + const char *cmd; + + if (lua_gettop(L) != 1) { + lua_pushnil(L); + return 1; + } + cmd = luaL_checkstring(L, 1); + lua_pushinteger(L, interp_has_builtin_cmd(cmd)); + + return 1; +} + static int lua_perform(lua_State *L) { @@ -539,9 +554,9 @@ static const struct luaL_Reg loaderlib[] = { REG_SIMPLE(interpret), REG_SIMPLE(parse), REG_SIMPLE(getenv), + REG_SIMPLE(has_command), REG_SIMPLE(perform), - /* Also registered as the global 'printc' */ - REG_SIMPLE(printc), + REG_SIMPLE(printc), /* Also registered as the global 'printc' */ REG_SIMPLE(setenv), REG_SIMPLE(time), REG_SIMPLE(unsetenv),