From: Jim Meyering <jim@meyering.net>
Date: Sat, 8 Oct 1994 16:56:34 +0000 (+0000)
Subject: merge with 3.9j
X-Git-Tag: textutils-1_12_1~535
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8670c071b3faac57f161edd0abe9491153ba76b;p=thirdparty%2Fcoreutils.git

merge with 3.9j
---

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index bdd6c3bf74..0af84e4b18 100644
--- 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 dd419ac7bd..8801c87eca 100644
--- 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