X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futime.c;h=25657eea9f19559c3104ebba745c1aedb53a3fe2;hb=dca1eba100e85c0bd42db59fc81dffa3390c7374;hp=dafa3641e32a856b64c6f6ad3d5b91123e601ed7;hpb=d349992d82f97d614404565ff66e3f8a47b4a568;p=gnulib.git

diff --git a/lib/utime.c b/lib/utime.c
index dafa3641e..25657eea9 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2003 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
@@ -27,6 +27,12 @@
 # include <utime.h>
 #endif
 
+#if !HAVE_UTIMES_NULL
+# include <sys/stat.h>
+# include <fcntl.h>
+#endif
+
+#include "full-write.h"
 #include "safe-read.h"
 
 /* Some systems (even some that do have <utime.h>) don't declare this
@@ -52,19 +58,19 @@ utime_null (const char *file)
   int fd;
   char c;
   int status = 0;
-  struct stat sb;
+  struct stat st;
 
   fd = open (file, O_RDWR);
   if (fd < 0
-      || fstat (fd, &sb) < 0
-      || safe_read (fd, &c, sizeof (char)) < 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 (char)) < 0
-      /* Maybe do this -- it's necessary on SunOS4.1.3 with some combination
+      || full_write (fd, &c, sizeof c) != sizeof c
+      /* 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
+      || (st.st_size == 0 && ftruncate (fd, st.st_size) < 0)
       || close (fd) < 0)
     status = -1;
   return status;