D8513.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8513.id.diff
View Options

	Index: head/bin/df/Makefile
	===================================================================
	--- head/bin/df/Makefile
	+++ head/bin/df/Makefile
	@@ -9,6 +9,7 @@
	SRCS= df.c vfslist.c

	CFLAGS+= -I${MOUNT}
	+CFLAGS+= -DMOUNT_CHAR_DEVS

	LIBADD= xo util

	Index: head/bin/df/df.c
	===================================================================
	--- head/bin/df/df.c
	+++ head/bin/df/df.c
	@@ -50,7 +50,9 @@
	#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 @@

	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 @@
	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 @@
	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 @@
	free(mntpath);
	continue;
	}
	+#endif
	} else
	mntpt = *argv;