Put the undocumented df feature of mounting filesystems from device nodes

under an ifdef.  Leave enabled.

Reviewed by:	cem
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D8513

diff --git a/bin/df/Makefile b/bin/df/Makefile
index 8f9f5284d94eeab069950174c61b328dfeb2ce7f..c0f2f07b73e1e605a12d55e53b83e92e6d4e8e07 100644 (file)
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -9,6 +9,7 @@ PROG=   df
 SRCS=  df.c vfslist.c
 
 CFLAGS+= -I${MOUNT}
+CFLAGS+= -DMOUNT_CHAR_DEVS
 
 LIBADD=        xo util
 

diff --git a/bin/df/df.c b/bin/df/df.c
index 1bcf40d21118576656d3f8e99e31db920f1b70ac..e07df3270356c3ec2fbd8c2668dd20d8e13fd361 100644 (file)
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -50,7 +50,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
+#ifdef MOUNT_CHAR_DEVS
 #include <ufs/ufs/ufsmount.h>
+#endif
 #include <err.h>
 #include <libutil.h>
 #include <locale.h>
@@ -98,7 +100,9 @@ imax(int a, int b)
 
 static int     aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag;
 static int     thousands;
+#ifdef MOUNT_CHAR_DEVS
 static struct  ufs_args mdev;
+#endif
 
 int
 main(int argc, char *argv[])
@@ -108,7 +112,10 @@ main(int argc, char *argv[])
        struct maxwidths maxwidths;
        struct statfs *mntbuf;
        const char *fstype;
-       char *mntpath, *mntpt;
+#ifdef MOUNT_CHAR_DEVS
+       char *mntpath;
+#endif
+       char *mntpt;
        const char **vfslist;
        int i, mntsize;
        int ch, rv;
@@ -227,6 +234,7 @@ main(int argc, char *argv[])
                                rv = 1;
                                continue;
                        }
+#ifdef MOUNT_CHAR_DEVS
                } else if (S_ISCHR(stbuf.st_mode)) {
                        if ((mntpt = getmntpt(*argv)) == NULL) {
                                mdev.fspec = *argv;
@@ -264,6 +272,7 @@ main(int argc, char *argv[])
                                free(mntpath);
                                continue;
                        }
+#endif
                } else
                        mntpt = *argv;