 @@ -1,14 +1,14 @@
-/*      $NetBSD: edquota.c,v 1.43 2012/01/29 07:16:00 dholland Exp $ */
+/*      $NetBSD: edquota.c,v 1.44 2012/01/30 19:16:36 dholland Exp $ */
 /*
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Robert Elz at The University of Melbourne.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -31,93 +31,91 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "from: @(#)edquota.c	8.3 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: edquota.c,v 1.43 2012/01/29 07:16:00 dholland Exp $");
+__RCSID("$NetBSD: edquota.c,v 1.44 2012/01/30 19:16:36 dholland Exp $");
 #endif
 #endif /* not lint */
 /*
  * Disk quota editor.
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/wait.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include <quota.h>
 #include <quota/quotaprop.h>
 #include <quota/quota.h>
 #include <ufs/ufs/quota1.h>
 #include <sys/quota.h>
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
 #include <pwd.h>
 #include <grp.h>
 #include <ctype.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "printquota.h"
 #include "getvfsquota.h"
 #include "quotautil.h"
 #include "pathnames.h"
 static const char *quotagroup = QUOTAGROUP;
 #define MAX_TMPSTR	(100+MAXPATHLEN)
 /* flags for quotause */
 #define	FOUND	0x01
-#define	QUOTA2	0x02
+#define	XGRACE	0x02	/* extended grace periods (per-id) */
 #define	DEFAULT	0x04
 struct quotause {
 	struct	quotause *next;
 	long	flags;
 	struct	quotaval qv[QUOTA_NLIMITS];
 	char	fsname[MAXPATHLEN + 1];
 	char	implementation[32];
 	char	*qfname;
 };
 struct quotalist {
 	struct quotause *head;
 	struct quotause *tail;
 };
 static void	usage(void) __dead;
 static int Hflag = 0;
 static int Dflag = 0;
 /* more compact form of constants */
 #define QL_BLK QUOTA_LIMIT_BLOCK
 #define QL_FL  QUOTA_LIMIT_FILE
 ////////////////////////////////////////////////////////////
 // support code
 /*
  * This routine converts a name for a particular quota class to
  * an identifier. This routine must agree with the kernel routine
  * getinoquota as to the interpretation of quota classes.
  */
 @@ -328,47 +326,89 @@ getprivs1(long id, int idtype, const cha
+	}
 	close(fd);
 	qup->qfname = qfpathname;
 	endfsent();
 	dqblk_to_quotavals(&dqblk,
 			   &qup->qv[QUOTA_LIMIT_BLOCK],
 			   &qup->qv[QUOTA_LIMIT_FILE]);
 	return qup;
+}
 ////////////////////////////////////////////////////////////
 // ffs quota v2
 static int
 dogetprivs2(struct quotahandle *qh, int idtype, id_t id, int defaultq,
 	    int objtype, struct quotause *qup)
+{
 	struct quotakey qk;
 	qk.qk_idtype = idtype;
 	qk.qk_id = defaultq ? QUOTA_DEFAULTID : id;
 	qk.qk_objtype = objtype;
 	if (quota_get(qh, &qk, &qup->qv[objtype])) {
 		/* no entry, get default entry */
 		qk.qk_id = QUOTA_DEFAULTID;
 		if (quota_get(qh, &qk, &qup->qv[objtype])) {
 			return -1;
+		}
+	}
 	return 0;
+}
 static struct quotause *
 getprivs2(long id, int idtype, const char *filesys, int defaultq)
