merge with 3.8.2

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 834f23fde20966d957117ff16ddf289453a1d67f..3a71cac2b678b76f43807910e947cdcfc3c06996 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -108,5 +108,6 @@ modechange.o: modechange.h
 mountlist.o: mountlist.h
 xgetcwd.o: pathmax.h
 
-# Prevent GNU make v3 from overflowing arg limit on SysV.
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 8a25a905d147ca54b691b0fe56928a60e2f38ed3..2fb65b521604bf4306e494cdcfd1d31755bbc941 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -16,7 +16,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>

diff --git a/lib/fsusage.c b/lib/fsusage.c
index c9ed26c878c23618f565367c8ba70a8bf85ffc1a..9307a40b5ab142efb67383f22fc4e1e95cb461a1 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -58,7 +58,7 @@ int statvfs ();
 #endif
 
 /* Return the number of TOSIZE-byte blocks used by
-   BLOCKS FROMSIZE-byte blocks, rounding up.  */
+   BLOCKS FROMSIZE-byte blocks, rounding away from zero.  */
 
 static long
 adjust_blocks (blocks, fromsize, tosize)
@@ -70,7 +70,7 @@ adjust_blocks (blocks, fromsize, tosize)
   else if (fromsize > tosize)  /* E.g., from 2048 to 512.  */
     return blocks * (fromsize / tosize);
   else                         /* E.g., from 256 to 512.  */
-    return (blocks + 1) / (tosize / fromsize);
+    return (blocks + (blocks < 0 ? -1 : +1)) / (tosize / fromsize);
 }
 
 /* Fill in the fields of FSP with information about space usage for