Module Name: src
Committed By: dholland
Date: Sat May 12 19:53:22 UTC 2012
Modified Files:
src/usr.bin/quota: quota.1 quota.c
Log Message:
Remove traces of -D option, which no longer does anything.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/quota/quota.1
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/quota/quota.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.18
--- src/usr.bin/quota/quota.1:1.17 Mon Feb 13 19:53:25 2012
+++ src/usr.bin/quota/quota.1 Sat May 12 19:53: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.18 2012/05/12 19:53:21 dholland Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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.49
--- src/usr.bin/quota/quota.c:1.48 Sun Feb 5 14:14:44 2012
+++ src/usr.bin/quota/quota.c Sat May 12 19:53:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $ */
+/* $NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland 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.49 2012/05/12 19:53:22 dholland 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;
