 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_quota.c,v 1.68.4.4 2011/01/30 00:25:19 bouyer Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.68.4.5 2011/01/30 19:38:46 bouyer Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993, 1995
  *	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.
 @@ -25,51 +25,53 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.68.4.4 2011/01/30 00:25:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.68.4.5 2011/01/30 19:38:46 bouyer Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/kauth.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 #include <ufs/ufs/ufs_quota.h>
 #include <ufs/ufs/quota2_prop.h>
 kmutex_t dqlock;
 kcondvar_t dqcv;
 static int quota_handle_cmd_get_version(struct mount *, struct lwp *,
     prop_dictionary_t, prop_array_t);
 static int quota_handle_cmd_get(struct mount *, struct lwp *,
     prop_dictionary_t, int, prop_array_t);
 static int quota_handle_cmd_set(struct mount *, struct lwp *,
     prop_dictionary_t, int, prop_array_t);
 static int quota_handle_cmd_getall(struct mount *, struct lwp *,
     prop_dictionary_t, int, prop_array_t);
 /*
  * Initialize the quota fields of an inode.
  */
 void
 ufsquota_init(struct inode *ip)
+{
 	int i;
 @@ -141,46 +143,96 @@ quota_handle_cmd(struct mount *mp, struc
 	if (!strcmp(type, "user")) {
 		q2type = USRQUOTA;
 	} else if (!strcmp(type, "group")) {
 		q2type = GRPQUOTA;
 	} else
 		return EOPNOTSUPP;
 	datas = prop_dictionary_get(cmddict, "data");
 	if (datas == NULL || prop_object_type(datas) != PROP_TYPE_ARRAY)
 		return EINVAL;
 	prop_object_retain(datas);
 	prop_dictionary_remove(cmddict, "data"); /* prepare for return */
 	if (strcmp(cmd, "get version") == 0) {
 		error = quota_handle_cmd_get_version(mp, l, cmddict, datas);
 		goto end;
+	}
 	if (strcmp(cmd, "get") == 0) {
 		error = quota_handle_cmd_get(mp, l, cmddict, q2type, datas);
 		goto end;
+	}
 	if (strcmp(cmd, "set") == 0) {
 		error = quota_handle_cmd_set(mp, l, cmddict, q2type, datas);
 		goto end;
+	}
 	if (strcmp(cmd, "getall") == 0) {
 		error = quota_handle_cmd_getall(mp, l, cmddict, q2type, datas);
 		goto end;
+	}
 	error = EOPNOTSUPP;
 end:
 	error = (prop_dictionary_set_int8(cmddict, "return",
 	    error) ? 0 : ENOMEM);
 	prop_object_release(datas);
 	return error;
+}
 static int
 quota_handle_cmd_get_version(struct mount *mp, struct lwp *l,
     prop_dictionary_t cmddict, prop_array_t datas)
+{
 	struct ufsmount *ump = VFSTOUFS(mp);
 	prop_array_t replies;
 	prop_dictionary_t data;
 	int error = 0;
 	if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
 		return EOPNOTSUPP;
 	replies = prop_array_create();
 	if (replies == NULL)
 		return ENOMEM;
 	data = prop_dictionary_create();
 	if (data == NULL) {
 		prop_object_release(replies);
 		return ENOMEM;
+	}
 #ifdef QUOTA
 	if (ump->um_flags & UFS_QUOTA) {
 		if (!prop_dictionary_set_int8(data, "version", 1))
 			error = ENOMEM;
 	} else
 #endif
 #ifdef QUOTA2
 	if (ump->um_flags & UFS_QUOTA2) {
 		if (!prop_dictionary_set_int8(data, "version", 2))
 			error = ENOMEM;
 	} else
 #endif
 		error = 0;
 	if (error)
 		prop_object_release(data);
 	else if (!prop_array_add_and_rel(replies, data))
 		error = ENOMEM;
 	if (error)
 		prop_object_release(replies);
 	else if (!prop_dictionary_set_and_rel(cmddict, "data", replies))
 		error = ENOMEM;
 	return error;
+}
 /* XXX shouldn't all this be in kauth ? */
 static int
 quota_get_auth(struct mount *mp, struct lwp *l, uid_t id) {
 	/* The user can always query about his own quota. */
 	if (id == kauth_cred_getuid(l->l_cred))
 		return 0;
 	return kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 	    KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, KAUTH_ARG(id), NULL);
+}
 static int
 quota_handle_cmd_get(struct mount *mp, struct lwp *l,
     prop_dictionary_t cmddict, int type, prop_array_t datas)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getvfsquota.c,v 1.1.2.1 2011/01/28 22:15:36 bouyer Exp $ */
