X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futime.c;h=906cec8d7900f77186961e9e2f19836400f71210;hb=8de557e31178699dd6e839850056f0653cdfba89;hp=6ed14ef30d0ae5f17812b8bf30cd418516d3327a;hpb=482b6449667c8a61282dfb1753e06d5b5cb73fb8;p=gnulib.git

diff --git a/lib/utime.c b/lib/utime.c
index 6ed14ef30..906cec8d7 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* derived from a function in touch.c */
 
@@ -27,6 +27,14 @@
 # include <utime.h>
 #endif
 
+#if !HAVE_UTIMES_NULL
+# include <sys/stat.h>
+# include <fcntl.h>
+#endif
+
+#include <unistd.h>
+#include <errno.h>
+
 #include "full-write.h"
 #include "safe-read.h"
 
@@ -53,21 +61,36 @@ utime_null (const char *file)
   int fd;
   char c;
   int status = 0;
-  struct stat sb;
+  struct stat st;
+  int saved_errno = 0;
 
   fd = open (file, O_RDWR);
   if (fd < 0
-      || fstat (fd, &sb) < 0
-      || safe_read (fd, &c, sizeof c) < 0
+      || fstat (fd, &st) < 0
+      || safe_read (fd, &c, sizeof c) == SAFE_READ_ERROR
       || lseek (fd, (off_t) 0, SEEK_SET) < 0
       || full_write (fd, &c, sizeof c) != sizeof c
-      /* Maybe do this -- it's necessary on SunOS4.1.3 with some combination
+      /* Maybe do this -- it's necessary on SunOS 4.1.3 with some combination
 	 of patches, but that system doesn't use this code: it has utimes.
 	 || fsync (fd) < 0
       */
-      || ftruncate (fd, st.st_size) < 0
-      || close (fd) < 0)
-    status = -1;
+      || (st.st_size == 0 && ftruncate (fd, st.st_size) < 0))
+    {
+      saved_errno = errno;
+      status = -1;
+    }
+
+  if (0 <= fd)
+    {
+      if (close (fd) < 0)
+	status = -1;
+
+      /* If there was a prior failure, use the saved errno value.
+	 But if the only failure was in the close, don't change errno.  */
+      if (saved_errno)
+	errno = saved_errno;
+    }
+
   return status;
 #endif
 }