From 4c46bfb6dc40ccf7d6effbef5ed28a521aea764b Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sun, 6 Nov 2011 16:40:17 +0000 Subject: [PATCH] Eliminate global variables. There is no reason why these three variables should be declared as global variables, while the others aren't. They are only used inside main(). --- usr.sbin/chroot/chroot.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index a0122f777e6..9db0192dfe0 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -56,16 +56,12 @@ __FBSDID("$FreeBSD$"); static void usage(void); -char *user; /* user to switch to before running program */ -char *group; /* group to switch to ... */ -char *grouplist; /* group list to switch to ... */ - int main(int argc, char *argv[]) { struct group *gp; struct passwd *pw; - char *endp, *p; + char *endp, *p, *user, *group, *grouplist; const char *shell; gid_t gid, *gidlist; uid_t uid; @@ -74,6 +70,7 @@ main(int argc, char *argv[]) gid = 0; uid = 0; + user = group = grouplist = NULL; while ((ch = getopt(argc, argv, "G:g:u:")) != -1) { switch(ch) { case 'u':