diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-05-28 20:05:42 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-05-28 20:05:42 +0000 |
| commit | 08962758023ab85bc7bfc4e161e01c76a85da547 (patch) | |
| tree | 3ddf1e860aa8a9c7600bff0e3727a4b1ae9fc06a | |
| parent | df59d75bf8f57ca252a071c603c72be7f5558d78 (diff) | |
even simpler help storage w/ a tweak from millert@
| -rw-r--r-- | distrib/special/more/Makefile | 6 | ||||
| -rw-r--r-- | distrib/special/more/more.c | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/distrib/special/more/Makefile b/distrib/special/more/Makefile index ff6eecdd03d..859a211afd1 100644 --- a/distrib/special/more/Makefile +++ b/distrib/special/more/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2003/05/28 19:19:41 millert Exp $ +# $OpenBSD: Makefile,v 1.6 2003/05/28 20:05:41 mickey Exp $ PROG= more MAN= @@ -10,6 +10,8 @@ CLEANFILES+=morehelp.h beforedepend: morehelp.h morehelp.h: ${.CURDIR}/more.help - sed 's/\(^.*$$\)/\"\1\",/' ${.CURDIR}/more.help > morehelp.h + echo -n 'const char *more_help = "' > morehelp.h + cat ${.CURDIR}/more.help >> morehelp.h + echo '";' >> morehelp.h .include <bsd.prog.mk> diff --git a/distrib/special/more/more.c b/distrib/special/more/more.c index ffaa8973795..ad4a6dc68cd 100644 --- a/distrib/special/more/more.c +++ b/distrib/special/more/more.c @@ -1,4 +1,4 @@ -/* $OpenBSD: more.c,v 1.12 2003/05/28 19:25:18 deraadt Exp $ */ +/* $OpenBSD: more.c,v 1.13 2003/05/28 20:05:41 mickey Exp $ */ /*- * Copyright (c) 1980 The Regents of the University of California. @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)more.c 5.28 (Berkeley) 3/1/93"; #else -static const char rcsid[] = "$OpenBSD: more.c,v 1.12 2003/05/28 19:25:18 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: more.c,v 1.13 2003/05/28 20:05:41 mickey Exp $"; #endif #endif /* not lint */ @@ -99,10 +99,7 @@ static const char rcsid[] = "$OpenBSD: more.c,v 1.12 2003/05/28 19:25:18 deraadt #define DUM_ERROR "[Press 'h' for instructions.]" #define QUIT_IT "[Use q or Q to quit]" -const char *more_help[] = { #include "morehelp.h" - NULL -}; struct termios otty, osavetty; long file_pos, file_size; @@ -904,7 +901,6 @@ command(char *filename, FILE *f) char colonch; int done; char comchar, cmdbuf[80], *p; - const char **q; #define ret(val) retval=val;done++;break @@ -1083,8 +1079,7 @@ command(char *filename, FILE *f) case 'h': if (noscroll) doclear(); - for (q = more_help; *q; q++) - puts(*q); + fputs(more_help, stdout); prompt(filename); break; case 'v': /* This case should go right before default */ |