X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futime.c;h=05aa3467ccc947aa3343570f5581ebd11b0edade;hb=7acea197e2d653876ae7113d5538a4544ce60d84;hp=25657eea9f19559c3104ebba745c1aedb53a3fe2;hpb=0cc0b7f8af10bd3b826f79e0cf596b24c742299c;p=gnulib.git

diff --git a/lib/utime.c b/lib/utime.c
index 25657eea9..05aa3467c 100644
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2001, 2002, 2003 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
@@ -32,6 +32,9 @@
 # include <fcntl.h>
 #endif
 
+#include <unistd.h>
+#include <errno.h>
+
 #include "full-write.h"
 #include "safe-read.h"
 
@@ -59,6 +62,7 @@ utime_null (const char *file)
   char c;
   int status = 0;
   struct stat st;
+  int saved_errno = 0;
 
   fd = open (file, O_RDWR);
   if (fd < 0
@@ -70,9 +74,23 @@ utime_null (const char *file)
 	 of patches, but that system doesn't use this code: it has utimes.
 	 || fsync (fd) < 0
       */
-      || (st.st_size == 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
 }