From 91b4c0b648056a493096984e54032d7eae53cb82 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Thu, 14 Dec 1995 01:32:16 +0000
Subject: [PATCH] from netbsd: Recognize all mount flags exported from the
 kernel (but only print the ones that we used to print).  Note unrecognized
 flags(s) when printing mount list.

---
 sbin/mount/mount.c | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 9cc547508a1..8324ce0a461 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount.c,v 1.23 1995/08/22 19:58:33 jtc Exp $	*/
+/*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c	8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$NetBSD: mount.c,v 1.23 1995/08/22 19:58:33 jtc Exp $";
+static char rcsid[] = "$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $";
 #endif
 #endif /* not lint */
 
@@ -80,18 +80,24 @@ void	usage __P((void));
 /* Map from mount otions to printable formats. */
 static struct opt {
 	int o_opt;
+	int o_silent;
 	const char *o_name;
 } optnames[] = {
-	{ MNT_ASYNC,		"asynchronous" },
-	{ MNT_EXPORTED,		"NFS exported" },
-	{ MNT_LOCAL,		"local" },
-	{ MNT_NODEV,		"nodev" },
-	{ MNT_NOEXEC,		"noexec" },
-	{ MNT_NOSUID,		"nosuid" },
-	{ MNT_QUOTA,		"with quotas" },
-	{ MNT_RDONLY,		"read-only" },
-	{ MNT_SYNCHRONOUS,	"synchronous" },
-	{ MNT_UNION,		"union" },
+	{ MNT_ASYNC,		0,	"asynchronous" },
+	{ MNT_DEFEXPORTED,	1,	"exported to the world" },
+	{ MNT_EXKERB,		1,	"kerberos uid mapping" },
+	{ MNT_EXPORTED,		0,	"NFS exported" },
+	{ MNT_EXPORTANON,	1,	"anon uid mapping" },
+	{ MNT_EXRDONLY,		1,	"exported read-only" },
+	{ MNT_LOCAL,		0,	"local" },
+	{ MNT_NODEV,		0,	"nodev" },
+	{ MNT_NOEXEC,		0,	"noexec" },
+	{ MNT_NOSUID,		0,	"nosuid" },
+	{ MNT_QUOTA,		0,	"with quotas" },
+	{ MNT_RDONLY,		0,	"read-only" },
+	{ MNT_ROOTFS,		1,	"root file system" },
+	{ MNT_SYNCHRONOUS,	0,	"synchronous" },
+	{ MNT_UNION,		0,	"union" },
 	{ NULL }
 };
 
@@ -415,9 +421,14 @@ prmount(sf)
 	flags = sf->f_flags & MNT_VISFLAGMASK;
 	for (f = 0, o = optnames; flags && o->o_opt; o++)
 		if (flags & o->o_opt) {
-			(void)printf("%s%s", !f++ ? " (" : ", ", o->o_name);
+			if (!o->o_silent)
+				(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);
 	(void)printf(f ? ")\n" : "\n");
 }
 
-- 
2.20.1