Module Name: src
Committed By: wiz
Date: Mon Aug 15 14:43:17 UTC 2011
Modified Files:
src/usr.sbin/chroot: chroot.8 chroot.c
Log Message:
Re-order and synchronize options listed in manpage (`SYNOPSIS' and
text) as well as `usage'-line; several punctuation improvements.
>From Snader_LB.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/chroot/chroot.8
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/chroot/chroot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/chroot/chroot.8
diff -u src/usr.sbin/chroot/chroot.8:1.13 src/usr.sbin/chroot/chroot.8:1.14
--- src/usr.sbin/chroot/chroot.8:1.13 Tue Jul 6 23:05:56 2010
+++ src/usr.sbin/chroot/chroot.8 Mon Aug 15 14:43:17 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: chroot.8,v 1.13 2010/07/06 23:05:56 jruoho Exp $
+.\" $NetBSD: chroot.8,v 1.14 2011/08/15 14:43:17 wiz Exp $
.\"
.\" Copyright (c) 1988, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)chroot.8 8.1 (Berkeley) 6/9/93
.\"
-.Dd July 7, 2010
+.Dd August 13, 2011
.Dt CHROOT 8
.Os
.Sh NAME
@@ -37,9 +37,9 @@
.Nd change root directory
.Sh SYNOPSIS
.Nm
-.Op Fl u Ar user
-.Op Fl g Ar group
.Op Fl G Ar group,group,...
+.Op Fl g Ar group
+.Op Fl u Ar user
.Ar newroot
.Op Ar command
.Sh DESCRIPTION
@@ -49,23 +49,23 @@
.Ar newroot
and exec's
.Ar command ,
-if supplied, or an interactive copy of your shell.
+or, if not supplied, an interactive copy of your shell.
.Pp
If the
.Fl u ,
-.Fl g
+.Fl g ,
or
.Fl G
-options are given, the user, group and group list of the process are
-set to these values after the chroot has taken place. See
+options are given, the user, group, and group list of the process are
+set to these values after the chroot has taken place; see
.Xr setgid 2 ,
.Xr setgroups 2 ,
.Xr setuid 2 ,
-.Xr getgrnam 3
+.Xr getgrnam 3 ,
and
.Xr getpwnam 3 .
.Pp
-Note,
+Note:
.Ar command
or the shell are run as your real-user-id.
.Sh ENVIRONMENT
Index: src/usr.sbin/chroot/chroot.c
diff -u src/usr.sbin/chroot/chroot.c:1.15 src/usr.sbin/chroot/chroot.c:1.16
--- src/usr.sbin/chroot/chroot.c:1.15 Mon Jul 21 13:36:57 2008
+++ src/usr.sbin/chroot/chroot.c Mon Aug 15 14:43:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chroot.c,v 1.15 2008/07/21 13:36:57 lukem Exp $ */
+/* $NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: chroot.c,v 1.15 2008/07/21 13:36:57 lukem Exp $");
+__RCSID("$NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $");
#endif
#endif /* not lint */
@@ -179,7 +179,7 @@
usage(void)
{
- (void)fprintf(stderr, "usage: chroot [-g group] [-G group,group,...] "
+ (void)fprintf(stderr, "usage: chroot [-G group,group,...] [-g group] "
"[-u user] newroot [command]\n");
exit(1);
}
