From nobody Tue Jan 24 22:12:17 2023 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 4P1h6B5K47z3bfgh; Tue, 24 Jan 2023 22:12:18 +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 4P1h6B0RJpz3CNR; Tue, 24 Jan 2023 22:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598338; 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=buAJfO56rwImwDyC4TzsbRczqPvuArCxNGmKuvo1W9g=; b=JINOnqOmoSG1gsHRIDia3TkVdkE2SsmOdNkn3jt92hczp7GuohJKBi8mZDpQnDX+RMARGu +T5KZWveEBuaDwe0ep34VvKeovuRQHKJxjoQ7qUfq/rqTis1PLKR0PO1cKF+5lZ/+AiTGq q5APojBXMyTjIz+32hsOcdtXM2ylDuL3MSzKuHtbEmOccb9vWegJeb9ztqVfnx3qvQGmYJ /FkzEtvqdH7aBvuX6n2grmPtqa3wdJGnKWQ9eH/OEOY/beFFd4HM5k3dFbuiuPSlZvFrSZ Er45zf+T7+69Bl/DpPXnHAqYootNeNE75dAjHyqDp4Q6+xv4Nu5Axb5Q9Um5uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598338; 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=buAJfO56rwImwDyC4TzsbRczqPvuArCxNGmKuvo1W9g=; b=JKV/3qnUBBT9+uE7MeKBY3VsMFZ4XsoBqgOAyaTUqbNwK/k5sbFAMFUTyQ59Mu8SReQKWh oDu4hmh21orqz1VDpwfTPN/449o1DWpNOIGg3nNEcxkF+c5cvFrwfz+ahxkKVnemndxFUh IODsiGJVrSbzGIUYLi9I26tPA0w5BDAtQzFSv0hbnA7sKDVFcf0etEyu0prXqChoQg0nr/ FBNEBIEQbbuQKBPUtqL4Olq1mtElOhioiWJL3gZ/b4ueFPON5dmKevOVs493oHESrRnEPE sS4eTitsqOCX9m/YHvfQrhpN5w/gMI0u3kEAaVkztnTlnh2xwVKrLzRp6CkCFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598338; a=rsa-sha256; cv=none; b=IGUYy0iRf69bfJkjhY0NxrdQaeVN7Hr1AA8/cejZzSrUh2eI38jLip99miMD/ZIjXsHRu9 dg94mEvlNKU1c7PqO5GKurDa38ao5l+5k9ua9Fd7qEFT4pSRBzt1+aV7kp+RKufvAqKERB N07dGMpsYwqIvzhZWiJ02BpbgUAd3qqvyPye4W8bcL9yHsSpAXAdi0tBizr09Tt734xfDQ s1uDIDkUJ/YryU20VVqRtVVrdNaJX44U6Zz9dhU0i62qsVKx+drUAKRE05o1/t18NTHKIE 6cdP6iV8N6s+4lNFDRVLO6d5UxN1E5A+uKk3zE2aUeq/ZLgWpkZj4n1dVgkVVw== 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 4P1h696cf8zQGt; Tue, 24 Jan 2023 22:12:17 +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 30OMCHLO086827; Tue, 24 Jan 2023 22:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCHeB086826; Tue, 24 Jan 2023 22:12:17 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:17 GMT Message-Id: <202301242212.30OMCHeB086826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3cb3b855b97c - stable/13 - stand: separate the command lookup from the command execution 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cb3b855b97ca8095c17d102b633374b4655aaed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3cb3b855b97ca8095c17d102b633374b4655aaed commit 3cb3b855b97ca8095c17d102b633374b4655aaed Author: Warner Losh AuthorDate: 2022-09-01 17:05:42 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:32 +0000 stand: separate the command lookup from the command execution Factor out interp_lookup_cmd to search for a command from interp_builtin_cmd. This simplifies the latter and can be used to expand lua to ask if a command exists. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D36363 (cherry picked from commit 113dfadd5c8c2b8a566bf4d0e969e1dff62c9e2f) --- stand/common/interp.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/stand/common/interp.c b/stand/common/interp.c index de5ea55eab41..227e7ad91e29 100644 --- a/stand/common/interp.c +++ b/stand/common/interp.c @@ -152,6 +152,19 @@ interp_emit_prompt(void) free(pr); } +static struct bootblk_command * +interp_lookup_cmd(const char *cmd) +{ + struct bootblk_command **cmdp; + + /* search the command set for the command */ + SET_FOREACH(cmdp, Xcommand_set) { + if (((*cmdp)->c_name != NULL) && !strcmp(cmd, (*cmdp)->c_name)) + return (*cmdp); + } + return (NULL); +} + /* * Perform a builtin command */ @@ -159,27 +172,21 @@ int interp_builtin_cmd(int argc, char *argv[]) { int result; - struct bootblk_command **cmdp; - bootblk_cmd_t *cmd; + struct bootblk_command *cmd; if (argc < 1) - return(CMD_OK); + return (CMD_OK); /* set return defaults; a successful command will override these */ command_errmsg = command_errbuf; strcpy(command_errbuf, "no error message"); - cmd = NULL; result = CMD_ERROR; - /* search the command set for the command */ - SET_FOREACH(cmdp, Xcommand_set) { - if (((*cmdp)->c_name != NULL) && !strcmp(argv[0], (*cmdp)->c_name)) - cmd = (*cmdp)->c_fn; - } - if (cmd != NULL) { - result = (cmd)(argc, argv); + cmd = interp_lookup_cmd(argv[0]); + if (cmd != NULL && cmd->c_fn) { + result = cmd->c_fn(argc, argv); } else { command_errmsg = "unknown command"; } - return(result); + return (result); }