summaryrefslogtreecommitdiffstats
path: root/usr.bin/more
diff options
context:
space:
mode:
authorhoek <hoek@FreeBSD.org>1998-07-03 17:12:10 +0000
committerhoek <hoek@FreeBSD.org>1998-07-03 17:12:10 +0000
commit4a55b250d402fbee412172e44607f4469a953273 (patch)
treed06d026218420cb8f581667893d02f16e1ce93e6 /usr.bin/more
parent2238238604ab5b7dc82602b6f260bfe3c98c879e (diff)
downloadFreeBSD-src-4a55b250d402fbee412172e44607f4469a953273.zip
FreeBSD-src-4a55b250d402fbee412172e44607f4469a953273.tar.gz
Prevent recursive help)elp)elping.
Diffstat (limited to 'usr.bin/more')
-rw-r--r--usr.bin/more/command.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c
index 6d9e1c7..71f6088 100644
--- a/usr.bin/more/command.c
+++ b/usr.bin/more/command.c
@@ -57,6 +57,7 @@ extern int sc_height;
extern int sc_window;
extern int curr_ac;
extern int ac;
+extern char **av;
extern int quitting;
extern int scroll;
extern int screen_trashed; /* The screen has been overwritten */
@@ -511,6 +512,10 @@ again: if (sigs)
number, wsearch);
break;
case A_HELP: /* help */
+ if (!strcmp(_PATH_HELPFILE, av[curr_ac])) {
+ error("Already viewing help.");
+ break;
+ }
lower_left();
clear_eol();
putstr("help");
@@ -633,7 +638,6 @@ editfile()
showlist()
{
extern int sc_width;
- extern char **av;
register int indx, width;
int len;
char *p;
OpenPOWER on IntegriCloud