merge with 3.4.1

diff --git a/lib/Makefile.in b/lib/Makefile.in
index d441c4e3c2b579208fd56ffc329457505d041695..fb21e13dc431ce60788a00d984f54a6974c0e3b4 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -64,7 +64,10 @@ realclean: distclean
        rm -f TAGS
 
 dist:
-       ln $(DISTFILES) ../`cat ../.fname`/lib
+       for file in $(DISTFILES); do \
+         ln $$file ../`cat ../.fname`/lib \
+           || cp $$file ../`cat ../.fname`/lib; \
+       done
 
 libfu.a: $(OBJECTS)
        rm -f $@

diff --git a/lib/dirname.c b/lib/dirname.c
index 7467d29e853d51df40056adc48ce5124223166fb..5a92ce557ff6d6f08fc9e527ddbea90dea46752f 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -20,7 +20,7 @@
 #else
 char *malloc ();
 #endif
-#if defined(USG) || defined(STDC_HEADERS)
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
 #ifndef rindex
 #define rindex strrchr

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 8cc0c6d7333d858177ed4b1ebfc9b85e72eee151..b434913439e67a5c53af495e94e96ef0c240cb1d 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -56,14 +56,18 @@ int statvfs ();
 /* Return the number of TOSIZE-byte blocks used by
    BLOCKS FROMSIZE-byte blocks, rounding up.  */
 
-#define adjust_blocks(blocks, fromsize, tosize)                \
-  (((fromsize) == (tosize))                            \
-   ? (blocks)  /* E.g., from 512 to 512.  */           \
-   : (((fromsize) > (tosize))                          \
-      /* E.g., from 2048 to 512.  */                   \
-      ? (blocks) * ((fromsize) / (tosize))             \
-      /* E.g., from 256 to 512.  */                    \
-      : ((blocks) + 1) / ((tosize) / (fromsize))))
+static long
+adjust_blocks (blocks, fromsize, tosize)
+     long blocks;
+     int fromsize, tosize;
+{
+  if (fromsize == tosize)      /* E.g., from 512 to 512.  */
+    return blocks;
+  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);
+}
 
 /* Fill in the fields of FSP with information about space usage for
    the filesystem on which PATH resides.

diff --git a/lib/makepath.c b/lib/makepath.c
index 98b78a1e658e69d7aa5b91107b69af45838ffe7a..3ca5c97654ac29e5073bf359afbff2abef36c223 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -49,9 +49,11 @@ char *alloca ();
 extern int errno;
 #endif
 
-#if defined(USG) || defined(STDC_HEADERS)
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
+#ifndef index
 #define index strchr
+#endif
 #else
 #include <strings.h>
 #endif