From e988749cf4d49ad0712ad377a0bec9374363a8ed Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 26 Aug 1993 04:38:45 +0000 Subject: [PATCH] merge with 3.8.2 --- lib/Makefile.in | 3 ++- lib/fnmatch.c | 2 +- lib/fsusage.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index 834f23fde2..3a71cac2b6 100644 --- 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 8a25a905d1..2fb65b5216 100644 --- 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 #endif #include diff --git a/lib/fsusage.c b/lib/fsusage.c index c9ed26c878..9307a40b5a 100644 --- 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 -- 2.30.2