svn commit: r310088 - head/bin/df
Brooks Davis
brooks at FreeBSD.org
Wed Dec 14 21:11:43 UTC 2016
Author: brooks
Date: Wed Dec 14 21:11:42 2016
New Revision: 310088
URL: https://svnweb.freebsd.org/changeset/base/310088
Log:
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
Modified:
head/bin/df/Makefile
head/bin/df/df.c
Modified: head/bin/df/Makefile
==============================================================================
--- head/bin/df/Makefile Wed Dec 14 20:53:46 2016 (r310087)
+++ head/bin/df/Makefile Wed Dec 14 21:11:42 2016 (r310088)
@@ -9,6 +9,7 @@ PROG= df
SRCS= df.c vfslist.c
CFLAGS+= -I${MOUNT}
+CFLAGS+= -DMOUNT_CHAR_DEVS
LIBADD= xo util
Modified: head/bin/df/df.c
==============================================================================
--- head/bin/df/df.c Wed Dec 14 20:53:46 2016 (r310087)
+++ head/bin/df/df.c Wed Dec 14 21:11:42 2016 (r310088)
@@ -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;
More information about the svn-src-all
mailing list