merge with 3.9t

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index c28f872..7cffa83 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,5 +1,7 @@
 Thu Oct 27 00:02:45 1994  Jim Meyering  (meyering@comco.com)
 
+       * fsusage.c: Include <sys/stat.h> before safe-stat.h.
+
        * cp.c (make_path): Don't change protections on existing directory.
        Reported by Andreas Schwab.
 

diff --git a/src/df.c b/src/df.c
index 2145bfa..0be20f7 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -79,8 +79,9 @@ static int kilobyte_blocks;
 /* If nonzero, use the POSIX output format.  */
 static int posix_format;
 
-/* If nonzero, invoke the `sync' system call.  Using this option
-   can make df very slow, especially with many or very busy disks.  */
+/* If nonzero, invoke the `sync' system call before getting any usage data.
+   Using this option can make df very slow, especially with many or very
+   busy disks.  */
 static int require_sync;
 
 /* Nonzero if errors have occurred. */