Module Name: src
Committed By: bouyer
Date: Mon Jan 31 15:26:32 UTC 2011
Modified Files:
src/usr.bin/quota [bouyer-quota2]: quota.c
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
src/usr.sbin/repquota [bouyer-quota2]: repquota.c
Log Message:
Catch up with Q2V -> QL rename
To generate a diff of this commit:
cvs rdiff -u -r1.33.2.5 -r1.33.2.6 src/usr.bin/quota/quota.c
cvs rdiff -u -r1.29.16.5 -r1.29.16.6 src/usr.sbin/edquota/edquota.c
cvs rdiff -u -r1.25.2.4 -r1.25.2.5 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.c
diff -u src/usr.bin/quota/quota.c:1.33.2.5 src/usr.bin/quota/quota.c:1.33.2.6
--- src/usr.bin/quota/quota.c:1.33.2.5 Sun Jan 30 20:54:22 2011
+++ src/usr.bin/quota/quota.c Mon Jan 31 15:26:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.33.2.5 2011/01/30 20:54:22 bouyer Exp $ */
+/* $NetBSD: quota.c,v 1.33.2.6 2011/01/31 15:26:31 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: quota.c,v 1.33.2.5 2011/01/30 20:54:22 bouyer Exp $");
+__RCSID("$NetBSD: quota.c,v 1.33.2.6 2011/01/31 15:26:31 bouyer Exp $");
#endif
#endif /* not lint */
@@ -346,33 +346,33 @@
quplist = getprivs(id, type);
for (qup = quplist; qup; qup = qup->next) {
if (!vflag &&
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit == UQUAD_MAX &&
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit == UQUAD_MAX &&
- qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit == UQUAD_MAX &&
- qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit == UQUAD_MAX)
+ qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit == UQUAD_MAX &&
+ qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit == UQUAD_MAX &&
+ qup->q2e.q2e_val[QL_FILE].q2v_softlimit == UQUAD_MAX &&
+ qup->q2e.q2e_val[QL_FILE].q2v_hardlimit == UQUAD_MAX)
continue;
msgi = NULL;
- if (qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit &&
- qup->q2e.q2e_val[Q2V_FILE].q2v_cur >=
- qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit)
+ if (qup->q2e.q2e_val[QL_FILE].q2v_hardlimit &&
+ qup->q2e.q2e_val[QL_FILE].q2v_cur >=
+ qup->q2e.q2e_val[QL_FILE].q2v_hardlimit)
msgi = "File limit reached on";
- else if (qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit &&
- qup->q2e.q2e_val[Q2V_FILE].q2v_cur >=
- qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit) {
- if (qup->q2e.q2e_val[Q2V_FILE].q2v_time > now)
+ else if (qup->q2e.q2e_val[QL_FILE].q2v_softlimit &&
+ qup->q2e.q2e_val[QL_FILE].q2v_cur >=
+ qup->q2e.q2e_val[QL_FILE].q2v_softlimit) {
+ if (qup->q2e.q2e_val[QL_FILE].q2v_time > now)
msgi = "In file grace period on";
else
msgi = "Over file quota on";
}
msgb = NULL;
- if (qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit &&
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur >=
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit)
+ if (qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit &&
+ qup->q2e.q2e_val[QL_BLOCK].q2v_cur >=
+ qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit)
msgb = "Block limit reached on";
- else if (qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit &&
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur >=
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit) {
- if (qup->q2e.q2e_val[Q2V_BLOCK].q2v_time > now)
+ else if (qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit &&
+ qup->q2e.q2e_val[QL_BLOCK].q2v_cur >=
+ qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit) {
+ if (qup->q2e.q2e_val[QL_BLOCK].q2v_time > now)
msgb = "In block grace period on";
else
msgb = "Over block quota on";
@@ -388,8 +388,8 @@
continue;
}
if (vflag || dflag ||
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur ||
- qup->q2e.q2e_val[Q2V_FILE].q2v_cur) {
+ qup->q2e.q2e_val[QL_BLOCK].q2v_cur ||
+ qup->q2e.q2e_val[QL_FILE].q2v_cur) {
if (lines++ == 0)
heading(type, id, name, "");
nam = qup->fsname;
@@ -399,40 +399,40 @@
}
if (msgb)
timemsg = timeprt(now,
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_time, 8);
+ qup->q2e.q2e_val[QL_BLOCK].q2v_time, 8);
else if ((qup->flags & QUOTA2) != 0 && vflag)
timemsg = timeprt(0,
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_grace, 8);
+ qup->q2e.q2e_val[QL_BLOCK].q2v_grace, 8);
else
- timemsg = NULL;
+ timemsg = "";
printf("%12s%9s%c%8s%9s%8s"
, nam
- , intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur
+ , intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_cur
,HN_B, hflag, 8)
, (msgb == NULL) ? ' ' : '*'
- , intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit
+ , intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit
, HN_B, hflag, 8)
- , intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit
+ , intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit
, HN_B, hflag, 8)
, timemsg);
if (msgi)
timemsg = timeprt(now,
- qup->q2e.q2e_val[Q2V_FILE].q2v_time, 8);
+ qup->q2e.q2e_val[QL_FILE].q2v_time, 8);
else if ((qup->flags & QUOTA2) != 0 && vflag)
timemsg = timeprt(0,
- qup->q2e.q2e_val[Q2V_FILE].q2v_grace, 8);
+ qup->q2e.q2e_val[QL_FILE].q2v_grace, 8);
else
- timemsg = NULL;
+ timemsg = "";
printf("%8s%c%7s%8s%8s\n"
- , intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_cur
+ , intprt(qup->q2e.q2e_val[QL_FILE].q2v_cur
, 0, hflag, 7)
, (msgi == NULL) ? ' ' : '*'
- , intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit
+ , intprt(qup->q2e.q2e_val[QL_FILE].q2v_softlimit
, 0, hflag, 7)
- , intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit
+ , intprt(qup->q2e.q2e_val[QL_FILE].q2v_hardlimit
, 0, hflag, 7)
, timemsg);
continue;
@@ -593,26 +593,26 @@
case Q_OK:
gettimeofday(&tv, NULL);
/* blocks*/
- q2e->q2e_val[Q2V_BLOCK].q2v_hardlimit =
+ q2e->q2e_val[QL_BLOCK].q2v_hardlimit =
gq_rslt.getquota_rslt_u.gqr_rquota.rq_bhardlimit *
(gq_rslt.getquota_rslt_u.gqr_rquota.rq_bsize / DEV_BSIZE);
- q2e->q2e_val[Q2V_BLOCK].q2v_softlimit =
+ q2e->q2e_val[QL_BLOCK].q2v_softlimit =
gq_rslt.getquota_rslt_u.gqr_rquota.rq_bsoftlimit *
(gq_rslt.getquota_rslt_u.gqr_rquota.rq_bsize / DEV_BSIZE);
- q2e->q2e_val[Q2V_BLOCK].q2v_cur =
+ q2e->q2e_val[QL_BLOCK].q2v_cur =
gq_rslt.getquota_rslt_u.gqr_rquota.rq_curblocks *
(gq_rslt.getquota_rslt_u.gqr_rquota.rq_bsize / DEV_BSIZE);
/* inodes */
- q2e->q2e_val[Q2V_FILE].q2v_hardlimit =
+ q2e->q2e_val[QL_FILE].q2v_hardlimit =
gq_rslt.getquota_rslt_u.gqr_rquota.rq_fhardlimit;
- q2e->q2e_val[Q2V_FILE].q2v_softlimit =
+ q2e->q2e_val[QL_FILE].q2v_softlimit =
gq_rslt.getquota_rslt_u.gqr_rquota.rq_fsoftlimit;
- q2e->q2e_val[Q2V_FILE].q2v_cur =
+ q2e->q2e_val[QL_FILE].q2v_cur =
gq_rslt.getquota_rslt_u.gqr_rquota.rq_curfiles;
/* grace times */
- q2e->q2e_val[Q2V_BLOCK].q2v_time =
+ q2e->q2e_val[QL_BLOCK].q2v_time =
tv.tv_sec + gq_rslt.getquota_rslt_u.gqr_rquota.rq_btimeleft;
- q2e->q2e_val[Q2V_FILE].q2v_time =
+ q2e->q2e_val[QL_FILE].q2v_time =
tv.tv_sec + gq_rslt.getquota_rslt_u.gqr_rquota.rq_ftimeleft;
*cp = ':';
return (1);
Index: src/usr.sbin/edquota/edquota.c
diff -u src/usr.sbin/edquota/edquota.c:1.29.16.5 src/usr.sbin/edquota/edquota.c:1.29.16.6
--- src/usr.sbin/edquota/edquota.c:1.29.16.5 Sun Jan 30 22:49:32 2011
+++ src/usr.sbin/edquota/edquota.c Mon Jan 31 15:26:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: edquota.c,v 1.29.16.5 2011/01/30 22:49:32 bouyer Exp $ */
+/* $NetBSD: edquota.c,v 1.29.16.6 2011/01/31 15:26:31 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "from: @(#)edquota.c 8.3 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: edquota.c,v 1.29.16.5 2011/01/30 22:49:32 bouyer Exp $");
+__RCSID("$NetBSD: edquota.c,v 1.29.16.6 2011/01/31 15:26:31 bouyer Exp $");
#endif
#endif /* not lint */
@@ -188,8 +188,8 @@
exit(1);
protoprivs = getprivs(protoid, quotatype, fs, 0);
for (qup = protoprivs; qup; qup = qup->next) {
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_time = 0;
- qup->q2e.q2e_val[Q2V_FILE].q2v_time = 0;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_time = 0;
+ qup->q2e.q2e_val[QL_FILE].q2v_time = 0;
}
while (argc-- > 0) {
if ((id = getentry(*argv++, quotatype)) < 0)
@@ -237,16 +237,16 @@
curprivs = getprivs(0, quotatype, fs, 1);
for (lqup = curprivs; lqup; lqup = lqup->next) {
if (soft) {
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit = softb;
- lqup->q2e.q2e_val[Q2V_FILE].q2v_softlimit = softi;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_softlimit = softb;
+ lqup->q2e.q2e_val[QL_FILE].q2v_softlimit = softi;
}
if (hard) {
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit = hardb;
- lqup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit = hardi;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit = hardb;
+ lqup->q2e.q2e_val[QL_FILE].q2v_hardlimit = hardi;
}
if (grace) {
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_grace = graceb;
- lqup->q2e.q2e_val[Q2V_FILE].q2v_grace = gracei;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_grace = graceb;
+ lqup->q2e.q2e_val[QL_FILE].q2v_grace = gracei;
}
}
putprivs(0, quotatype, curprivs);
@@ -260,25 +260,25 @@
for (lqup = curprivs; lqup; lqup = lqup->next) {
if (soft) {
if (softb &&
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_cur >= softb &&
- (lqup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit == 0 ||
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_cur < lqup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit))
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_time = 0;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_cur >= softb &&
+ (lqup->q2e.q2e_val[QL_BLOCK].q2v_softlimit == 0 ||
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_cur < lqup->q2e.q2e_val[QL_BLOCK].q2v_softlimit))
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_time = 0;
if (softi &&
- lqup->q2e.q2e_val[Q2V_FILE].q2v_cur >= softb &&
- (lqup->q2e.q2e_val[Q2V_FILE].q2v_softlimit == 0 ||
- lqup->q2e.q2e_val[Q2V_FILE].q2v_cur < lqup->q2e.q2e_val[Q2V_FILE].q2v_softlimit))
- lqup->q2e.q2e_val[Q2V_FILE].q2v_time = 0;
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit = softb;
- lqup->q2e.q2e_val[Q2V_FILE].q2v_softlimit = softi;
+ lqup->q2e.q2e_val[QL_FILE].q2v_cur >= softb &&
+ (lqup->q2e.q2e_val[QL_FILE].q2v_softlimit == 0 ||
+ lqup->q2e.q2e_val[QL_FILE].q2v_cur < lqup->q2e.q2e_val[QL_FILE].q2v_softlimit))
+ lqup->q2e.q2e_val[QL_FILE].q2v_time = 0;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_softlimit = softb;
+ lqup->q2e.q2e_val[QL_FILE].q2v_softlimit = softi;
}
if (hard) {
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit = hardb;
- lqup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit = hardi;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit = hardb;
+ lqup->q2e.q2e_val[QL_FILE].q2v_hardlimit = hardi;
}
if (grace) {
- lqup->q2e.q2e_val[Q2V_BLOCK].q2v_grace = graceb;
- lqup->q2e.q2e_val[Q2V_FILE].q2v_grace = gracei;
+ lqup->q2e.q2e_val[QL_BLOCK].q2v_grace = graceb;
+ lqup->q2e.q2e_val[QL_FILE].q2v_grace = gracei;
}
}
putprivs(id, quotatype, curprivs);
@@ -696,29 +696,29 @@
for (qup = quplist; qup; qup = qup->next) {
fprintf(fd, "%s: %s %s, limits (soft = %s, hard = %s",
qup->fsname, "blocks in use:",
- intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur,
+ intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_cur,
HN_NOSPACE | HN_B, Hflag, 20),
- intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit,
+ intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit,
HN_NOSPACE | HN_B, Hflag, 20),
- intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit,
+ intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit,
HN_NOSPACE | HN_B, Hflag, 20));
if (qup->flags & (QUOTA2|DEFAULT)) {
fprintf(fd, ", grace = %s",
- timepprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_grace,
+ timepprt(qup->q2e.q2e_val[QL_BLOCK].q2v_grace,
Hflag, 20));
}
fprintf(fd, ")\n");
fprintf(fd, "%s %s, limits (soft = %s, hard = %s",
"\tinodes in use:",
- intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_cur,
+ intprt(qup->q2e.q2e_val[QL_FILE].q2v_cur,
HN_NOSPACE, Hflag, 20),
- intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit,
+ intprt(qup->q2e.q2e_val[QL_FILE].q2v_softlimit,
HN_NOSPACE, Hflag, 20),
- intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit,
+ intprt(qup->q2e.q2e_val[QL_FILE].q2v_hardlimit,
HN_NOSPACE, Hflag, 20));
if (qup->flags & (QUOTA2|DEFAULT)) {
fprintf(fd, ", grace = %s",
- timepprt(qup->q2e.q2e_val[Q2V_FILE].q2v_grace,
+ timepprt(qup->q2e.q2e_val[QL_FILE].q2v_grace,
Hflag, 20));
}
fprintf(fd, ")\n");
@@ -861,10 +861,10 @@
for (qup = quplist; qup; qup = qup->next) {
if (strcmp(fsp, qup->fsname))
continue;
- if (strcmp(intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur,
+ if (strcmp(intprt(qup->q2e.q2e_val[QL_BLOCK].q2v_cur,
HN_NOSPACE | HN_B, Hflag, 20),
scurb) != 0 ||
- strcmp(intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_cur,
+ strcmp(intprt(qup->q2e.q2e_val[QL_FILE].q2v_cur,
HN_NOSPACE, Hflag, 20),
scuri) != 0) {
warnx("%s: cannot change current allocation",
@@ -877,26 +877,26 @@
* or were under it, but now have a soft limit
* and are over it.
*/
- if (qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur &&
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur >= softb &&
- (qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit == 0 ||
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur <
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit))
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_time = 0;
- if (qup->q2e.q2e_val[Q2V_FILE].q2v_cur &&
- qup->q2e.q2e_val[Q2V_FILE].q2v_cur >= softi &&
- (qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit == 0 ||
- qup->q2e.q2e_val[Q2V_FILE].q2v_cur <
- qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit))
- qup->q2e.q2e_val[Q2V_FILE].q2v_time = 0;
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit = softb;
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit = hardb;
+ if (qup->q2e.q2e_val[QL_BLOCK].q2v_cur &&
+ qup->q2e.q2e_val[QL_BLOCK].q2v_cur >= softb &&
+ (qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit == 0 ||
+ qup->q2e.q2e_val[QL_BLOCK].q2v_cur <
+ qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit))
+ qup->q2e.q2e_val[QL_BLOCK].q2v_time = 0;
+ if (qup->q2e.q2e_val[QL_FILE].q2v_cur &&
+ qup->q2e.q2e_val[QL_FILE].q2v_cur >= softi &&
+ (qup->q2e.q2e_val[QL_FILE].q2v_softlimit == 0 ||
+ qup->q2e.q2e_val[QL_FILE].q2v_cur <
+ qup->q2e.q2e_val[QL_FILE].q2v_softlimit))
+ qup->q2e.q2e_val[QL_FILE].q2v_time = 0;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit = softb;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit = hardb;
if (graceb >= 0)
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_grace = graceb;
- qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit = softi;
- qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit = hardi;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_grace = graceb;
+ qup->q2e.q2e_val[QL_FILE].q2v_softlimit = softi;
+ qup->q2e.q2e_val[QL_FILE].q2v_hardlimit = hardi;
if (gracei >= 0)
- qup->q2e.q2e_val[Q2V_FILE].q2v_grace = gracei;
+ qup->q2e.q2e_val[QL_FILE].q2v_grace = gracei;
qup->flags |= FOUND;
}
}
@@ -910,10 +910,10 @@
qup->flags &= ~FOUND;
continue;
}
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit = UQUAD_MAX;
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit = UQUAD_MAX;
- qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit = UQUAD_MAX;
- qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit = UQUAD_MAX;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_softlimit = UQUAD_MAX;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_hardlimit = UQUAD_MAX;
+ qup->q2e.q2e_val[QL_FILE].q2v_softlimit = UQUAD_MAX;
+ qup->q2e.q2e_val[QL_FILE].q2v_hardlimit = UQUAD_MAX;
}
return (1);
}
@@ -939,9 +939,9 @@
qfextension[quotatype]);
for (qup = quplist; qup; qup = qup->next) {
fprintf(fd, "%s: block grace period: %s, ",
- qup->fsname, cvtstoa(qup->q2e.q2e_val[Q2V_BLOCK].q2v_time));
+ qup->fsname, cvtstoa(qup->q2e.q2e_val[QL_BLOCK].q2v_time));
fprintf(fd, "file grace period: %s\n",
- cvtstoa(qup->q2e.q2e_val[Q2V_FILE].q2v_time));
+ cvtstoa(qup->q2e.q2e_val[QL_FILE].q2v_time));
}
fclose(fd);
return (1);
@@ -1003,8 +1003,8 @@
for (qup = quplist; qup; qup = qup->next) {
if (strcmp(fsp, qup->fsname))
continue;
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_time = bseconds;
- qup->q2e.q2e_val[Q2V_FILE].q2v_time = iseconds;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_time = bseconds;
+ qup->q2e.q2e_val[QL_FILE].q2v_time = iseconds;
qup->flags |= FOUND;
break;
}
@@ -1019,8 +1019,8 @@
qup->flags &= ~FOUND;
continue;
}
- qup->q2e.q2e_val[Q2V_BLOCK].q2v_time = 0;
- qup->q2e.q2e_val[Q2V_FILE].q2v_time = 0;
+ qup->q2e.q2e_val[QL_BLOCK].q2v_time = 0;
+ qup->q2e.q2e_val[QL_FILE].q2v_time = 0;
}
return (1);
}
Index: src/usr.sbin/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.25.2.4 src/usr.sbin/repquota/repquota.c:1.25.2.5
--- src/usr.sbin/repquota/repquota.c:1.25.2.4 Sun Jan 30 20:54:23 2011
+++ src/usr.sbin/repquota/repquota.c Mon Jan 31 15:26:32 2011
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94";
#else
-__RCSID("$NetBSD: repquota.c,v 1.25.2.4 2011/01/30 20:54:23 bouyer Exp $");
+__RCSID("$NetBSD: repquota.c,v 1.25.2.5 2011/01/31 15:26:32 bouyer Exp $");
#endif
#endif /* not lint */
@@ -403,57 +403,57 @@
fup = lookup(id, type);
if (fup == 0)
continue;
- if (fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_cur == 0 &&
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur == 0)
+ if (fup->fu_q2e.q2e_val[QL_BLOCK].q2v_cur == 0 &&
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_cur == 0)
continue;
if (strlen(fup->fu_name) > 9)
printf("%s ", fup->fu_name);
else
printf("%-10s", fup->fu_name);
- if (fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit &&
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_cur >=
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit)
+ if (fup->fu_q2e.q2e_val[QL_BLOCK].q2v_softlimit &&
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_cur >=
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_softlimit)
timemsg = timeprt(now,
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_time, 7);
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_time, 7);
else if (vflag && version == 2)
timemsg = timeprt(0,
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_grace, 7);
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_grace, 7);
else
timemsg = "";
printf("%c%c%9s%9s%9s%7s",
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit &&
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_cur >=
- fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit ?
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_softlimit &&
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_cur >=
+ fup->fu_q2e.q2e_val[QL_BLOCK].q2v_softlimit ?
'+' : '-',
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit &&
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur >=
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit ?
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_softlimit &&
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_cur >=
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_softlimit ?
'+' : '-',
- intprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_cur,
+ intprt(fup->fu_q2e.q2e_val[QL_BLOCK].q2v_cur,
HN_B, hflag, 9),
- intprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit,
+ intprt(fup->fu_q2e.q2e_val[QL_BLOCK].q2v_softlimit,
HN_B, hflag, 9),
- intprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit,
+ intprt(fup->fu_q2e.q2e_val[QL_BLOCK].q2v_hardlimit,
HN_B, hflag, 9),
timemsg);
- if (fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit &&
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur >=
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit)
+ if (fup->fu_q2e.q2e_val[QL_FILE].q2v_softlimit &&
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_cur >=
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_softlimit)
timemsg = timeprt(now,
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_time, 7);
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_time, 7);
else if (vflag && version == 2)
timemsg = timeprt(0,
- fup->fu_q2e.q2e_val[Q2V_FILE].q2v_grace, 7);
+ fup->fu_q2e.q2e_val[QL_FILE].q2v_grace, 7);
else
timemsg = "";
printf(" %8s%8s%8s%7s\n",
- intprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur,
+ intprt(fup->fu_q2e.q2e_val[QL_FILE].q2v_cur,
0, hflag, 8),
- intprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit,
+ intprt(fup->fu_q2e.q2e_val[QL_FILE].q2v_softlimit,
0, hflag, 8),
- intprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_hardlimit,
+ intprt(fup->fu_q2e.q2e_val[QL_FILE].q2v_hardlimit,
0, hflag, 8),
timemsg);
memset(&fup->fu_q2e, 0, sizeof(fup->fu_q2e));
