merge with 3.9j

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index bdd6c3bf7422850b4f8ebf54111b8fec0fcdc2c5..0af84e4b182be881a1bf8d704764b3eb9c5905a2 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,5 +1,25 @@
+Sat Oct 08 10:39:32 1994  Jim Meyering  (meyering@comco.com)
+
+       * mountlist.c: Always include <sys/param.h> if it exists.
+       (fstype_to_string) [__NetBSD__]: Don't define this function.
+       (read_filesystem_list) [__NetBSD__]: Use fsp's f_fstypename field,
+       rather than fstype_to_string (f_type).  With suggestions from
+       Greg Hudson (ghudson@mit.edu).
+
+       * lib/Makefile.in (OBJECTS): Remove eaccess.o.
+       * configure.in (AC_REPLACE_FUNCS): Add `eaccess' here instead.
+       The Hurd and Linux will have it.
+
 Fri Oct 07 20:27:48 1994  Jim Meyering  (meyering@comco.com)
 
+       * (doc): New subdirectory with texinfo documentation.
+       * fileutils.texi: Thanks to Franc,ois Pinard and Karl Berry!
+
+       * Makefile.in (All of them): Update from the ones in sh-utils.
+       From now on, rules and definitions that are comon to the fileutils,
+       textutils, and sh-utils will get ChangeLog entries only in the
+       sh-utils.
+
        * Makefile.in (install, uninstall): Prepend ginstall->install
        mapping to standard $(transform) sed mapping.
 

diff --git a/src/system.h b/src/system.h
index dd419ac7bd47f10aa6301dbe1dc5b8e45ce757e9..8801c87eca5f630461b311fadf67533ee3830dee 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -245,9 +245,6 @@ extern int errno;
    otherwise return it unchanged. */
 #define convert_blocks(b, k) ((k) ? ((b) + 1) / 2 : (b))
 
-#include "safe-stat.h"
-#include "safe-lstat.h"
-
 #ifndef RETSIGTYPE
 #define RETSIGTYPE void
 #endif