CVS commit: src/usr.sbin/quotactl
Module Name:src Committed By: dholland Date: Wed Feb 1 05:07:08 UTC 2012 Modified Files: src/usr.sbin/quotactl: quotaprop.h Log Message: Remove unwanted decl of the old quotactl syscall. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/quotactl/quotaprop.h 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/quotactl/quotaprop.h diff -u src/usr.sbin/quotactl/quotaprop.h:1.1 src/usr.sbin/quotactl/quotaprop.h:1.2 --- src/usr.sbin/quotactl/quotaprop.h:1.1 Mon Jan 30 19:31:31 2012 +++ src/usr.sbin/quotactl/quotaprop.h Wed Feb 1 05:07:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: quotaprop.h,v 1.1 2012/01/30 19:31:31 dholland Exp $ */ +/* $NetBSD: quotaprop.h,v 1.2 2012/02/01 05:07:08 dholland Exp $ */ /*- * Copyright (c) 2010 Manuel Bouyer * All rights reserved. @@ -84,10 +84,4 @@ prop_dictionary_t limits64toprop(uint64_ prop_dictionary_t quota64toprop(uid_t, int, uint64_t *[], const char *[], int, const char *[], int); -#if !defined(_KERNEL) !defined(_STANDALONE) -__BEGIN_DECLS -int quotactl(const char *, struct plistref *) __RENAME(__quotactl50); -__END_DECLS -#endif - #endif /* _QUOTA_QUOTAPROP_H_ */
CVS commit: src/usr.sbin/quotactl
Module Name:src Committed By: dholland Date: Mon Jan 30 19:23:49 UTC 2012 Added Files: src/usr.sbin/quotactl: proplib-interpreter.c Log Message: Add a copy of the proplib interpreter here so this program will continue to work after it's removed from the kernel. This copy is unchanged from sys/kern/vfs_quotactl.c except that I've preserved a cop of the old rcsid. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/usr.sbin/quotactl/proplib-interpreter.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/usr.sbin/quotactl/proplib-interpreter.c diff -u /dev/null src/usr.sbin/quotactl/proplib-interpreter.c:1.1 --- /dev/null Mon Jan 30 19:23:49 2012 +++ src/usr.sbin/quotactl/proplib-interpreter.c Mon Jan 30 19:23:49 2012 @@ -0,0 +1,908 @@ +/* $NetBSD: proplib-interpreter.c,v 1.1 2012/01/30 19:23:49 dholland Exp $ */ + +/* + * Copyright (c) 1991, 1993, 1994 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + *may be used to endorse or promote products derived from this software + *without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)ufs_vfsops.c 8.8 (Berkeley) 5/20/95 + * From NetBSD: ufs_vfsops.c,v 1.42 2011/03/24 17:05:46 bouyer Exp + */ + +/* + * Copyright (c) 1982, 1986, 1990, 1993, 1995 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Robert Elz at The University of Melbourne. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + *may be used to endorse or promote products derived from this software + *without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95 + * From NetBSD: ufs_quota.c,v 1.70 2011/03/24 17:05:46 bouyer Exp + */ + +/* + * From NetBSD: vfs_quotactl.c,v 1.36 2012/01/29 07:21:59 dholland Exp + */ + +/* + * Note that both of the
CVS commit: src/usr.sbin/quotactl
Module Name:src
Committed By: dholland
Date: Mon Jan 30 19:28:11 UTC 2012
Modified Files:
src/usr.sbin/quotactl: Makefile proplib-interpreter.c quotactl.c
Added Files:
src/usr.sbin/quotactl: proplib-interpreter.h
Log Message:
Make it build in userlevel and hook it in.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/quotactl/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/quotactl/proplib-interpreter.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/quotactl/proplib-interpreter.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/quotactl/quotactl.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/quotactl/Makefile
diff -u src/usr.sbin/quotactl/Makefile:1.3 src/usr.sbin/quotactl/Makefile:1.4
--- src/usr.sbin/quotactl/Makefile:1.3 Fri Mar 25 10:30:35 2011
+++ src/usr.sbin/quotactl/Makefile Mon Jan 30 19:28:11 2012
@@ -1,9 +1,9 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.3 2011/03/25 10:30:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/30 19:28:11 dholland Exp $
.include bsd.own.mk
PROG= quotactl
-SRCS= quotactl.c
+SRCS= quotactl.c proplib-interpreter.c
MAN= quotactl.8
DPADD= ${LIBQUOTA} ${LIBRPCSVC} ${LIBPROP}
Index: src/usr.sbin/quotactl/proplib-interpreter.c
diff -u src/usr.sbin/quotactl/proplib-interpreter.c:1.1 src/usr.sbin/quotactl/proplib-interpreter.c:1.2
--- src/usr.sbin/quotactl/proplib-interpreter.c:1.1 Mon Jan 30 19:23:49 2012
+++ src/usr.sbin/quotactl/proplib-interpreter.c Mon Jan 30 19:28:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: proplib-interpreter.c,v 1.1 2012/01/30 19:23:49 dholland Exp $ */
+/* $NetBSD: proplib-interpreter.c,v 1.2 2012/01/30 19:28:11 dholland Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -84,42 +84,40 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: proplib-interpreter.c,v 1.1 2012/01/30 19:23:49 dholland Exp $);
+__RCSID($NetBSD: proplib-interpreter.c,v 1.2 2012/01/30 19:28:11 dholland Exp $);
-#include sys/kmem.h
-#include sys/mount.h
-#include sys/quota.h
-#include sys/quotactl.h
+#include stdlib.h
+#include string.h
+#include errno.h
+#include err.h
+#include assert.h
+
+#include quota.h
#include quota/quotaprop.h
+#include proplib-interpreter.h
+
static int
-vfs_quotactl_getversion(struct mount *mp,
+vfs_quotactl_getversion(struct quotahandle *qh,
prop_dictionary_t cmddict, int q2type,
prop_array_t datas)
{
prop_array_t replies;
prop_dictionary_t data;
- struct quotastat stat;
+ unsigned restrictions;
int q2version;
- struct vfs_quotactl_args args;
- int error;
- KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
- KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
+ assert(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
+ assert(prop_object_type(datas) == PROP_TYPE_ARRAY);
- args.qc_op = QUOTACTL_STAT;
- args.u.stat.qc_ret = stat;
- error = VFS_QUOTACTL(mp, args);
- if (error) {
- return error;
- }
+ restrictions = quota_getrestrictions(qh);
/*
* Set q2version based on the stat results. Currently there
* are two valid values for q2version, 1 and 2, which we pick
* based on whether quotacheck is required.
*/
- if (stat.qs_restrictions QUOTA_RESTRICT_NEEDSQUOTACHECK) {
+ if (restrictions QUOTA_RESTRICT_NEEDSQUOTACHECK) {
q2version = 1;
} else {
q2version = 2;
@@ -152,20 +150,19 @@ vfs_quotactl_getversion(struct mount *mp
return ENOMEM;
}
- return error;
+ return 0;
}
static int
-vfs_quotactl_quotaon(struct mount *mp,
+vfs_quotactl_quotaon(struct quotahandle *qh,
prop_dictionary_t cmddict, int q2type,
prop_array_t datas)
{
prop_dictionary_t data;
const char *qfile;
- struct vfs_quotactl_args args;
- KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
- KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
+ assert(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
+ assert(prop_object_type(datas) == PROP_TYPE_ARRAY);
if (prop_array_count(datas) != 1)
return EINVAL;
@@ -177,28 +174,30 @@ vfs_quotactl_quotaon(struct mount *mp,
qfile))
return EINVAL;
- args.qc_op = QUOTACTL_QUOTAON;
- args.u.quotaon.qc_idtype = q2type;
- args.u.quotaon.qc_quotafile = qfile;
- return VFS_QUOTACTL(mp, args);
+ /* libquota knows the filename; cannot set it from here */
+ (void)qfile;
+
+ if (quota_quotaon(qh, q2type)) {
+ return errno;
+ }
+ return 0;
}
static int
-vfs_quotactl_quotaoff(struct mount *mp,
+vfs_quotactl_quotaoff(struct quotahandle *qh,
prop_dictionary_t cmddict, int q2type,
prop_array_t datas)
{
- struct vfs_quotactl_args args;
-
- KASSERT(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
- KASSERT(prop_object_type(datas) == PROP_TYPE_ARRAY);
+ assert(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
+ assert(prop_object_type(datas) == PROP_TYPE_ARRAY);
if (prop_array_count(datas) != 0)
return EINVAL;
- args.qc_op = QUOTACTL_QUOTAOFF;
-
CVS commit: src/usr.sbin/quotactl
Module Name:src
Committed By: dholland
Date: Mon Jan 30 19:31:31 UTC 2012
Modified Files:
src/usr.sbin/quotactl: Makefile proplib-interpreter.c quotactl.c
Added Files:
src/usr.sbin/quotactl: quotaprop.c quotaprop.h
Log Message:
Needs its own copy of quotaprop.[ch] too.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/quotactl/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/quotactl/proplib-interpreter.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/quotactl/quotactl.c
cvs rdiff -u -r0 -r1.1 src/usr.sbin/quotactl/quotaprop.c \
src/usr.sbin/quotactl/quotaprop.h
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/quotactl/Makefile
diff -u src/usr.sbin/quotactl/Makefile:1.4 src/usr.sbin/quotactl/Makefile:1.5
--- src/usr.sbin/quotactl/Makefile:1.4 Mon Jan 30 19:28:11 2012
+++ src/usr.sbin/quotactl/Makefile Mon Jan 30 19:31:31 2012
@@ -1,9 +1,9 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.4 2012/01/30 19:28:11 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2012/01/30 19:31:31 dholland Exp $
.include bsd.own.mk
PROG= quotactl
-SRCS= quotactl.c proplib-interpreter.c
+SRCS= quotactl.c proplib-interpreter.c quotaprop.c
MAN= quotactl.8
DPADD= ${LIBQUOTA} ${LIBRPCSVC} ${LIBPROP}
Index: src/usr.sbin/quotactl/proplib-interpreter.c
diff -u src/usr.sbin/quotactl/proplib-interpreter.c:1.2 src/usr.sbin/quotactl/proplib-interpreter.c:1.3
--- src/usr.sbin/quotactl/proplib-interpreter.c:1.2 Mon Jan 30 19:28:11 2012
+++ src/usr.sbin/quotactl/proplib-interpreter.c Mon Jan 30 19:31:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: proplib-interpreter.c,v 1.2 2012/01/30 19:28:11 dholland Exp $ */
+/* $NetBSD: proplib-interpreter.c,v 1.3 2012/01/30 19:31:31 dholland Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -84,7 +84,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: proplib-interpreter.c,v 1.2 2012/01/30 19:28:11 dholland Exp $);
+__RCSID($NetBSD: proplib-interpreter.c,v 1.3 2012/01/30 19:31:31 dholland Exp $);
#include stdlib.h
#include string.h
@@ -93,8 +93,8 @@ __RCSID($NetBSD: proplib-interpreter.c,
#include assert.h
#include quota.h
-#include quota/quotaprop.h
+#include quotaprop.h
#include proplib-interpreter.h
static int
Index: src/usr.sbin/quotactl/quotactl.c
diff -u src/usr.sbin/quotactl/quotactl.c:1.6 src/usr.sbin/quotactl/quotactl.c:1.7
--- src/usr.sbin/quotactl/quotactl.c:1.6 Mon Jan 30 19:28:11 2012
+++ src/usr.sbin/quotactl/quotactl.c Mon Jan 30 19:31:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quotactl.c,v 1.6 2012/01/30 19:28:11 dholland Exp $ */
+/* $NetBSD: quotactl.c,v 1.7 2012/01/30 19:31:31 dholland Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: quotactl.c,v 1.6 2012/01/30 19:28:11 dholland Exp $);
+__RCSID($NetBSD: quotactl.c,v 1.7 2012/01/30 19:31:31 dholland Exp $);
#endif /* not lint */
/*
@@ -46,8 +46,7 @@ __RCSID($NetBSD: quotactl.c,v 1.6 2012/
#include string.h
#include unistd.h
-#include quota/quotaprop.h
-
+#include quotaprop.h
#include proplib-interpreter.h
__dead static void usage(void);
Added files:
Index: src/usr.sbin/quotactl/quotaprop.c
diff -u /dev/null src/usr.sbin/quotactl/quotaprop.c:1.1
--- /dev/null Mon Jan 30 19:31:32 2012
+++ src/usr.sbin/quotactl/quotaprop.c Mon Jan 30 19:31:31 2012
@@ -0,0 +1,214 @@
+/* $NetBSD: quotaprop.c,v 1.1 2012/01/30 19:31:31 dholland Exp $ */
+/*-
+ * Copyright (c) 2011 Manuel Bouyer
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
CVS commit: src/usr.sbin/quotactl
Module Name:src
Committed By: bouyer
Date: Fri Mar 25 10:30:36 UTC 2011
Modified Files:
src/usr.sbin/quotactl: Makefile
Log Message:
quota2_prop.c moved to libquota
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/quotactl/Makefile
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/quotactl/Makefile
diff -u src/usr.sbin/quotactl/Makefile:1.2 src/usr.sbin/quotactl/Makefile:1.3
--- src/usr.sbin/quotactl/Makefile:1.2 Sun Mar 6 17:08:43 2011
+++ src/usr.sbin/quotactl/Makefile Fri Mar 25 10:30:35 2011
@@ -1,16 +1,12 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.2 2011/03/06 17:08:43 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/25 10:30:35 bouyer Exp $
.include bsd.own.mk
PROG= quotactl
SRCS= quotactl.c
MAN= quotactl.8
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys
-DPADD= ${LIBPROP}
-LDADD= -lprop
-
-.PATH: ${NETBSDSRCDIR}/sys/ufs/ufs
-SRCS+= quota2_prop.c
+DPADD= ${LIBQUOTA} ${LIBRPCSVC} ${LIBPROP}
+LDADD= -lquota -lrpcsvc -lprop
.include bsd.prog.mk
CVS commit: src/usr.sbin/quotactl
Module Name:src Committed By: njoly Date: Mon Mar 7 17:44:37 UTC 2011 Modified Files: src/usr.sbin/quotactl: quotactl.8 Log Message: - Protect flags to avoid macro expansion by mandoc. - Explicitely close display block. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/quotactl/quotactl.8 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/quotactl/quotactl.8 diff -u src/usr.sbin/quotactl/quotactl.8:1.3 src/usr.sbin/quotactl/quotactl.8:1.4 --- src/usr.sbin/quotactl/quotactl.8:1.3 Sun Mar 6 17:34:57 2011 +++ src/usr.sbin/quotactl/quotactl.8 Mon Mar 7 17:44:37 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: quotactl.8,v 1.3 2011/03/06 17:34:57 wiz Exp $ +.\ $NetBSD: quotactl.8,v 1.4 2011/03/07 17:44:37 njoly Exp $ .\ .\ Copyright (c) 2011 Manuel Bouyer .\ All rights reserved. @@ -32,7 +32,7 @@ .Nd send commands to the kernel disk quota subsystem .Sh SYNOPSIS .Nm -.Op Fl Dx +.Op Fl \Dx .Ar file-system .Op Ar plist .Sh DESCRIPTION @@ -123,7 +123,7 @@ /dict /plist EOF - +.Ed .Sh SEE ALSO .Xr quota 1 , .Xr quotactl 2 ,
CVS commit: src/usr.sbin/quotactl
Module Name:src Committed By: wiz Date: Sun Mar 6 17:34:57 UTC 2011 Modified Files: src/usr.sbin/quotactl: quotactl.8 Log Message: Remove trailing whitespace; remove dot at end of SEE ALSO; new sentence, new line; split file system; more markup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/quotactl/quotactl.8 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/quotactl/quotactl.8 diff -u src/usr.sbin/quotactl/quotactl.8:1.2 src/usr.sbin/quotactl/quotactl.8:1.3 --- src/usr.sbin/quotactl/quotactl.8:1.2 Sun Mar 6 17:08:43 2011 +++ src/usr.sbin/quotactl/quotactl.8 Sun Mar 6 17:34:57 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: quotactl.8,v 1.2 2011/03/06 17:08:43 bouyer Exp $ +.\ $NetBSD: quotactl.8,v 1.3 2011/03/06 17:34:57 wiz Exp $ .\ .\ Copyright (c) 2011 Manuel Bouyer .\ All rights reserved. @@ -32,43 +32,44 @@ .Nd send commands to the kernel disk quota subsystem .Sh SYNOPSIS .Nm -.Op Fl D -.Op Fl x -.Ar filesystem +.Op Fl Dx +.Ar file-system .Op Ar plist .Sh DESCRIPTION .Nm reads a property list of commands from the specified file or stdin, -and sends it to the kernel for the specified filesystem through the +and sends it to the kernel for the specified file system through the .Xr quotactl 2 system call. .Pp Available options: .Bl -tag -width Ds -.It Fl x -Do not parse reply from kernel for errors and print it to stdout .It Fl D -Debug: print plist sent to and received from kernel to stderr +Debug: print plist sent to and received from kernel to stderr. +.It Fl x +Do not parse reply from kernel for errors and print it to stdout. .El .Pp If .Fl x -is not specified, +is not specified, .Nm parses the reply from the kernel, looking at each command return value and reporting errors. .Sh EXIT STATUS .Nm -exists with 0 on success. If there was problems parsing the command plist, +exists with 0 on success. +If there was problems parsing the command plist, or the reply from the kernel, or if the .Xr quotactl 2 -system call returned an error, the exist status will be 1. +system call returned an error, the exit status will be 1. Unless .Fl x is present, a message is printed to stderr for each failed command, and the exit status will be 2 if any comand failed. .Sh EXAMPLES -This will set the quota limits for user id 100 on the filesystem /home: +This will set the quota limits for user id 100 on the file system +.Pa /home : .Bd -literal quotactl /home EOF ?xml version=1.0 encoding=UTF-8? @@ -128,7 +129,7 @@ .Xr quotactl 2 , .Xr proplib 3 , .Xr edquota 8 , -.Xr repquota 8 . +.Xr repquota 8 .Sh HISTORY The .Nm
