Page MenuHomeFreeBSD
Files F115294372

D49952.diff
No OneTemporary
Actions

D49952.diff
View Options

diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.c
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.c
@@ -47,6 +47,7 @@
#include <stdlib.h>
#include <err.h>
#include <sysexits.h>
+#include <mntopts.h>
#include <cflib.h>
@@ -56,8 +57,6 @@
#include <fs/smbfs/smbfs.h>
-#include "mntopts.h"
-
static char mount_point[MAXPATHLEN + 1];
static void usage(void);
diff --git a/lib/libutil/getmntopts.c b/lib/libutil/getmntopts.c
--- a/lib/libutil/getmntopts.c
+++ b/lib/libutil/getmntopts.c
@@ -36,14 +36,13 @@
#include <err.h>
#include <errno.h>
+#include <mntopts.h>
#include <paths.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "mntopts.h"
-
int getmnt_silent = 0;
void
diff --git a/sbin/init/init.c b/sbin/init/init.c
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -49,6 +49,7 @@
#include <fcntl.h>
#include <kenv.h>
#include <libutil.h>
+#include <mntopts.h>
#include <paths.h>
#include <signal.h>
#include <stdarg.h>
@@ -69,7 +70,6 @@
#include <login_cap.h>
#endif
-#include "mntopts.h"
#include "pathnames.h"
/*
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -39,6 +39,7 @@
#include <errno.h>
#include <fstab.h>
+#include <mntopts.h>
#include <paths.h>
#include <pwd.h>
#include <signal.h>
@@ -51,7 +52,6 @@
#include <libxo/xo.h>
#include "extern.h"
-#include "mntopts.h"
#include "pathnames.h"
#define EXIT(a) { \
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -38,13 +38,13 @@
#include <err.h>
#include <getopt.h>
#include <libgen.h>
+#include <mntopts.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "extern.h"
-#include "mntopts.h"
static struct mntopt mopts[] = {
MOPT_STDOPTS,
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -48,6 +48,7 @@
#include <err.h>
#include <errno.h>
#include <grp.h>
+#include <mntopts.h>
#include <pwd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -55,8 +56,6 @@
#include <sysexits.h>
#include <unistd.h>
-#include "mntopts.h"
-
static struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_UPDATE,
diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@@ -49,11 +49,10 @@
#include <signal.h>
#include <getopt.h>
#include <limits.h>
+#include <mntopts.h>
#include <osreldate.h>
#include <paths.h>
-#include "mntopts.h"
-
#ifndef FUSE4BSD_VERSION
#define FUSE4BSD_VERSION "0.3.9-pre1"
#endif
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -44,6 +44,7 @@
#include <errno.h>
#include <grp.h>
#include <locale.h>
+#include <mntopts.h>
#include <pwd.h>
#include <stdio.h>
/* must be after stdio to declare fparseln */
@@ -53,8 +54,6 @@
#include <sysexits.h>
#include <unistd.h>
-#include "mntopts.h"
-
static gid_t a_gid(char *);
static uid_t a_uid(char *);
static mode_t a_mask(char *);
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -58,6 +58,7 @@
#include <err.h>
#include <errno.h>
#include <fcntl.h>
+#include <mntopts.h>
#include <netdb.h>
#include <stdbool.h>
#include <stdio.h>
@@ -67,7 +68,6 @@
#include <sysexits.h>
#include <unistd.h>
-#include "mntopts.h"
#include "mounttab.h"
/* Table for af,sotype -> netid conversions. */
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -38,14 +38,13 @@
#include <sys/uio.h>
#include <err.h>
+#include <mntopts.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include "mntopts.h"
-
static void usage(void) __dead2;
static int
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -53,14 +53,13 @@
#include <err.h>
#include <errno.h>
+#include <mntopts.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include "mntopts.h"
-
static struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_UPDATE,
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -41,6 +41,7 @@
#include <sys/errno.h>
#include <err.h>
+#include <mntopts.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -49,8 +50,6 @@
#include <grp.h>
#include <pwd.h>
-#include "mntopts.h"
-
static int
subdir(const char *p, const char *dir)
{
diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc
--- a/tests/sys/fs/fusefs/fallocate.cc
+++ b/tests/sys/fs/fusefs/fallocate.cc
@@ -32,10 +32,9 @@
#include <sys/time.h>
#include <fcntl.h>
+#include <mntopts.h> // for build_iovec
#include <signal.h>
#include <unistd.h>
-
-#include "mntopts.h" // for build_iovec
}
#include "mockfs.hh"
diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc
--- a/tests/sys/fs/fusefs/mockfs.cc
+++ b/tests/sys/fs/fusefs/mockfs.cc
@@ -39,13 +39,12 @@
#include <fcntl.h>
#include <libutil.h>
+#include <mntopts.h> // for build_iovec
#include <poll.h>
#include <pthread.h>
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
-
-#include "mntopts.h" // for build_iovec
}
#include <cinttypes>
diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc
--- a/tests/sys/fs/fusefs/mount.cc
+++ b/tests/sys/fs/fusefs/mount.cc
@@ -33,7 +33,7 @@
#include <sys/mount.h>
#include <sys/uio.h>
-#include "mntopts.h" // for build_iovec
+#include <mntopts.h> // for build_iovec
}
#include "mockfs.hh"
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -45,6 +45,7 @@
#include <fcntl.h>
#include <libgen.h>
#include <libutil.h>
+#include <mntopts.h>
#include <netdb.h>
#include <signal.h>
#include <stdbool.h>
@@ -55,7 +56,6 @@
#include <unistd.h>
#include "common.h"
-#include "mntopts.h"
static int
unmount_by_statfs(const struct statfs *sb, bool force)
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -64,6 +64,7 @@
#include <grp.h>
#include <libutil.h>
#include <limits.h>
+#include <mntopts.h>
#include <netdb.h>
#include <pwd.h>
#include <signal.h>
@@ -73,7 +74,6 @@
#include <unistd.h>
#include <vis.h>
#include "pathnames.h"
-#include "mntopts.h"
#ifdef DEBUG
#include <stdarg.h>

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 23, 8:11 AM (17 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17726326
Default Alt Text
D49952.diff (6 KB)

Event Timeline