d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that unknown uids/gids that now have non-zero usage and

Browse Source 
had a previously recorded usage of zero are correctly displayed in
verbose mode.  Generalize the print routine a little too.
This commit is contained in:
Mike Pritchard 2007-01-23 02:10:19 +00:00
parent d01fac16ac
commit b32c2af199
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sbin/quotacheck/quotacheck.c
View File

@ -132,7 +132,7 @@ struct fileusage *
lookup(u_long, int); lookup(u_long, int);
void *needchk(struct fstab *); void *needchk(struct fstab *);
int oneof(char *, char*[], int); 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); void setinodebuf(ino_t);
int update(char *, char *, int); int update(char *, char *, int);
void usage(void); void usage(void);
@ -483,7 +483,7 @@ update(fsname, quotafile, type)
fup->fu_curblocks = 0; fup->fu_curblocks = 0;
continue; continue;
} }
printchanges(fsname, type, &dqbuf, fup); printchanges(fsname, type, &dqbuf, fup, id);
/* /*
* Reset time limit if have a soft limit and were * Reset time limit if have a soft limit and were
* previously under it, but are now over it. * previously under it, but are now over it.
@ -524,7 +524,7 @@ update(fsname, quotafile, type)
bzero(&dqbuf, sizeof(struct dqblk)); bzero(&dqbuf, sizeof(struct dqblk));
if (fup->fu_id > highid) if (fup->fu_id > highid)
highid = fup->fu_id; highid = fup->fu_id;
printchanges(fsname, type, &dqbuf, fup); printchanges(fsname, type, &dqbuf, fup, id);
dqbuf.dqb_curinodes = fup->fu_curinodes; dqbuf.dqb_curinodes = fup->fu_curinodes;
dqbuf.dqb_curblocks = fup->fu_curblocks; dqbuf.dqb_curblocks = fup->fu_curblocks;
offset = (off_t)fup->fu_id * sizeof(struct dqblk); offset = (off_t)fup->fu_id * sizeof(struct dqblk);
@ -654,7 +654,7 @@ addid(id, type, name, fsname)
if (name) if (name)
len = strlen(name); len = strlen(name);
else else
len = 10; len = 0;
if ((fup = calloc(1, sizeof(*fup) + len)) == NULL) if ((fup = calloc(1, sizeof(*fup) + len)) == NULL)
errx(1, "calloc failed"); errx(1, "calloc failed");
fhp = &fuhead[type][id & (FUHASH - 1)]; fhp = &fuhead[type][id & (FUHASH - 1)];
@ -782,18 +782,35 @@ bread(bno, buf, cnt)
* Display updated block and i-node counts. * Display updated block and i-node counts.
*/ */
void void
printchanges(fsname, type, dp, fup) printchanges(fsname, type, dp, fup, id)
char *fsname; char *fsname;
int type; int type;
struct dqblk *dp; struct dqblk *dp;
struct fileusage *fup; struct fileusage *fup;
u_long id;
{ {
if (!vflag) if (!vflag)
return; return;
if (aflag) if (aflag)
(void)printf("%s: ", fsname); (void)printf("%s: ", fsname);
(void)printf("%-8s fixed (%s):", fup->fu_name, if (fup->fu_name[0] == '\0')
type == GRPQUOTA ? "group" : "user"); (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) if (dp->dqb_curinodes != fup->fu_curinodes)
(void)printf("\tinodes %lu -> %lu", (u_long)dp->dqb_curinodes, (void)printf("\tinodes %lu -> %lu", (u_long)dp->dqb_curinodes,
(u_long)fup->fu_curinodes); (u_long)fup->fu_curinodes);