From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 21 Mar 2011 02:40:27 +0000 (-0700)
Subject: * fileio.c (Fcopy_file): Report error if fchown or fchmod fail.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81e56e612dab7d80485c640068531710a713d205;p=emacs.git

* fileio.c (Fcopy_file): Report error if fchown or fchmod fail.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c97331a78e5..fdf57152294 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* fileio.c (Fcopy_file): Report error if fchown or fchmod fail.
+
 2011-03-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* emacs.c (Fdaemon_initialized): Do not ignore I/O errors (Bug#8303).
diff --git a/src/fileio.c b/src/fileio.c
index 5d33fb93878..7d2f10d517c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1951,9 +1951,10 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
      owner and group.  */
   if (input_file_statable_p)
     {
-      if (! NILP (preserve_uid_gid))
-	fchown (ofd, st.st_uid, st.st_gid);
-      fchmod (ofd, st.st_mode & 07777);
+      if (!NILP (preserve_uid_gid) && fchown (ofd, st.st_uid, st.st_gid) != 0)
+	report_file_error ("Doing chown", Fcons (newname, Qnil));
+      if (fchmod (ofd, st.st_mode & 07777) != 0)
+	report_file_error ("Doing chmod", Fcons (newname, Qnil));
     }
 #endif	/* not MSDOS */