+/*	$NetBSD: getvfsquota.c,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $ */
 /*-
   * Copyright (c) 2011 Manuel Bouyer
   * All rights reserved.
   * This software is distributed under the following condiions
   * compliant with the NetBSD foundation policy.
+  *
   * 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
 @@ -19,129 +19,152 @@
   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
   * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
   * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   * POSSIBILITY OF SUCH DAMAGE.
   */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: getvfsquota.c,v 1.1.2.1 2011/01/28 22:15:36 bouyer Exp $");
+__RCSID("$NetBSD: getvfsquota.c,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <err.h>
 #include <string.h>
 #include <sys/types.h>
 #include <ufs/ufs/quota2_prop.h>
 #include <sys/quota.h>
 #include <getvfsquota.h>
 const char *qfextension[] = INITQFNAMES;
 /* retrieve quotas from vfs, for the given user id */
 int
-getvfsquota(const char *mp, struct quota2_entry *q2e, long id, int type,
+getvfsquota(const char *mp, struct quota2_entry *q2e, int8_t *versp,
-    int defaultq, int debug)
+    long id, int type, int defaultq, int debug)
+{
 	prop_dictionary_t dict, data, cmd;
 	prop_array_t cmds, datas;
 	prop_object_iterator_t iter;
 	struct plistref pref;
 	int error;
 	int8_t error8;
 	bool ret;
 	int retval = 0;
 	dict = quota2_prop_create();
 	cmds = prop_array_create();
 	datas = prop_array_create();
 	data = prop_dictionary_create();
 	if (dict == NULL || cmds == NULL || datas == NULL || data == NULL)
 		errx(1, "can't allocate proplist");
 	if (defaultq)
 		ret = prop_dictionary_set_cstring(data, "id", "default");
 	else
 		ret = prop_dictionary_set_uint32(data, "id", id);
 	if (!ret)
 		err(1, "prop_dictionary_set(id)");
 	if (!prop_array_add(datas, data))
 		err(1, "prop_array_add(data)");
 	prop_object_release(data);
 	if (!quota2_prop_add_command(cmds, "get", qfextension[type], datas))
 		err(1, "prop_add_command");
 	if (!quota2_prop_add_command(cmds, "get version", qfextension[type],
 	    prop_array_create()))
 		err(1, "prop_add_command");
 	if (!prop_dictionary_set(dict, "commands", cmds))
 		err(1, "prop_dictionary_set(command)");
 	if (debug)
 		printf("message to kernel:\n%s\n",
 		    prop_dictionary_externalize(dict));
 	if (!prop_dictionary_send_syscall(dict, &pref))
 		err(1, "prop_dictionary_send_syscall");
 	prop_object_release(dict);
 	if (quotactl(mp, &pref) != 0)
 		err(1, "quotactl");
 	if ((error = prop_dictionary_recv_syscall(&pref, &dict)) != 0) {
 		errx(1, "prop_dictionary_recv_syscall: %s\n",
 		    strerror(error));
+	}
 	if (debug)
 		printf("reply from kernel:\n%s\n",
 		    prop_dictionary_externalize(dict));
 	if ((error = quota2_get_cmds(dict, &cmds)) != 0) {
 		errx(1, "quota2_get_cmds: %s\n",
 		    strerror(error));
+	}
-	/* only one command, no need to iter */
+	iter = prop_array_iterator(cmds);
-	cmd = prop_array_get(cmds, 0);
+	if (iter == NULL)
-	if (cmd == NULL)
+		err(1, "prop_array_iterator(cmds)");
 		err(1, "prop_array_get(cmd)");
 	while ((cmd = prop_object_iterator_next(iter)) != NULL) {
-	if (!prop_dictionary_get_int8(cmd, "return", &error8))
+		const char *cmdstr;
-		err(1, "prop_get(return)");
+		if (!prop_dictionary_get_cstring_nocopy(cmd, "command",
 		    &cmdstr))
-	if (error8) {
+			err(1, "prop_get(command)");
-		if (error8 != ENOENT && error8 != ENODEV) {
+		if (!prop_dictionary_get_int8(cmd, "return", &error8))
-			if (defaultq)
+			err(1, "prop_get(return)");
 				fprintf(stderr, "get default %s quota: %s\n",
-				    qfextension[type], strerror(error8));
+		if (error8) {
-			else
+			if (error8 != ENOENT && error8 != ENODEV) {
-				fprintf(stderr, "get %s quota for %ld: %s\n",
+				if (defaultq) {
-				    qfextension[type], id, strerror(error8));
+					fprintf(stderr,
 					    "get default %s quota: %s\n",
 					    qfextension[type],
 					    strerror(error8));
 				} else {
 					fprintf(stderr,
 					    "get %s quota for %ld: %s\n",
 					    qfextension[type], id,
 					    strerror(error8));
+				}
+			}
 			prop_object_release(dict);
 			return (0);
+		}
 		datas = prop_dictionary_get(cmd, "data");
 		if (datas == NULL)
 			err(1, "prop_dict_get(datas)");
 		if (strcmp("get version", cmdstr) == 0) {
 			data = prop_array_get(datas, 0);
 			if (data == NULL)
 				err(1, "prop_array_get(version)");
 			if (!prop_dictionary_get_int8(data, "version", versp))
 				err(1, "prop_get_int8(version)");
 			continue;
+		}
 		if (strcmp("get", cmdstr) != 0)
 			err(1, "unknown command %s in reply", cmdstr);
 		/* only one data, no need to iter */
 		if (prop_array_count(datas) > 0) {
 			data = prop_array_get(datas, 0);
 			if (data == NULL)
 				err(1, "prop_array_get(data)");
 			error = quota2_dict_get_q2e_usage(data, q2e);
 			if (error) {
 				errx(1, "quota2_dict_get_q2e_usage: %s\n",
 				    strerror(error));
+			}
 			retval = 1;
+		}
 		prop_object_release(dict);
 		return (0);
 	datas = prop_dictionary_get(cmd, "data");
 	if (datas == NULL)
 		err(1, "prop_dict_get(datas)");
 	/* only one data, no need to iter */
 	if (prop_array_count(datas) == 0) {
 		/* no quota for this user/group */
 		prop_object_release(dict);
 		return (0);
 	data = prop_array_get(datas, 0);
 	if (data == NULL)
 		err(1, "prop_array_get(data)");
 	error = quota2_dict_get_q2e_usage(data, q2e);
 	if (error) {
 		errx(1, "quota2_dict_get_q2e_usage: %s\n",
 		    strerror(error));
+	}
 	prop_object_release(dict);
-	return (1);
+	return retval;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: printquota.c,v 1.1.2.3 2011/01/30 00:21:08 bouyer Exp $ */
+/*	$NetBSD: printquota.c,v 1.1.2.4 2011/01/30 19:38:45 bouyer 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.
 @@ -32,27 +32,27 @@
  * 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[] = "@(#)quota.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: printquota.c,v 1.1.2.3 2011/01/30 00:21:08 bouyer Exp $");
+__RCSID("$NetBSD: printquota.c,v 1.1.2.4 2011/01/30 19:38:45 bouyer Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <errno.h>
 @@ -90,34 +90,31 @@ intprt(uint64_t val, u_int flags, int hf
+	}
 	if (flags & HN_B) {
 		/* traditionnal display: blocks are in kilobytes */
 		val = val / 1024;
+	}
 	snprintf(buf, sizeof(buf), "%" PRIu64, val);
 	return buf;
+}
 /*
  * Calculate the grace period and return a printable string for it.
  */
 const char *
-timeprt(time_t seconds)
+timeprt(time_t now, time_t seconds)
+{
 	time_t hours, minutes;
 	static char buf[20];
 	static time_t now;
 	if (now == 0)
 		time(&now);
 	if (now > seconds)
 		return ("none");
 	seconds -= now;
 	minutes = (seconds + 30) / 60;
 	hours = (minutes + 30) / 60;
 	if (hours >= 36) {
 		(void)snprintf(buf, sizeof buf, "%ddays",
 		    (int)((hours + 12) / 24));
 		return (buf);
+	}
 	if (minutes >= 60) {
 		(void)snprintf(buf, sizeof buf, "%2d:%d",
 		    (int)(minutes / 60), (int)(minutes % 60));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: quota.c,v 1.33.2.3 2011/01/28 22:15:36 bouyer Exp $	*/
+/*	$NetBSD: quota.c,v 1.33.2.4 2011/01/30 19:38:45 bouyer 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.
 @@ -32,27 +32,27 @@
  * 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[] = "@(#)quota.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: quota.c,v 1.33.2.3 2011/01/28 22:15:36 bouyer Exp $");
+__RCSID("$NetBSD: quota.c,v 1.33.2.4 2011/01/30 19:38:45 bouyer Exp $");
 #endif
 #endif /* not lint */
 /*
  * Disk quota reporting program.
  */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 @@ -75,26 +75,27 @@ __RCSID("$NetBSD: quota.c,v 1.33.2.3 201
 #include <rpc/pmap_prot.h>
 #include <rpcsvc/rquota.h>
 #include <printquota.h>
 #include <getvfsquota.h>
 struct quotause {
 	struct	quotause *next;
 	long	flags;
 	struct	quota2_entry q2e;
 	char	fsname[MAXPATHLEN + 1];
 };
 #define	FOUND	0x01
 #define	QUOTA2	0x02
 int	alldigits(char *);
 int	callaurpc(char *, int, int, int, xdrproc_t, void *, xdrproc_t, void *);
 int	main(int, char **);
 int	getnfsquota(struct statvfs *, struct fstab *, struct quotause *,
 	    long, int);
 struct quotause	*getprivs(long id, int quotatype);
 void	heading(int, u_long, const char *, const char *);
 void	showgid(gid_t);
 void	showgrpname(const char *);
 void	showquotas(int, u_long, const char *);
 void	showuid(uid_t);
 void	showusrname(const char *);
 @@ -326,27 +327,27 @@ showgrpname(name)
+		}
+	}
 	showquotas(GRPQUOTA, grp->gr_gid, name);
+}
 void
 showquotas(type, id, name)
 	int type;
 	u_long id;
 	const char *name;
+{
 	struct quotause *qup;
 	struct quotause *quplist;
-	const char *msgi, *msgb, *nam;
+	const char *msgi, *msgb, *nam, *timemsg;
 	int lines = 0;
 	static time_t now;
 	if (now == 0)
 		time(&now);
 	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)
 			continue;
 @@ -386,48 +387,64 @@ showquotas(type, id, name)
 				printf("\t%s %s\n", msgb, qup->fsname);
 			continue;
+		}
 		if (vflag || dflag ||
 		    qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur ||
 		    qup->q2e.q2e_val[Q2V_FILE].q2v_cur) {
 			if (lines++ == 0)
 				heading(type, id, name, "");
 			nam = qup->fsname;
 			if (strlen(qup->fsname) > 4) {
 				printf("%s\n", qup->fsname);
 				nam = "";
+			}
 			if (msgb)
 				timemsg = timeprt(now,
 				    qup->q2e.q2e_val[Q2V_BLOCK].q2v_time);
 			else if ((qup->flags & QUOTA2) != 0 && vflag)
 				timemsg = timeprt(0,
 				    qup->q2e.q2e_val[Q2V_BLOCK].q2v_grace);
 			else
 				timemsg = NULL;
 			printf("%12s%9s%c%8s%9s%8s"
 			    , nam
 			    , intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_cur
 				,HN_B, hflag)
 			    , (msgb == NULL) ? ' ' : '*'
 			    , intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_softlimit
 				, HN_B, hflag)
 			    , intprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit
 				, HN_B, hflag)
-			    , (msgb == NULL) ? ""
+			    , timemsg);
 			        : timeprt(qup->q2e.q2e_val[Q2V_BLOCK].q2v_time));
 			if (msgi)
 				timemsg = timeprt(now,
 				    qup->q2e.q2e_val[Q2V_FILE].q2v_time);
 			else if ((qup->flags & QUOTA2) != 0 && vflag)
 				timemsg = timeprt(0,
 				    qup->q2e.q2e_val[Q2V_FILE].q2v_grace);
 			else
 				timemsg = NULL;
 			printf("%8s%c%7s%8s%8s\n"
 			    , intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_cur
 				, 0, hflag)
 			    , (msgi == NULL) ? ' ' : '*'
 			    , intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_softlimit
 				, 0, hflag)
 			    , intprt(qup->q2e.q2e_val[Q2V_FILE].q2v_hardlimit
 				, 0, hflag)
