GNU file utilities

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 235a9ca..45780d8 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -50,7 +50,7 @@ stripslash.o xgetcwd.o xmalloc.o xstrdup.o userspec.o yesno.o \
 
 DISTFILES = Makefile.in backupfile.h getopt.h modechange.h \
 fnmatch.h fsusage.h mountlist.h pathmax.h safe-xstat.c.in safe-xstat.h.in \
-$(SOURCES)
+getdate.c posixtm.c $(SOURCES)
 
 all: libfu.a
 
@@ -148,6 +148,7 @@ getopt1.o: getopt.h
 modechange.o: modechange.h
 mountlist.o: mountlist.h
 xgetcwd.o: pathmax.h
+eaccess.o fsusage.o isdir.o makepath.o mkdir.o rename.o: safe-stat.h
 
 # 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.

diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index bfd0ae5..04156b7 100644 (file)
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -1,5 +1,5 @@
 /* ftruncate emulations that work on some System V's.
-   This file is in the public domain. */
+   This file is in the public domain.  */
 
 #ifdef HAVE_CONFIG_H
 #if defined (CONFIG_BROKETS)
@@ -15,7 +15,13 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include <errno.h>
+#ifndef STDC_HEADERS
+extern int errno;
+#endif
+
 #ifdef F_CHSIZE
+
 int
 ftruncate (fd, length)
      int fd;
@@ -23,14 +29,17 @@ ftruncate (fd, length)
 {
   return fcntl (fd, F_CHSIZE, length);
 }
-#else
+
+#else /* not F_CHSIZE */
 #ifdef F_FREESP
-/* The following function was written by
-   kucharsk@Solbourne.com (William Kucharski) */
+
+/* By William Kucharski <kucharsk@netcom.com>.  */
 
 #include <sys/stat.h>
-#include <errno.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 int
 ftruncate (fd, length)
@@ -55,23 +64,28 @@ ftruncate (fd, length)
     }
   else
     {
+
       /* Truncate length. */
+
       fl.l_whence = 0;
       fl.l_len = 0;
       fl.l_start = length;
-      fl.l_type = F_WRLCK;     /* Write lock on file space. */
+      fl.l_type = F_WRLCK;     /* write lock on file space */
+
+      /* This relies on the *undocumented* F_FREESP argument to fcntl,
+        which truncates the file so that it ends at the position
+        indicated by fl.l_start.  Will minor miracles never cease?  */
 
-      /* This relies on the UNDOCUMENTED F_FREESP argument to
-        fcntl, which truncates the file so that it ends at the
-        position indicated by fl.l_start.
-        Will minor miracles never cease? */
       if (fcntl (fd, F_FREESP, &fl) < 0)
        return -1;
     }
 
   return 0;
 }
-#else
+
+#else /* not F_CHSIZE nor F_FREESP */
+#ifdef HAVE_CHSIZE
+
 int
 ftruncate (fd, length)
      int fd;
@@ -79,5 +93,18 @@ ftruncate (fd, length)
 {
   return chsize (fd, length);
 }
-#endif
-#endif
+
+#else /* not F_CHSIZE nor F_FREESP nor HAVE_CHSIZE */
+
+int
+ftruncate (fd, length)
+     int fd;
+     off_t length;
+{
+  errno = EIO;
+  return -1;
+}
+
+#endif /* not HAVE_CHSIZE */
+#endif /* not F_FREESP */
+#endif /* not F_CHSIZE */