X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futime.c;h=f7107abdd3653f88ae829a9362032dfd00156fbc;hb=c04bc106f2977f098ccc8a29da37af55c2d098ad;hp=557444c0d30d8b71b6f4482a17fce3cdfeb2d768;hpb=3e65438376f090a29ee885c8e94e248f819f8e2e;p=gnulib.git

diff --git a/lib/utime.c b/lib/utime.c
index 557444c0d..f7107abdd 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, 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,7 @@
 # include <utime.h>
 #endif
 
+#include "full-write.h"
 #include "safe-read.h"
 
 /* Some systems (even some that do have <utime.h>) don't declare this
@@ -54,17 +55,17 @@ utime_null (const char *file)
   int status = 0;
   struct stat sb;
 
-  fd = open (file, O_RDWR, 0666);
+  fd = open (file, O_RDWR);
   if (fd < 0
       || fstat (fd, &sb) < 0
-      || safe_read (fd, &c, sizeof (char)) < 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;