-			    , (msgi == NULL) ? ""
+			    , timemsg);
 			        : timeprt(qup->q2e.q2e_val[Q2V_FILE].q2v_time)
 			);
 			continue;
+		}
+	}
 	if (!qflag && lines == 0)
 		heading(type, id, name, "none");
+}
 void
 heading(type, id, name, tag)
 	int type;
 	u_long id;
 	const char *name, *tag;
+{
 @@ -456,52 +473,56 @@ heading(type, id, name, tag)
 /*
  * Collect the requested quota information.
  */
 struct quotause *
 getprivs(id, quotatype)
 	long id;
 	int quotatype;
+{
 	struct quotause *qup, *quptail;
 	struct quotause *quphead;
 	struct statvfs *fst;
 	int nfst, i;
 	int8_t version;
 	qup = quphead = quptail = NULL;
 	nfst = getmntinfo(&fst, MNT_WAIT);
 	if (nfst == 0)
 		errx(2, "no filesystems mounted!");
 	for (i = 0; i < nfst; i++) {
 		if (qup == NULL) {
 			if ((qup =
 			    (struct quotause *)malloc(sizeof *qup)) == NULL)
 				errx(2, "out of memory");
+		}
 		if (strncmp(fst[i].f_fstypename, "nfs",
 		    sizeof(fst[i].f_fstypename)) == 0) {
 			version = 0;
 			if (getnfsquota(&fst[i], NULL, qup, id, quotatype) == 0)
 				continue;
 		} else if (strncmp(fst[i].f_fstypename, "ffs",
 		    sizeof(fst[i].f_fstypename)) == 0 &&
 		    (fst[i].f_flag & ST_QUOTA) != 0) {
-			if (getvfsquota(fst[i].f_mntonname, &qup->q2e,
+			if (getvfsquota(fst[i].f_mntonname, &qup->q2e, &version,
 			    id, quotatype, dflag, Dflag) == 0)
 				continue;
 		} else
 			continue;
 		(void)strncpy(qup->fsname, fst[i].f_mntonname,
 		    sizeof(qup->fsname) - 1);
 		if (version == 2)
 			qup->flags |= QUOTA2;
 		if (quphead == NULL)
 			quphead = qup;
 		else
 			quptail->next = qup;
 		quptail = qup;
 		quptail->next = 0;
 		qup = NULL;
+	}
 	if (qup)
 		free(qup);
 	return (quphead);
+}

 @@ -1,14 +1,14 @@
-/*      $NetBSD: edquota.c,v 1.29.16.2 2011/01/30 12:38:32 bouyer Exp $ */
+/*      $NetBSD: edquota.c,v 1.29.16.3 2011/01/30 19:38:45 bouyer 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.
 @@ -32,27 +32,27 @@
  * 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.29.16.2 2011/01/30 12:38:32 bouyer Exp $");
+__RCSID("$NetBSD: edquota.c,v 1.29.16.3 2011/01/30 19:38:45 bouyer 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>
 @@ -395,38 +395,46 @@ getprivs(long id, int quotatype, const c
 			quphead = qup;
 		else
 			quptail->next = qup;
 		quptail = qup;
 		qup->next = 0;
+	}
 	return quphead;
+}
 struct quotause *
 getprivs2(long id, int quotatype, const char *filesys, int defaultq)
+{
 	struct quotause *qup;
 	int8_t version;
 	if ((qup = (struct quotause *)malloc(sizeof(*qup))) == NULL)
 		errx(2, "out of memory");
-	qup->qfname = NULL;
+	memset(qup, 0, sizeof(*qup));
 	strcpy(qup->fsname, filesys);
 	qup->flags |= QUOTA2;
 	if (defaultq)
 		qup->flags |= DEFAULT;
-	if (!getvfsquota(filesys, &qup->q2e, id, quotatype, defaultq, Dflag)) {
+	if (!getvfsquota(filesys, &qup->q2e, &version,
 	    id, quotatype, defaultq, Dflag)) {
 		/* no entry, get default entry */
-		if (!getvfsquota(filesys, &qup->q2e, id, quotatype, 1, Dflag))
+		if (!getvfsquota(filesys, &qup->q2e, &version,
 		    id, quotatype, 1, Dflag)) {
 			free(qup);
 			return NULL;
+		}
+	}
 	if (version == 2)
 		qup->flags |= QUOTA2;
 	qup->q2e.q2e_uid = id;
 	return qup;
+}
 struct quotause *
 getprivs1(long id, int quotatype, const char *filesys)
+{
 	struct fstab *fs;
 	char *qfpathname;
 	struct quotause *qup;
 	struct dqblk dqblk;
 	int fd;
 	setfsent();
 @@ -485,27 +493,27 @@ getprivs1(long id, int quotatype, const
 	dqblk2q2e(&dqblk, &qup->q2e);
 	return (qup);
+}
 /*
  * Store the requested quota information.
  */
 void
 putprivs(long id, int quotatype, struct quotause *quplist)
+{
 	struct quotause *qup;
         for (qup = quplist; qup; qup = qup->next) {
-		if (qup->flags & QUOTA2)
+		if (qup->qfname == NULL)
 			putprivs2(id, quotatype, qup);
 		else
 			putprivs1(id, quotatype, qup);
+	}
+}
 void
 putprivs2(long id, int quotatype, struct quotause *qup)
+{
 	prop_dictionary_t dict, data, cmd;
 	prop_array_t cmds, datas;
 	struct plistref pref;
 @@ -1031,27 +1039,27 @@ alldigits(s)
 	const char *s;
+{
 	int c;
 	c = *s++;
 	do {
 		if (!isdigit(c))
 			return (0);
 	} while ((c = *s++) != 0);
 	return (1);
+}
 /*
- * Check to see if a particular quota is to be enabled.
+ * Check to see if a particular legacy quota is to be enabled in fstab
  */
 int
 hasquota(fs, type, qfnamep)
 	struct fstab *fs;
 	int type;
 	char **qfnamep;
+{
 	char *opt;
 	char *cp;
 	static char initname, usrname[100], grpname[100];
 	char *buf;
 	if (!initname) {

 @@ -30,27 +30,27 @@
  * 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[] = "@(#)repquota.c	8.2 (Berkeley) 11/22/94";
 #else
-__RCSID("$NetBSD: repquota.c,v 1.25.2.2 2011/01/29 11:04:43 bouyer Exp $");
+__RCSID("$NetBSD: repquota.c,v 1.25.2.3 2011/01/30 19:38:45 bouyer Exp $");
 #endif
 #endif /* not lint */
 /*
  * Quota report
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #include <prop/proplib.h>
 #include <sys/quota.h>
 @@ -88,27 +88,27 @@ int	vflag = 0;		/* verbose */
 int	aflag = 0;		/* all file systems */
 int	Dflag = 0;		/* debug */
 int	hflag = 0;		/* debug */
 struct fileusage *addid(u_long, int, const char *);
 int	hasquota(struct fstab *, int, char **);
 struct fileusage *lookup(u_long, int);
 int	main(int, char **);
 int	oneof(const char *, char **, int);
 int	repquota(const struct statvfs *, int);
 int	repquota2(const struct statvfs *, int);
 int	repquota1(const struct statvfs *, int);
 void	usage(void);
-void	printquotas(int, const struct statvfs *);
+void	printquotas(int, const struct statvfs *, int);
 void	dqblk2q2e(const struct dqblk *, struct quota2_entry *);
 int
 main(argc, argv)
 	int argc;
 	char **argv;
+{
 	struct passwd *pw;
 	struct group *gr;
 	int gflag = 0, uflag = 0, errs = 0;
 	long i, argnum, done = 0;
 	int ch;
 	struct statvfs *fst;
 @@ -204,115 +204,135 @@ repquota(const struct statvfs *vfs, int
+{
 	if (repquota2(vfs, type) != 0)
 		return (repquota1(vfs, type));
 	return 0;
+}
 int
 repquota2(const struct statvfs *vfs, int type)
+{
 	prop_dictionary_t dict, data, cmd;
 	prop_array_t cmds, datas;
 	struct plistref pref;
 	int error;
-	int8_t error8;
+	int8_t error8, version = 0;
-	prop_object_iterator_t iter;
+	prop_object_iterator_t cmditer, dataiter;
 	struct quota2_entry *q2ep;
 	struct fileusage *fup;
 	const char *strid;
 	uint32_t id;
 	dict = quota2_prop_create();
 	cmds = prop_array_create();
 	datas = prop_array_create();
 	if (dict == NULL || cmds == NULL || datas == NULL)
 		errx(1, "can't allocate proplist");
 	if (!quota2_prop_add_command(cmds, "getall", qfextension[type], datas))
 		err(1, "prop_add_command");
 	if (!quota2_prop_add_command(cmds, "get version", qfextension[type],
 	     prop_array_create()))
 		err(1, "prop_add_command");
 	if (!prop_dictionary_set(dict, "commands", cmds))
 		err(1, "prop_dictionary_set(command)");
 	if (Dflag)
 		printf("message to kernel:\n%s\n",
 		    prop_dictionary_externalize(dict));
 	if (!prop_dictionary_send_syscall(dict, &pref))
 		err(1, "prop_dictionary_send_syscall");
 	prop_object_release(dict);
 	if (quotactl(vfs->f_mntonname, &pref) != 0)
 		err(1, "quotactl");
 	if ((error = prop_dictionary_recv_syscall(&pref, &dict)) != 0) {
 		errx(1, "prop_dictionary_recv_syscall: %s\n",
 		    strerror(error));
+	}
 	if (Dflag)
 		printf("reply from kernel:\n%s\n",
 		    prop_dictionary_externalize(dict));
 	if ((error = quota2_get_cmds(dict, &cmds)) != 0) {
 		errx(1, "quota2_get_cmds: %s\n",
 		    strerror(error));
+	}
-	/* only one command, no need to iter */
+	cmditer = prop_array_iterator(cmds);
-	cmd = prop_array_get(cmds, 0);
+	if (cmditer == NULL)
-	if (cmd == NULL)
+		err(1, "prop_array_iterator(cmds)");
 		err(1, "prop_array_get(cmd)");
 	while ((cmd = prop_object_iterator_next(cmditer)) != NULL) {
-	if (!prop_dictionary_get_int8(cmd, "return", &error8))
+		const char *cmdstr;
-		err(1, "prop_get(return)");
+		if (!prop_dictionary_get_cstring_nocopy(cmd, "command",
 		    &cmdstr))
-	if (error8) {
+			err(1, "prop_get(command)");
 		prop_object_release(dict);
-		if (error8 != EOPNOTSUPP) {
+		if (!prop_dictionary_get_int8(cmd, "return", &error8))
-			fprintf(stderr, "get %s quotas: %s\n",
+			err(1, "prop_get(return)");
 			    qfextension[type], strerror(error8));
 		if (error8) {
-		return (error8);
+			prop_object_release(dict);
 			if (error8 != EOPNOTSUPP) {
-	datas = prop_dictionary_get(cmd, "data");
+				fprintf(stderr, "get %s quotas: %s\n",
-	if (datas == NULL)
+				    qfextension[type], strerror(error8));
 		err(1, "prop_dict_get(datas)");
 	iter = prop_array_iterator(datas);
         if (iter == NULL)
                 err(1, "prop_array_iterator");
 	while ((data = prop_object_iterator_next(iter)) != NULL) {
 		strid = NULL;
 		if (!prop_dictionary_get_uint32(data, "id", &id)) {
 			if (!prop_dictionary_get_cstring_nocopy(data, "id",
 			    &strid))
 				errx(1, "can't find id in quota entry");
 			if (strcmp(strid, "default") != 0) {
 				errx(1, "wrong id string %s in quota entry",
 				    strid);
+			}
-			q2ep = &defaultq2e[type];
+			return (error8);
 		} else {
 			if ((fup = lookup(id, type)) == 0)
 				fup = addid(id, type, (char *)0);
 			q2ep = &fup->fu_q2e;
 			q2ep->q2e_uid = id;
+		}
 		datas = prop_dictionary_get(cmd, "data");
-		error = quota2_dict_get_q2e_usage(data, q2ep);
+		if (datas == NULL)
-		if (error) {
+			err(1, "prop_dict_get(datas)");
 			errx(1, "quota2_dict_get_q2e_usage: %s\n",
-			    strerror(error));
+		if (strcmp("get version", cmdstr) == 0) {
 			data = prop_array_get(datas, 0);
 			if (data == NULL)
 				err(1, "prop_array_get(version)");
 			if (!prop_dictionary_get_int8(data, "version",
 			    &version))
 				err(1, "prop_get_int8(version)");
 			continue;
+		}
 		dataiter = prop_array_iterator(datas);
 		if (dataiter == NULL)
 			err(1, "prop_array_iterator");
 		while ((data = prop_object_iterator_next(dataiter)) != NULL) {
 			strid = NULL;
 			if (!prop_dictionary_get_uint32(data, "id", &id)) {
 				if (!prop_dictionary_get_cstring_nocopy(data,
 				    "id", &strid))
 					errx(1, "can't find id in quota entry");
 				if (strcmp(strid, "default") != 0) {
 					errx(1,
 					    "wrong id string %s in quota entry",
 					    strid);
+				}
 				q2ep = &defaultq2e[type];
 			} else {
 				if ((fup = lookup(id, type)) == 0)
 					fup = addid(id, type, (char *)0);
 				q2ep = &fup->fu_q2e;
 				q2ep->q2e_uid = id;
+			}
 			error = quota2_dict_get_q2e_usage(data, q2ep);
 			if (error) {
 				errx(1, "quota2_dict_get_q2e_usage: %s\n",
 				    strerror(error));
+			}
+		}
 		prop_object_iterator_release(dataiter);
+	}
-	prop_object_iterator_release(iter);
+	prop_object_iterator_release(cmditer);
 	prop_object_release(dict);
-	printquotas(type, vfs);
+	printquotas(type, vfs, version);
 	return (0);
+}
 int repquota1(const struct statvfs *vfs, int type)
+{
 	char *qfpathname;
 	struct fstab *fs;
 	struct fileusage *fup;
 	FILE *qf;
 	u_long id;
 	struct dqblk dqbuf;
 #if 0
 @@ -343,86 +363,109 @@ int repquota1(const struct statvfs *vfs,
 		return (1);
+	}
 	for (id = 0; ; id++) {
 		fread(&dqbuf, sizeof(struct dqblk), 1, qf);
 		if (feof(qf))
 			break;
 		if (dqbuf.dqb_curinodes == 0 && dqbuf.dqb_curblocks == 0)
 			continue;
 		if ((fup = lookup(id, type)) == 0)
 			fup = addid(id, type, (char *)0);
 		dqblk2q2e(&dqbuf, &fup->fu_q2e);
+	}
 	fclose(qf);
-	printquotas(type, vfs);
+	printquotas(type, vfs, 1);
 	return (0);
+}
 void
-printquotas(int type, const struct statvfs *vfs)
+printquotas(int type, const struct statvfs *vfs, int version)
+{
 	static int multiple = 0;
 	u_long id;
 	struct fileusage *fup;
 	const char *timemsg;
 	static time_t now;
 	if (now == 0)
 		time(&now);
 	if (multiple++)
 		printf("\n");
 	if (vflag)
-		fprintf(stdout, "*** Report for %s quotas on %s (%s)\n",
+		fprintf(stdout,
-		    qfextension[type], vfs->f_mntonname, vfs->f_mntfromname);
+		    "*** Report for %s quotas on %s (%s, version %d)\n",
 		    qfextension[type], vfs->f_mntonname, vfs->f_mntfromname,
 		    version);
 	printf("                        Block limits               File limits\n");
 	printf(type == USRQUOTA ? "User " : "Group");
 	printf("            used     soft     hard  grace      used    soft    hard  grace\n");
 	for (id = 0; id <= highid[type]; id++) {
 		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)
 			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)
 			timemsg = timeprt(now,
 			    fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_time);
 		else if (vflag && version == 2)
 			timemsg = timeprt(0,
 			    fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_grace);
 		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[Q2V_FILE].q2v_softlimit &&
 			    fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur >=
 			    fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit ?
 			    '+' : '-',
 			intprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_cur,
 				HN_B, hflag),
 			intprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit,
 				HN_B, hflag),
 			intprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_hardlimit,
 				HN_B, hflag),
-			(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit &&
+			timemsg);
-			 fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_cur >=
+		if (fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit &&
-			 fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_softlimit) ?
+		    fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur >=
-			timeprt(fup->fu_q2e.q2e_val[Q2V_BLOCK].q2v_time) : "");
+		    fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit)
 			timemsg = timeprt(now,
 			    fup->fu_q2e.q2e_val[Q2V_FILE].q2v_time);
 		else if (vflag && version == 2)
 			timemsg = timeprt(0,
 			    fup->fu_q2e.q2e_val[Q2V_FILE].q2v_grace);
 		else
 			timemsg = "";
 		printf("  %8s%8s%8s%7s\n",
 			intprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur,
 , hflag),
 			intprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit,
 , hflag),
 			intprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_hardlimit,
 , hflag),
-			(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit &&
+			timemsg);
 			 fup->fu_q2e.q2e_val[Q2V_FILE].q2v_cur >=
 			 fup->fu_q2e.q2e_val[Q2V_FILE].q2v_softlimit) ?
 			timeprt(fup->fu_q2e.q2e_val[Q2V_FILE].q2v_time) : "");
 		memset(&fup->fu_q2e, 0, sizeof(fup->fu_q2e));
+	}
+}
 /*
  * Check to see if target appears in list of size cnt.
  */
 int
 oneof(target, list, cnt)
 	const char *target;
 	char *list[];
 	int cnt;
+{

 @@ -1,5 +1,6 @@
-/*	$NetBSD: getvfsquota.h,v 1.1.2.1 2011/01/28 22:15:36 bouyer Exp $ */
+/*	$NetBSD: getvfsquota.h,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $ */
-int getvfsquota(const char *, struct quota2_entry *, long, int, int, int);
+int getvfsquota(const char *, struct quota2_entry *, int8_t *,
     long, int, int, int);
 extern const char *qfextension[];

 @@ -1,7 +1,7 @@
-/*	$NetBSD: printquota.h,v 1.1.2.3 2011/01/29 17:42:37 bouyer Exp $ */
+/*	$NetBSD: printquota.h,v 1.1.2.4 2011/01/30 19:38:45 bouyer Exp $ */
 const char *intprt(uint64_t, u_int, int);
 #define HN_PRIV_UNLIMITED 0x80000000	/* print "unlimited" instead of "-" */
-const char *timeprt(time_t);
+const char *timeprt(time_t, time_t);
 int intrd(char *str, uint64_t *val, u_int);