Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/mntopts.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/mntopts.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.3
retrieving revision 1.14.8.1
diff -u -p -r1.3 -r1.14.8.1
--- src/include/mntopts.h	2003/08/07 09:44:10	1.3
+++ src/include/mntopts.h	2012/11/20 03:00:39	1.14.8.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: mntopts.h,v 1.3 2003/08/07 09:44:10 agc Exp $	*/
+/*	$NetBSD: mntopts.h,v 1.14.8.1 2012/11/20 03:00:39 tls Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -55,10 +55,13 @@ struct mntopt {
 #define MOPT_NOATIME		{ "atime",	1, MNT_NOATIME, 0 }
 #define MOPT_SYMPERM		{ "symperm",	0, MNT_SYMPERM, 0 }
 #define MOPT_SOFTDEP		{ "softdep",	0, MNT_SOFTDEP, 0 }
+#define MOPT_LOG		{ "log",	0, MNT_LOG, 0 }
 #define MOPT_IGNORE		{ "hidden",	0, MNT_IGNORE, 0 }
+#define MOPT_EXTATTR		{ "extattr",	0, MNT_EXTATTR, 0 }
+#define MOPT_DISCARD		{ "discard",	0, MNT_DISCARD, 0 }
 
 /* Control flags. */
-#define MOPT_FORCE		{ "force",	1, MNT_FORCE, 0 }
+#define MOPT_FORCE		{ "force",	0, MNT_FORCE, 0 }
 #define MOPT_UPDATE		{ "update",	0, MNT_UPDATE, 0 }
 #define MOPT_RELOAD		{ "reload",	0, MNT_RELOAD, 0 }
 #define MOPT_GETARGS		{ "getargs",	0, MNT_GETARGS,	0 }
@@ -69,6 +72,8 @@ struct mntopt {
 
 /* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */
 #define MOPT_AUTO		{ "auto",	0, 0, 0 }
+#define MOPT_RUMP		{ "rump",	0, 0, 0 }
+#define MOPT_NULL		{ NULL,		0, 0, 0 }
 
 #define MOPT_FSTAB_COMPAT						\
 	MOPT_RO,							\
@@ -87,15 +92,15 @@ struct mntopt {
 	MOPT_RDONLY,							\
 	MOPT_UNION,							\
 	MOPT_IGNORE,							\
-	MOPT_SYMPERM
+	MOPT_SYMPERM,							\
+	MOPT_RUMP
 
 __BEGIN_DECLS
 typedef struct mntoptparse *mntoptparse_t;
-mntoptparse_t getmntopts __P((const char *, const struct mntopt *, int *,
-    int *));
-const char *getmntoptstr __P((mntoptparse_t, const char *));
-long getmntoptnum __P((mntoptparse_t, const char *));
-void freemntopts __P((mntoptparse_t));
+mntoptparse_t getmntopts(const char *, const struct mntopt *, int *, int *);
+const char *getmntoptstr(mntoptparse_t, const char *);
+long getmntoptnum(mntoptparse_t, const char *);
+void freemntopts(mntoptparse_t);
 
 extern int getmnt_silent;
 __END_DECLS