Date: Tue, 22 Apr 2025 21:51:57 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a123502ef781 - main - Search for mntopts.h globally, not locally Message-ID: <202504222151.53MLpvQ2098083@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a123502ef781ea052e842af25c7aeb64fd9fe217 commit a123502ef781ea052e842af25c7aeb64fd9fe217 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2025-04-22 21:51:12 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2025-04-22 21:51:42 +0000 Search for mntopts.h globally, not locally Change the include directives to use <mntopts.h> instead of "mntopts.h" now that it's installed by libutil (the latter option was dubious regardless since a -I${SRCTOP}/sbin/mount was required anyway). Reviewed by: olce, imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D49952 --- contrib/smbfs/mount_smbfs/mount_smbfs.c | 3 +-- lib/libutil/mntopts.c | 3 +-- sbin/init/init.c | 2 +- sbin/mount/mount.c | 2 +- sbin/mount/mount_fs.c | 2 +- sbin/mount_cd9660/mount_cd9660.c | 3 +-- sbin/mount_fusefs/mount_fusefs.c | 3 +-- sbin/mount_msdosfs/mount_msdosfs.c | 3 +-- sbin/mount_nfs/mount_nfs.c | 2 +- sbin/mount_nullfs/mount_nullfs.c | 3 +-- sbin/mount_udf/mount_udf.c | 3 +-- sbin/mount_unionfs/mount_unionfs.c | 3 +-- tests/sys/fs/fusefs/fallocate.cc | 3 +-- tests/sys/fs/fusefs/mockfs.cc | 3 +-- tests/sys/fs/fusefs/mount.cc | 2 +- usr.sbin/autofs/automount.c | 2 +- usr.sbin/mountd/mountd.c | 2 +- 17 files changed, 17 insertions(+), 27 deletions(-) diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c index 99f1cee8ed2e..5b357655b642 100644 --- 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/mntopts.c b/lib/libutil/mntopts.c index 0912b1e1a306..1d9347e3108a 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.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 index b6908f19fd82..b345c8fa219a 100644 --- 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 index cf603a63e394..03ae69272e1a 100644 --- 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 index 6035857578ae..30c34ae32f31 100644 --- 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 index d8d64eb5a656..3eddbefb9a03 100644 --- 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 index 8b1797747a25..2d65494421ef 100644 --- 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 index 9128914bc2b0..36e1c524922d 100644 --- 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 index 6ba51eeec588..55adb01fc1da 100644 --- 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 index b5782dc24e45..fc04961e6247 100644 --- 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 index 2805872d41ad..0425c6a1378c 100644 --- 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 index 28f224ae0f68..d207e5581745 100644 --- 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 index a05760207648..4e5b047b78b7 100644 --- a/tests/sys/fs/fusefs/fallocate.cc +++ b/tests/sys/fs/fusefs/fallocate.cc @@ -32,10 +32,9 @@ extern "C" { #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 index 35ae6c207229..b1621d05703c 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -39,13 +39,12 @@ extern "C" { #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 index 7a8d2c1396f0..ece518b09f66 100644 --- a/tests/sys/fs/fusefs/mount.cc +++ b/tests/sys/fs/fusefs/mount.cc @@ -33,7 +33,7 @@ extern "C" { #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 index 32aa2300d094..5cd7106b1161 100644 --- 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 index 19d76b72da10..3c4e5e742c93 100644 --- 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504222151.53MLpvQ2098083>