From nobody Mon May 12 18:28:13 2025 X-Original-To: dev-commits-src-main@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 4Zx7QP3hj9z5vdQb; Mon, 12 May 2025 18:28:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zx7QP2vdxz4725; Mon, 12 May 2025 18:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747074493; 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=zD/rGkS6pKVtrmdUY1UU9WV2SCEWDc4IB6kB95jQLqM=; b=q/HjwbDMyAalW4Suhdg9tBZFjHYFMzOcJhVhVZOMUFXGR441vkQao0D4IGgBGjkQxdLDxt uJmLRBplRhPMwMCWOKG8oPwg8hnadu+at+cjtHdfFM/8Mcndlr9nzPhvIeEDzWJ4drl1mL KGkGbS6oPsVnFg6uDgkbdmv6htcMReibvLVf5jcYsGpr9YM/bptsAu+V4nAaZagIzH+kIi 64Ntsq7m/0EFFVSvaTtb4O7CLXGMOC6XjwoDtcWt+pE6bO+/rUEudfu+qzlAMjqWnaYJh6 imMxQ4uuOX610fJHnHOQib3K2V8egzSEXSCI0Nv82KTHt6lAbJJL57+jlxlbww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747074493; 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=zD/rGkS6pKVtrmdUY1UU9WV2SCEWDc4IB6kB95jQLqM=; b=E3Zz99GGlm/FESs0YDBaWMV3HykA+Oe9QH/xOzktTYmdckk240P/xidq4tLLYET1wksUV0 DtVZzdVqD65+eroVA3oifZ1zR4k9XzdIV8welS5YCUyPvswAIv5w2U0kSVHiKWyJsb62Tf d3lK3ozBYMvDW57AAF0xG9uzdCwGrNhE4UbulzcI2TRC/k09bBtTC073MRWrw85kFAknZS 0LZH5RaZPdgMKsORrTtJ99GTCviwP+WQaiQSU4QUHD6wWxtNx2yiKckFxrfbgJC+F7Lpve a7GScLjTlW14wfKaPWvgY++qaZD0SnY/fKmuh0wn9NawXbUtMKYe0p8TBHJVew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747074493; a=rsa-sha256; cv=none; b=vuK82TKVeCEDqrwzJ1r+0KW/jas0Z5Wo+rSzGW5IZB0AWSoGz1zW3pJp9ujaY7LbUWteRv PgZUBNswecLhJghJO0cDovtZyu+ncLIFDOuX8vdcOX1cQcH1epVpTOOCpC7DEn/LkYXz3/ dR4DMRejdBwnldjDeBlJuJYisuIjVzul+WaACPXYFZpaFTsx8ij9EN6L5J0q34BxV1As9/ ac4PK0x/jBfujnUEGa0gcYn4AiZNUFdUo1Cu19Pn8Ik+xw1JCoyHiRONBMSyGYEdtPofpz roUf2GYfPPg56sOGyB+EbLWYlJACE9C6K2Nt7NEGtAVm2S3NRWKGd6lwyleOJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zx7QP2SPwz1R1B; Mon, 12 May 2025 18:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54CISDHe011097; Mon, 12 May 2025 18:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CISD4u011094; Mon, 12 May 2025 18:28:13 GMT (envelope-from git) Date: Mon, 12 May 2025 18:28:13 GMT Message-Id: <202505121828.54CISD4u011094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7080a0c170da - main - flua: add posix.unistd.execp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7080a0c170daf8e4b3f331ec33003b2f8893dc23 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7080a0c170daf8e4b3f331ec33003b2f8893dc23 commit 7080a0c170daf8e4b3f331ec33003b2f8893dc23 Author: Isaac Freund AuthorDate: 2025-05-05 09:57:13 +0000 Commit: Ed Maste CommitDate: 2025-05-12 18:27:57 +0000 flua: add posix.unistd.execp This matches the interface of lposix, although I do wonder why they went with execp rather than execvp for the function name here. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50177 --- libexec/flua/modules/lposix.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index a706adf2c353..816d4bc688d2 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -198,6 +198,62 @@ err: return (3); } +static int +lua_execp(lua_State *L) +{ + int argc, error; + const char *file; + const char **argv; + + enforce_max_args(L, 2); + + file = luaL_checkstring(L, 1); + luaL_checktype(L, 2, LUA_TTABLE); + + lua_len(L, 2); + argc = lua_tointeger(L, -1); + + /* + * Use lua_newuserdatauv() to allocate a scratch buffer that is tracked + * and freed by lua's GC. This avoid any chance of a leak if a lua error + * is raised later in this function (e.g. by luaL_argerror()). + * The (argc + 2) size gives enough space in the buffer for argv[0] and + * the terminating NULL. + */ + argv = lua_newuserdatauv(L, (argc + 2) * sizeof(char *), 0); + + /* + * Sequential tables in lua start at index 1 by convention. + * If there happens to be a string at index 0, use that to + * override the default argv[0]. This matches the lposix API. + */ + lua_pushinteger(L, 0); + lua_gettable(L, 2); + argv[0] = lua_tostring(L, -1); + if (argv[0] == NULL) { + argv[0] = file; + } + + for (int i = 1; i <= argc; i++) { + lua_pushinteger(L, i); + lua_gettable(L, 2); + argv[i] = lua_tostring(L, -1); + if (argv[i] == NULL) { + luaL_argerror(L, 2, + "argv table must contain only strings"); + } + } + argv[argc + 1] = NULL; + + execvp(file, (char **)argv); + error = errno; + + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); +} + static int lua_fnmatch(lua_State *L) { @@ -513,6 +569,7 @@ static const struct luaL_Reg unistdlib[] = { REG_SIMPLE(chown), REG_DEF(close, lua_pclose), REG_SIMPLE(dup2), + REG_SIMPLE(execp), REG_SIMPLE(fork), REG_SIMPLE(getpid), REG_SIMPLE(pipe),