svn commit: r329530 - stable/11/bin/df

[Brooks Davis]

Author: brooks
Date: Sun Feb 18 20:49:43 2018
New Revision: 329530
URL: https://svnweb.freebsd.org/changeset/base/329530

Log:
  MFC r329092:
  
  Add a deprecation warning when using the feature which mounts devices
  to see how much space it on them.
  
  Adjust MOUNT_CHAR_DEVS to allow the free space of already mounted
  devices to be displayed and report an appropriate error if the
  device isn't mounted.
  
  Reviewed by:	cem
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D8801

Modified:
  stable/11/bin/df/df.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/df/df.c
==============================================================================
--- stable/11/bin/df/df.c	Sun Feb 18 20:08:35 2018	(r329529)
+++ stable/11/bin/df/df.c	Sun Feb 18 20:49:43 2018	(r329530)
@@ -249,9 +249,11 @@ main(int argc, char *argv[])
 				rv = 1;
 				continue;
 			}
-#ifdef MOUNT_CHAR_DEVS
 		} else if (S_ISCHR(stbuf.st_mode)) {
 			if ((mntpt = getmntpt(*argv)) == NULL) {
+#ifdef MOUNT_CHAR_DEVS
+				xo_warnx(
+				    "df on unmounted devices is deprecated");
 				mdev.fspec = *argv;
 				mntpath = strdup("/tmp/df.XXXXXX");
 				if (mntpath == NULL) {
@@ -300,8 +302,12 @@ main(int argc, char *argv[])
 				(void)rmdir(mntpt);
 				free(mntpath);
 				continue;
-			}
+#else
+				xo_warnx("%s: not mounted", *argv);
+				rv = 1;
+				continue;
 #endif
+			}
 		} else
 			mntpt = *argv;