From fbdf4e031fc7f4c303ed37962ab722675f9c608c Mon Sep 17 00:00:00 2001 From: jtc Date: Fri, 7 Jan 1994 20:34:23 +0000 Subject: [PATCH] Include for getenv() prototype. Use standard error message routines. --- usr.sbin/chroot/chroot.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index 559219622b4e..966eae51f5c2 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -39,43 +39,35 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)chroot.c 5.8 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$Id: chroot.c,v 1.3 1993/08/01 18:00:20 mycroft Exp $"; +static char rcsid[] = "$Id: chroot.c,v 1.4 1994/01/07 20:34:23 jtc Exp $"; #endif /* not lint */ #include -#include +#include #include +#include +#include main(argc, argv) int argc; char **argv; { - extern int errno; - char *shell, *getenv(); + char *shell; if (argc < 2) { (void)fprintf(stderr, "usage: chroot newroot [command]\n"); exit(1); } if (chdir(argv[1]) || chroot(".")) - fatal(argv[1]); + err(1, "%s", argv[1]); if (argv[2]) { execvp(argv[2], &argv[2]); - fatal(argv[2]); + err(1, "%s", argv[2]); } else { if (!(shell = getenv("SHELL"))) shell = _PATH_BSHELL; execlp(shell, shell, "-i", (char *)NULL); - fatal(shell); + err(1, "%s", shell); } /* NOTREACHED */ } - -fatal(msg) - char *msg; -{ - extern int errno; - - (void)fprintf(stderr, "chroot: %s: %s\n", msg, strerror(errno)); - exit(1); -}