Date: Sat, 28 Aug 2021 10:16:39 GMT From: Toomas Soome <tsoome@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0e98ea64237d - stable/13 - loader: loader_lua can run command_more twice Message-ID: <202108281016.17SAGdao084877@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=0e98ea64237d3050d608a37652c98dc9823dce14 commit 0e98ea64237d3050d608a37652c98dc9823dce14 Author: Toomas Soome <tsoome@FreeBSD.org> AuthorDate: 2021-08-21 18:17:18 +0000 Commit: Toomas Soome <tsoome@FreeBSD.org> CommitDate: 2021-08-28 07:38:35 +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(). (cherry picked from commit 7b0d05d56dfaad4e1d5a19727e34252072913d17) --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108281016.17SAGdao084877>