From 70a745d96653c2d3e72ba1704c29aaa946ed9a92 Mon Sep 17 00:00:00 2001 From: Chris Luke Date: Sun, 10 Jun 2018 10:47:50 -0400 Subject: cli: Fix off-by-one in the pager - The last line in the pager buffer was sometimes missed when using space/pg-dn; simple off-by-one error. Change-Id: Id4e5f7cf0e5db4f719f87b9069d75427bc66d3f7 Signed-off-by: Chris Luke --- src/vlib/unix/cli.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vlib/unix') diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c index 3df9a98ffb1..512a77aa8f7 100644 --- a/src/vlib/unix/cli.c +++ b/src/vlib/unix/cli.c @@ -1832,7 +1832,7 @@ unix_cli_line_process_one (unix_cli_main_t * cm, case UNIX_CLI_PARSE_ACTION_PAGER_NEXT: case UNIX_CLI_PARSE_ACTION_PAGER_PGDN: /* show next page of the buffer */ - if (cf->height + cf->pager_start < vec_len (cf->pager_index)) + if (cf->height + cf->pager_start <= vec_len (cf->pager_index)) { u8 *line = NULL; unix_cli_pager_index_t *pi = NULL; @@ -1863,7 +1863,7 @@ unix_cli_line_process_one (unix_cli_main_t * cm, case UNIX_CLI_PARSE_ACTION_PAGER_DN: case UNIX_CLI_PARSE_ACTION_PAGER_CRLF: /* display the next line of the buffer */ - if (cf->pager_start < vec_len (cf->pager_index) - (cf->height - 1)) + if (cf->height + cf->pager_start <= vec_len (cf->pager_index)) { u8 *line; unix_cli_pager_index_t *pi; -- cgit 1.2.3-korg