aboutsummaryrefslogtreecommitdiff
path: root/sbin/quotacheck
diff options
context:
space:
mode:
authorMike Pritchard <mpp@FreeBSD.org>2007-01-23 02:10:19 +0000
committerMike Pritchard <mpp@FreeBSD.org>2007-01-23 02:10:19 +0000
commitb32c2af199202ef97a3addfd3c985d2ab4e2833f (patch)
tree23a5b93294a57caf9aa18d9a6bafd2af4db5f2d9 /sbin/quotacheck
parentd01fac16ac7b9850257df9dba8b6cac444687a83 (diff)
downloadsrc-b32c2af199202ef97a3addfd3c985d2ab4e2833f.tar.gz
src-b32c2af199202ef97a3addfd3c985d2ab4e2833f.zip
Make sure that unknown uids/gids that now have non-zero usage and
had a previously recorded usage of zero are correctly displayed in verbose mode. Generalize the print routine a little too.
Notes
Notes: svn path=/head/; revision=166179
Diffstat (limited to 'sbin/quotacheck')
-rw-r--r--sbin/quotacheck/quotacheck.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 031ca15fe93b..e4c7c61525a3 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -132,7 +132,7 @@ struct fileusage *
lookup(u_long, int);
void *needchk(struct fstab *);
int oneof(char *, char*[], int);
-void printchanges(char *, int, struct dqblk *, struct fileusage *);
+void printchanges(char *, int, struct dqblk *, struct fileusage *, u_long);
void setinodebuf(ino_t);
int update(char *, char *, int);
void usage(void);
@@ -483,7 +483,7 @@ update(fsname, quotafile, type)
fup->fu_curblocks = 0;
continue;
}
- printchanges(fsname, type, &dqbuf, fup);
+ printchanges(fsname, type, &dqbuf, fup, id);
/*
* Reset time limit if have a soft limit and were
* previously under it, but are now over it.
@@ -524,7 +524,7 @@ update(fsname, quotafile, type)
bzero(&dqbuf, sizeof(struct dqblk));
if (fup->fu_id > highid)
highid = fup->fu_id;
- printchanges(fsname, type, &dqbuf, fup);
+ printchanges(fsname, type, &dqbuf, fup, id);
dqbuf.dqb_curinodes = fup->fu_curinodes;
dqbuf.dqb_curblocks = fup->fu_curblocks;
offset = (off_t)fup->fu_id * sizeof(struct dqblk);
@@ -654,7 +654,7 @@ addid(id, type, name, fsname)
if (name)
len = strlen(name);
else
- len = 10;
+ len = 0;
if ((fup = calloc(1, sizeof(*fup) + len)) == NULL)
errx(1, "calloc failed");
fhp = &fuhead[type][id & (FUHASH - 1)];
@@ -782,18 +782,35 @@ bread(bno, buf, cnt)
* Display updated block and i-node counts.
*/
void
-printchanges(fsname, type, dp, fup)
+printchanges(fsname, type, dp, fup, id)
char *fsname;
int type;
struct dqblk *dp;
struct fileusage *fup;
+ u_long id;
{
if (!vflag)
return;
if (aflag)
(void)printf("%s: ", fsname);
- (void)printf("%-8s fixed (%s):", fup->fu_name,
- type == GRPQUOTA ? "group" : "user");
+ if (fup->fu_name[0] == '\0')
+ (void)printf("%-8lu fixed ", id);
+ else
+ (void)printf("%-8s fixed ", fup->fu_name);
+ switch (type) {
+
+ case GRPQUOTA:
+ (void)printf("(group):");
+ break;
+
+ case USRQUOTA:
+ (void)printf("(user): ");
+ break;
+
+ default:
+ (void)printf("(unknown quota type %d)", type);
+ break;
+ }
if (dp->dqb_curinodes != fup->fu_curinodes)
(void)printf("\tinodes %lu -> %lu", (u_long)dp->dqb_curinodes,
(u_long)fup->fu_curinodes);