merge with 3.8.3a

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 9307a40b5ab142efb67383f22fc4e1e95cb461a1..2f1179b231fba35edcf1713196b87ed0be33a88b 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -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 + (blocks < 0 ? -1 : +1)) / (tosize / fromsize);
+    return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
 }
 
 /* Fill in the fields of FSP with information about space usage for

diff --git a/lib/makepath.c b/lib/makepath.c
index e61579021c204d7a613dae11b92091610003131c..7699c178df79fb2e89ec3a939478d9cf670d235b 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -38,8 +38,15 @@ char *alloca ();
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
+#ifdef STAT_MACROS_BROKEN
+#ifdef S_ISDIR
+#undef S_ISDIR
+#endif
+#endif /* STAT_MACROS_BROKEN.  */
+
 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define        S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 #ifdef STDC_HEADERS

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 4ededb20ee6845463919093750393b65ceb568e1..d489f7fb2c87b726f3159dded57aa9ef4ead0c81 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,32 @@
+Tue Oct 05 14:52:02 1993  Jim Meyering  (meyering@comco.com)
+
+       * configure.in: Add AC_STAT_MACROS_BROKEN.
+
+       * isdir.c, makepath.c, rename.c, system.h [STAT_MACROS_BROKEN]:
+       Test this.
+
+       * xmalloc.c [CONFIG_BROKETS]: Test this.
+
+Thu Sep  9 08:52:10 1993  Jim Meyering  (meyering@comco.com)
+
+       * src/*.c: Print version on standard output, not stderr.
+
+Fri Aug 27 23:53:50 1993  Jim Meyering  (meyering@comco.com)
+
+       * cp.c (copy), ls.c (get_link_name): Don't use PATH_MAX as array
+       length in declarations because on some systems it gets defined
+       to the function pathconf.  Use dynamic allocation instead.
+
+       * fsusage.c (adjust_blocks): Use `1' instead of `+1'.  Many
+       compilers don't parse the latter.  From Kaveh R. Ghazi.
+
+Fri Aug 27 10:27:13 1993  Paul Eggert  (eggert@twinsun.com)
+
+       * xmalloc.c: Include "config.h" if HAVE_CONFIG_H.  Use size_t,
+       not int, when needed.
+       (VOID): New macro.  Use it when needed.
+       (error): Declaration uses varargs if required.
+
 Thu Aug 26 22:26:09 1993  Jim Meyering  (meyering@comco.com)
 
        * ls.c (print_long_format, print_file_name_and_frills): Cast inode