 @@ -1,14 +1,14 @@
-/*	$NetBSD: mount.c,v 1.98 2013/01/24 17:53:49 christos Exp $	*/
+/*	$NetBSD: mount.c,v 1.99 2013/10/05 08:06:35 ast Exp $	*/
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: mount.c,v 1.98 2013/01/24 17:53:49 christos Exp $");
+__RCSID("$NetBSD: mount.c,v 1.99 2013/10/05 08:06:35 ast Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <fs/puffs/puffs_msgif.h>
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
 #include <pwd.h>
 @@ -75,27 +75,27 @@ static void	catopt(char **, const char *
 static const char *
 		getfslab(const char *str);
 static struct statvfs *
 		getmntpt(const char *);
 static int 	getmntargs(struct statvfs *, char *, size_t);
 static int	hasopt(const char *, const char *);
 static void	mangle(char *, int *, const char ** volatile *, int *);
 static int	mountfs(const char *, const char *, const char *,
 		    int, const char *, const char *, int, char *, size_t);
 static void	prmount(struct statvfs *);
 __dead static void	usage(void);
-/* Map from mount otions to printable formats. */
+/* Map from mount options to printable formats. */
 static const struct opt {
 	int o_opt;
 	int o_silent;
 	const char *o_name;
 } optnames[] = {
 	__MNT_FLAGS
 };
 static const char ffs_fstype[] = "ffs";
 int
 main(int argc, char *argv[])
+{
 @@ -342,27 +342,27 @@ hasopt(const char *mntopts, const char *
 	found = 0;
 	for (opt = optbuf; (opt = strtok(opt, ",")) != NULL; opt = NULL) {
 		if (opt[0] == 'n' && opt[1] == 'o') {
 			if (!strcasecmp(opt + 2, option))
 				found = negative;
 		} else if (!strcasecmp(opt, option))
 			found = !negative;
+	}
 	free(optbuf);
 	return (found);
+}
 static int
 mountfs(const char *vfstype, const char *spec, const char *name,
     int flags, const char *options, const char *mntopts,
     int skipmounted, char *buf, size_t buflen)
+{
 	/* List of directories containing mount_xxx subcommands. */
 	static const char *edirs[] = {
 #ifdef RESCUEDIR
 		RESCUEDIR,
 #endif
 		_PATH_SBIN,
 		_PATH_USRSBIN,
 		NULL
 	};
 	const char ** volatile argv, **edir;
 @@ -569,27 +569,27 @@ mountfs(const char *vfstype, const char
 static void
 prmount(struct statvfs *sfp)
+{
 	int flags;
 	const struct opt *o;
 	struct passwd *pw;
 	int f;
 	(void)printf("%s on %s type %.*s", sfp->f_mntfromname,
 	    sfp->f_mntonname, (int)sizeof(sfp->f_fstypename),
 	    sfp->f_fstypename);
 	flags = sfp->f_flag & MNT_VISFLAGMASK;
 	for (f = 0, o = optnames; flags && o <
 	    &optnames[sizeof(optnames)/sizeof(optnames[0])]; o++)
 		if (flags & o->o_opt) {
 			if (!o->o_silent || verbose)
 				(void)printf("%s%s", !f++ ? " (" : ", ",
 				    o->o_name);
 			flags &= ~o->o_opt;
+		}
 	if (flags)
 		(void)printf("%sunknown flag%s %#x", !f++ ? " (" : ", ",
 		    flags & (flags - 1) ? "s" : "", flags);
 	if (sfp->f_owner) {
 		(void)printf("%smounted by ", !f++ ? " (" : ", ");
 		if ((pw = getpwuid(sfp->f_owner)) != NULL)