diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-09-14 05:44:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-09-14 05:44:13 +0000 |
| commit | 7df10535c08fb86783174b571c9932dce7c8e8e9 (patch) | |
| tree | 136914ed07e1b49e6e9a0de0ab3ac10a693aed11 /usr.bin | |
| parent | 7523b841577504db0daafc71606e9a26efab60e2 (diff) | |
/usr/bin/help == man man"
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/man/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/man/man.c | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile index a51de2d944d..9faaa9fabb0 100644 --- a/usr.bin/man/Makefile +++ b/usr.bin/man/Makefile @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 1998/09/14 05:44:11 deraadt Exp $ PROG= man SRCS= config.c man.c MAN= man.1 man.conf.5 +LINKS= ${BINDIR}/man ${BINDIR}/help + .include <bsd.prog.mk> diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c index f463bc64bcf..c32d968b2d0 100644 --- a/usr.bin/man/man.c +++ b/usr.bin/man/man.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man.c,v 1.10 1998/07/20 01:15:25 deraadt Exp $ */ +/* $OpenBSD: man.c,v 1.11 1998/09/14 05:44:12 deraadt Exp $ */ /* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95"; #else -static char rcsid[] = "$OpenBSD: man.c,v 1.10 1998/07/20 01:15:25 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: man.c,v 1.11 1998/09/14 05:44:12 deraadt Exp $"; #endif #endif /* not lint */ @@ -59,6 +59,7 @@ static char rcsid[] = "$OpenBSD: man.c,v 1.10 1998/07/20 01:15:25 deraadt Exp $" #include <glob.h> #include <signal.h> #include <stdio.h> +#include <libgen.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -96,6 +97,15 @@ main(argc, argv) char **ap, *cmd, *machine, *p, *p_add, *p_path, *pager, *sflag, *slashp; char *conffile, buf[MAXPATHLEN * 2]; + if (argv[1] == NULL && strcmp(basename(__progname), "help") == 0) { + static char *nargv[3]; + nargv[0] = "man"; + nargv[1] = "man"; + nargv[2] = NULL; + argv = nargv; + argc = 2; + } + machine = sflag = NULL; f_cat = f_how = 0; conffile = p_add = p_path = NULL; |