From 111d19818a4a7c96c87e330c6c143fa03bb86819 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 8 Jan 2022 19:37:38 -0700 Subject: Handle "set height 1" PR cli/17151 points out that "set height 1" has pathological behavior in gdb. What I see is that gdb will endlessly print the pagination prompt. This patch takes a simple and expedient approach to a fix: pretend that the height is really 2. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=17151 --- gdb/utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gdb/utils.c') diff --git a/gdb/utils.c b/gdb/utils.c index b7d5859..2465bf3 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1601,6 +1601,12 @@ pager_file::puts (const char *linebuffer) m_wrap_indent = 0; }); + /* If the user does "set height 1" then the pager will exhibit weird + behavior. This is pathological, though, so don't allow it. */ + const unsigned int lines_allowed = (lines_per_page > 1 + ? lines_per_page - 1 + : 1); + /* Go through and output each character. Show line extension when this is necessary; prompt user for new page when this is necessary. */ @@ -1613,7 +1619,7 @@ pager_file::puts (const char *linebuffer) it here. */ if (pagination_enabled && !pagination_disabled_for_command - && lines_printed >= lines_per_page - 1) + && lines_printed >= lines_allowed) prompt_for_continue (); while (*lineptr && *lineptr != '\n') @@ -1690,7 +1696,7 @@ pager_file::puts (const char *linebuffer) this loop, so we must continue to check it here. */ if (pagination_enabled && !pagination_disabled_for_command - && lines_printed >= lines_per_page - 1) + && lines_printed >= lines_allowed) { prompt_for_continue (); did_paginate = true; -- cgit v1.1