X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futime.c;h=f5507cbcd84ccb6250b76ff0bacb5dfec2a5da97;hb=03d089ba4969314534caeaa7da66cb7f9dc98fb2;hp=197b661936104c915b8833504f4bb6e783384e54;hpb=2365267f254b99cc3eeaaada4afe4d513f7e9ce4;p=gnulib.git

diff --git a/lib/utime.c b/lib/utime.c
index 197b66193..f5507cbcd 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001-2002 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
@@ -58,14 +58,14 @@ utime_null (const char *file)
   fd = open (file, O_RDWR);
   if (fd < 0
       || fstat (fd, &sb) < 0
-      || safe_read (fd, &c, sizeof c) < 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
 	 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;