changeset 97:7e7718a3da17

merge with 3.8.2
author Jim Meyering <jim@meyering.net>
date Thu, 26 Aug 1993 04:38:45 +0000
parents 02559910dc99
children 010b9037a960
files lib/Makefile.in lib/fnmatch.c lib/fsusage.c
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lib/Makefile.in	Thu Aug 05 02:20:59 1993 +0000
+++ b/lib/Makefile.in	Thu Aug 26 04:38:45 1993 +0000
@@ -108,5 +108,6 @@
 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:
--- a/lib/fnmatch.c	Thu Aug 05 02:20:59 1993 +0000
+++ b/lib/fnmatch.c	Thu Aug 26 04:38:45 1993 +0000
@@ -16,7 +16,7 @@
 Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>
--- a/lib/fsusage.c	Thu Aug 05 02:20:59 1993 +0000
+++ b/lib/fsusage.c	Thu Aug 26 04:38:45 1993 +0000
@@ -58,7 +58,7 @@
 #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 @@
   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