+{
 	struct quotause *qup;
-	int8_t version;
+	struct quotahandle *qh;
 	const char *impl;
 	unsigned restrictions;
 	qup = quotause_create();
 	strcpy(qup->fsname, filesys);
 	if (defaultq)
 		qup->flags |= DEFAULT;
 	if (!getvfsquota(filesys, qup->qv, &version,
-	    id, idtype, defaultq, Dflag)) {
+	qh = quota_open(filesys);
-		/* no entry, get default entry */
+	if (qh == NULL) {
-		if (!getvfsquota(filesys, qup->qv, &version,
+		quotause_destroy(qup);
-		    id, idtype, 1, Dflag)) {
+		return NULL;
 			free(qup);
 			return NULL;
+	}
 	if (version == 2)
-		qup->flags |= QUOTA2;
+	impl = quota_getimplname(qh);
 	if (impl == NULL) {
 		impl = "???";
+	}
 	strlcpy(qup->implementation, impl, sizeof(qup->implementation));
 	restrictions = quota_getrestrictions(qh);
 	if ((restrictions & QUOTA_RESTRICT_UNIFORMGRACE) == 0) {
 		qup->flags |= XGRACE;
+	}
 	if (dogetprivs2(qh, idtype, id, defaultq, QUOTA_OBJTYPE_BLOCKS, qup)) {
 		quota_close(qh);
 		quotause_destroy(qup);
 		return NULL;
+	}
 	if (dogetprivs2(qh, idtype, id, defaultq, QUOTA_OBJTYPE_FILES, qup)) {
 		quota_close(qh);
 		quotause_destroy(qup);
 		return NULL;
+	}
 	quota_close(qh);
 	return qup;
+}
 static void
 putprivs2(uint32_t id, int idtype, struct quotause *qup)
+{
 	struct quotahandle *qh;
 	struct quotakey qk;
 	char idname[32];
 	if (qup->flags & DEFAULT) {
 		snprintf(idname, sizeof(idname), "%s default",
 			 idtype == QUOTA_IDTYPE_USER ? "user" : "group");
 @@ -638,62 +678,62 @@ writeprivs(struct quotalist *qlist, int
 	(void)ftruncate(outfd, 0);
 	(void)lseek(outfd, (off_t)0, SEEK_SET);
 	if ((fd = fdopen(dup(outfd), "w")) == NULL)
 		errx(1, "fdopen");
 	if (name == NULL) {
 		fprintf(fd, "Default %s quotas:\n",
 		    ufs_quota_class_names[idtype]);
 	} else {
 		fprintf(fd, "Quotas for %s %s:\n",
 		    ufs_quota_class_names[idtype], name);
+	}
 	for (qup = qlist->head; qup; qup = qup->next) {
 		struct quotaval *q = qup->qv;
-		fprintf(fd, "%s (version %d):\n",
+		fprintf(fd, "%s (%s):\n",
-		     qup->fsname, (qup->flags & QUOTA2) ? 2 : 1);
+		     qup->fsname, qup->implementation);
-		if ((qup->flags & DEFAULT) == 0 || (qup->flags & QUOTA2) != 0) {
+		if ((qup->flags & DEFAULT) == 0 || (qup->flags & XGRACE) != 0) {
 			fprintf(fd, "\tblocks in use: %s, "
 			    "limits (soft = %s, hard = %s",
 			    intprt(b1, 21, q[QL_BLK].qv_usage,
 			    HN_NOSPACE | HN_B, Hflag),
 			    intprt(b2, 21, q[QL_BLK].qv_softlimit,
 			    HN_NOSPACE | HN_B, Hflag),
 			    intprt(b3, 21, q[QL_BLK].qv_hardlimit,
 				HN_NOSPACE | HN_B, Hflag));
-			if (qup->flags & QUOTA2)
+			if (qup->flags & XGRACE)
 				fprintf(fd, ", ");
 		} else
 			fprintf(fd, "\tblocks: (");
-		if (qup->flags & (QUOTA2|DEFAULT)) {
+		if (qup->flags & (XGRACE|DEFAULT)) {
 		    fprintf(fd, "grace = %s",
 			timepprt(b0, 21, q[QL_BLK].qv_grace, Hflag));
+		}
 		fprintf(fd, ")\n");
-		if ((qup->flags & DEFAULT) == 0 || (qup->flags & QUOTA2) != 0) {
+		if ((qup->flags & DEFAULT) == 0 || (qup->flags & XGRACE) != 0) {
 			fprintf(fd, "\tinodes in use: %s, "
 			    "limits (soft = %s, hard = %s",
 			    intprt(b1, 21, q[QL_FL].qv_usage,
 			    HN_NOSPACE, Hflag),
 			    intprt(b2, 21, q[QL_FL].qv_softlimit,
 			    HN_NOSPACE, Hflag),
 			    intprt(b3, 21, q[QL_FL].qv_hardlimit,
 			     HN_NOSPACE, Hflag));
-			if (qup->flags & QUOTA2)
+			if (qup->flags & XGRACE)
 				fprintf(fd, ", ");
 		} else
 			fprintf(fd, "\tinodes: (");
-		if (qup->flags & (QUOTA2|DEFAULT)) {
+		if (qup->flags & (XGRACE|DEFAULT)) {
 		    fprintf(fd, "grace = %s",
 			timepprt(b0, 21, q[QL_FL].qv_grace, Hflag));
+		}
 		fprintf(fd, ")\n");
+	}
 	fclose(fd);
 	return 1;
+}
 /*
  * Merge changes to an ASCII file into a quotause list.
  */
 static int
 @@ -1137,31 +1177,28 @@ main(int argc, char *argv[])
 	char *soft = NULL, *hard = NULL, *grace = NULL;
 	char *fs = NULL;
 	int ch;
 	int pflag = 0;
 	int cflag = 0;
 	int dflag = 0;
 	if (argc < 2)
 		usage();
 	if (getuid())
 		errx(1, "permission denied");
 	protoname = NULL;
 	idtype = QUOTA_IDTYPE_USER;
-	while ((ch = getopt(argc, argv, "DHcdugp:s:h:t:f:")) != -1) {
+	while ((ch = getopt(argc, argv, "Hcdugp:s:h:t:f:")) != -1) {
 		switch(ch) {
 		case 'D':
 			Dflag++;
 			break;
 		case 'H':
 			Hflag++;
 			break;
 		case 'c':
 			cflag++;
 			break;
 		case 'd':
 			dflag++;
 			break;
 		case 'p':
 			protoname = optarg;
 			pflag++;
 			break;

 @@ -1,20 +1,20 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$NetBSD: Makefile,v 1.8 2011/03/24 17:05:47 bouyer Exp $
+#	$NetBSD: Makefile,v 1.9 2012/01/30 19:16:36 dholland Exp $
 .include <bsd.own.mk>
 WARNS ?= 4
 PROG=	edquota
 SRCS=	edquota.c
 MAN=	edquota.8
 CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/usr.bin/quota
 DPADD=	${LIBQUOTA} ${LIBPROP} ${LIBRPCSVC}
 LDADD=	-lquota -lprop -lrpcsvc
 .PATH:	${NETBSDSRCDIR}/usr.bin/quota
-SRCS+=	getvfsquota.c printquota.c quotautil.c
+SRCS+=	printquota.c quotautil.c
 .PATH:	${NETBSDSRCDIR}/sys/ufs/ufs
 SRCS+=	quota1_subr.c
 .include <bsd.prog.mk>