 @@ -1,14 +1,14 @@
-/*      $NetBSD: edquota.c,v 1.44 2012/01/30 19:16:36 dholland Exp $ */
+/*      $NetBSD: edquota.c,v 1.45 2012/01/30 19:18: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,27 +31,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.44 2012/01/30 19:16:36 dholland Exp $");
+__RCSID("$NetBSD: edquota.c,v 1.45 2012/01/30 19:18: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>
 @@ -70,27 +70,29 @@ __RCSID("$NetBSD: edquota.c,v 1.44 2012/
 #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 "quotautil.h"
 #include "pathnames.h"
 #if 0
 static const char *quotagroup = QUOTAGROUP;
 #endif
 #define MAX_TMPSTR	(100+MAXPATHLEN)
 /* flags for quotause */
 #define	FOUND	0x01
 #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];
 @@ -208,49 +210,52 @@ quotalist_create(void)
  */
 static void
 quotalist_destroy(struct quotalist *qlist)
+{
 	struct quotause *qup, *nextqup;
 	for (qup = qlist->head; qup; qup = nextqup) {
 		nextqup = qup->next;
 		quotause_destroy(qup);
+	}
 	free(qlist);
+}
 #if 0
 static bool
 quotalist_empty(struct quotalist *qlist)
+{
 	return qlist->head == NULL;
+}
 #endif
 static void
 quotalist_append(struct quotalist *qlist, struct quotause *qup)
+{
 	/* should not already be on a list */
 	assert(qup->next == NULL);
 	if (qlist->head == NULL) {
 		qlist->head = qup;
 	} else {
 		qlist->tail->next = qup;
+	}
 	qlist->tail = qup;
+}
 ////////////////////////////////////////////////////////////
 // ffs quota v1
 #if 0
 static void
 putprivs1(uint32_t id, int idtype, struct quotause *qup)
+{
 	struct dqblk dqblk;
 	int fd;
 	quotavals_to_dqblk(&qup->qv[QUOTA_LIMIT_BLOCK],
 			   &qup->qv[QUOTA_LIMIT_FILE],
 			   &dqblk);
 	assert((qup->flags & DEFAULT) == 0);
 	if ((fd = open(qup->qfname, O_WRONLY)) < 0) {
 		warnx("open `%s'", qup->qfname);
 @@ -322,26 +327,27 @@ getprivs1(long id, int idtype, const cha
 		warn("read error in `%s'", qfpathname);
 		close(fd);
 		quotause_destroy(qup);
 		return NULL;
+	}
 	close(fd);
 	qup->qfname = qfpathname;
 	endfsent();
 	dqblk_to_quotavals(&dqblk,
 			   &qup->qv[QUOTA_LIMIT_BLOCK],
 			   &qup->qv[QUOTA_LIMIT_FILE]);
 	return qup;
+}
 #endif
 ////////////////////////////////////////////////////////////
 // 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;
 @@ -477,55 +483,59 @@ getprivs(long id, int defaultq, int idty
 			 * Note: we cannot warn unconditionally here
 			 * because this case apparently includes "no
 			 * quota entry on this volume" and that causes
 			 * the atf tests to fail. Bletch.
 			 */
 			/*return NULL;*/
 			/*warnx("getprivs2 failed");*/
 			continue;
+		}
 		quotalist_append(qlist, qup);
+	}
 #if 0
 	if (filesys && quotalist_empty(qlist)) {
 		if (defaultq)
 			errx(1, "no default quota for version 1");
 		/* if we get there, filesys is not mounted. try the old way */
 		qup = getprivs1(id, idtype, filesys);
 		if (qup == NULL) {
 			/* XXX. see above */
 			/*return NULL;*/
 			/*warnx("getprivs1 failed");*/
 			return qlist;
+		}
 		quotalist_append(qlist, qup);
+	}
 #endif
 	return qlist;
+}
 /*
  * Store the requested quota information.
  */
 static void
 putprivs(uint32_t id, int idtype, struct quotalist *qlist)
+{
 	struct quotause *qup;
         for (qup = qlist->head; qup; qup = qup->next) {
 		if (qup->qfname == NULL)
 			putprivs2(id, idtype, qup);
 #if 0
 		else
 			putprivs1(id, idtype, qup);
 #endif
+	}
+}
 static void
 clearpriv(int argc, char **argv, const char *filesys, int idtype)
+{
 	struct statvfs *fst;
 	int nfst, i;
 	int id;
 	id_t *ids;
 	unsigned nids, maxids, j;
 	struct quotahandle *qh;
 	struct quotakey qk;