From owner-dev-commits-src-all@freebsd.org Sat Aug 21 18:29:37 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5AC0867665D; Sat, 21 Aug 2021 18:29:37 +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 4GsRqj1nTBz4fMr; Sat, 21 Aug 2021 18:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1FACA119F3; Sat, 21 Aug 2021 18:29:37 +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 17LITaxT048542; Sat, 21 Aug 2021 18:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17LITajS048541; Sat, 21 Aug 2021 18:29:36 GMT (envelope-from git) Date: Sat, 21 Aug 2021 18:29:36 GMT Message-Id: <202108211829.17LITajS048541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 7b0d05d56dfa - main - loader: loader_lua can run command_more twice MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b0d05d56dfaad4e1d5a19727e34252072913d17 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Aug 2021 18:29:37 -0000 The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=7b0d05d56dfaad4e1d5a19727e34252072913d17 commit 7b0d05d56dfaad4e1d5a19727e34252072913d17 Author: Toomas Soome AuthorDate: 2021-08-21 18:17:18 +0000 Commit: Toomas Soome CommitDate: 2021-08-21 18:28:54 +0000 loader: loader_lua can run command_more twice When we quit pager, the return value 1 is returned and command_more() interprets it as error. when lua loader gets error from command, it will try to interpret it once more, so we get the same file shown once more. There is no reason why we should return error from command_more(). MFC after: 1 week --- stand/common/commands.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stand/common/commands.c b/stand/common/commands.c index 4c1c9b2b6a86..9f7252014d87 100644 --- a/stand/common/commands.c +++ b/stand/common/commands.c @@ -484,10 +484,7 @@ command_more(int argc, char *argv[]) } pager_close(); - if (res == 0) - return (CMD_OK); - else - return (CMD_ERROR); + return (CMD_OK); } static int