Module Name: src
Committed By: riz
Date: Sat May 19 15:31:22 UTC 2012
Modified Files:
src/usr.bin/quota [netbsd-6]: quota.1 quota.c
src/usr.sbin/repquota [netbsd-6]: repquota.8 repquota.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #268):
usr.bin/quota/quota.1: revision 1.18
usr.bin/quota/quota.1: revision 1.19
usr.sbin/repquota/repquota.8: revision 1.16
usr.sbin/repquota/repquota.8: revision 1.17
usr.bin/quota/quota.c: revision 1.49
usr.sbin/repquota/repquota.c: revision 1.44
Remove traces of -D flag, which no longer does anything.
Remove traces of -D option, which no longer does anything.
Bump date for previous.
Bump date for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/usr.bin/quota/quota.1
cvs rdiff -u -r1.48 -r1.48.2.1 src/usr.bin/quota/quota.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/usr.sbin/repquota/repquota.8
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/repquota/repquota.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.bin/quota/quota.1
diff -u src/usr.bin/quota/quota.1:1.17 src/usr.bin/quota/quota.1:1.17.2.1
--- src/usr.bin/quota/quota.1:1.17 Mon Feb 13 19:53:25 2012
+++ src/usr.bin/quota/quota.1 Sat May 19 15:31:21 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: quota.1,v 1.17 2012/02/13 19:53:25 dholland Exp $
+.\" $NetBSD: quota.1,v 1.17.2.1 2012/05/19 15:31:21 riz Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" from: @(#)quota.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd March 6, 2011
+.Dd May 12, 2012
.Dt QUOTA 1
.Os
.Sh NAME
@@ -40,19 +40,19 @@
.Nd display disk usage and limits
.Sh SYNOPSIS
.Nm
-.Op Fl Dghu
+.Op Fl ghu
.Op Fl v | Fl q
.Nm
-.Op Fl Dhu
+.Op Fl hu
.Op Fl v | Fl q
.Ar user
.Nm
-.Op Fl Dgh
+.Op Fl gh
.Op Fl v | Fl q
.Ar group
.Nm
.Fl d
-.Op Fl Dgh
+.Op Fl gh
.Op Fl v | Fl q
.Sh DESCRIPTION
.Nm
@@ -62,8 +62,6 @@ By default only the user quotas are prin
Options:
.Pp
.Bl -tag -width Ds
-.It Fl D
-Debug: print plist sent to and received from kernel.
.It Fl d
Query the kernel for default user or group quota instead of a specific
user or group.
Index: src/usr.bin/quota/quota.c
diff -u src/usr.bin/quota/quota.c:1.48 src/usr.bin/quota/quota.c:1.48.2.1
--- src/usr.bin/quota/quota.c:1.48 Sun Feb 5 14:14:44 2012
+++ src/usr.bin/quota/quota.c Sat May 19 15:31:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $ */
+/* $NetBSD: quota.c,v 1.48.2.1 2012/05/19 15:31:21 riz Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $");
+__RCSID("$NetBSD: quota.c,v 1.48.2.1 2012/05/19 15:31:21 riz Exp $");
#endif
#endif /* not lint */
@@ -104,7 +104,6 @@ static int qflag = 0;
static int vflag = 0;
static int hflag = 0;
static int dflag = 0;
-static int Dflag = 0;
static uid_t myuid;
static int needheading;
@@ -117,7 +116,7 @@ main(int argc, char *argv[])
int ch;
myuid = getuid();
- while ((ch = getopt(argc, argv, "Ddhugvq")) != -1) {
+ while ((ch = getopt(argc, argv, "dhugvq")) != -1) {
switch(ch) {
case 'g':
gflag++;
@@ -137,9 +136,6 @@ main(int argc, char *argv[])
case 'd':
dflag++;
break;
- case 'D':
- Dflag++;
- break;
default:
usage();
}
@@ -525,7 +521,7 @@ getprivs(id_t id, int idtype)
err(1, "Out of memory");
}
if (getvfsquota(fst[i].f_mntonname, qup->qvs, &version,
- id, idtype, dflag, Dflag) != 1)
+ id, idtype, dflag, 0) != 1)
continue;
} else
continue;
Index: src/usr.sbin/repquota/repquota.8
diff -u src/usr.sbin/repquota/repquota.8:1.15 src/usr.sbin/repquota/repquota.8:1.15.2.1
--- src/usr.sbin/repquota/repquota.8:1.15 Mon Feb 13 13:37:45 2012
+++ src/usr.sbin/repquota/repquota.8 Sat May 19 15:31:21 2012
@@ -29,9 +29,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)repquota.8 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: repquota.8,v 1.15 2012/02/13 13:37:45 wiz Exp $
+.\" $NetBSD: repquota.8,v 1.15.2.1 2012/05/19 15:31:21 riz Exp $
.\"
-.Dd February 13, 2012
+.Dd May 12, 2012
.Dt REPQUOTA 8
.Os
.Sh NAME
@@ -39,17 +39,17 @@
.Nd summarize quotas for a file system
.Sh SYNOPSIS
.Nm
-.Op Fl Dghuv
+.Op Fl ghuv
.Ar file-system Ar ...
.Nm
-.Op Fl Dghuv
+.Op Fl ghuv
.Fl a
.Nm
.Fl x
-.Op Fl Dgu
+.Op Fl gu
.Ar file-system
.Nm quotadump
-.Op Fl Dgu
+.Op Fl gu
.Ar file-system
.Sh DESCRIPTION
.Nm
@@ -60,8 +60,6 @@ Available options:
.Bl -tag -width Ds
.It Fl a
Print the quotas of all the mounted file systems.
-.It Fl D
-Debug: print plist sent to and received from kernel.
.It Fl g
Print only group quotas (the default is to print both
group and user quotas if they exist).
Index: src/usr.sbin/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.43 src/usr.sbin/repquota/repquota.c:1.43.2.1
--- src/usr.sbin/repquota/repquota.c:1.43 Mon Feb 13 01:35:09 2012
+++ src/usr.sbin/repquota/repquota.c Sat May 19 15:31:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: repquota.c,v 1.43 2012/02/13 01:35:09 dholland Exp $ */
+/* $NetBSD: repquota.c,v 1.43.2.1 2012/05/19 15:31:22 riz Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94";
#else
-__RCSID("$NetBSD: repquota.c,v 1.43 2012/02/13 01:35:09 dholland Exp $");
+__RCSID("$NetBSD: repquota.c,v 1.43.2.1 2012/05/19 15:31:22 riz Exp $");
#endif
#endif /* not lint */
@@ -95,7 +95,6 @@ static struct quotaval defaultqv[REPQUOT
static int vflag = 0; /* verbose */
static int aflag = 0; /* all file systems */
-static int Dflag = 0; /* debug */
static int hflag = 0; /* humanize */
static int xflag = 0; /* export */
@@ -133,7 +132,7 @@ main(int argc, char **argv)
xflag = 1;
}
- while ((ch = getopt(argc, argv, "Daguhvx")) != -1) {
+ while ((ch = getopt(argc, argv, "aguhvx")) != -1) {
switch(ch) {
case 'a':
aflag++;
@@ -150,9 +149,6 @@ main(int argc, char **argv)
case 'v':
vflag++;
break;
- case 'D':
- Dflag++;
- break;
case 'x':
xflag++;
break;
