git: 7b0d05d56dfa - main - loader: loader_lua can run command_more twice

Toomas Soome tsoome at FreeBSD.org
Sat Aug 21 18:29:37 UTC 2021


The branch main has been updated by tsoome:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b0d05d56dfaad4e1d5a19727e34252072913d17

commit 7b0d05d56dfaad4e1d5a19727e34252072913d17
Author:     Toomas Soome <tsoome at FreeBSD.org>
AuthorDate: 2021-08-21 18:17:18 +0000
Commit:     Toomas Soome <tsoome at FreeBSD.org>
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


More information about the dev-commits-src-all mailing list