summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>1999-12-28 07:19:22 +0000
committermsmith <msmith@FreeBSD.org>1999-12-28 07:19:22 +0000
commita9559776cd1cef38633da2479c9078b728e97bd2 (patch)
tree5908b183370ebd4b0e91ea839fa38d4f2486b9df /sys/boot
parentd73a0504893e9c7c0af5ee1dd71676c3b186090c (diff)
downloadFreeBSD-src-a9559776cd1cef38633da2479c9078b728e97bd2.zip
FreeBSD-src-a9559776cd1cef38633da2479c9078b728e97bd2.tar.gz
Correctly handle a user-requested abort in the middle of displaying a
help subtopic. PR: kern/13196 Submitted by: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/common/commands.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index aa81abc..4a5ebfa 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -176,8 +176,10 @@ command_help(int argc, char *argv[])
((subtopic != NULL) && (s != NULL) && !strcmp(subtopic, s))) {
/* exact match, print text */
while((fgetstr(buf, 80, hfd) >= 0) && (buf[0] != '#')) {
- pager_output(buf);
- pager_output("\n");
+ if (pager_output(buf))
+ break;
+ if (pager_output("\n"))
+ break;
}
} else if ((subtopic == NULL) && (s != NULL)) {
/* topic match, list subtopics */
OpenPOWER on IntegriCloud