procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* fileio.c (Fcopy_file): Pacify gcc re fchown. (Bug#9002)

Browse source 
This works around a problem with the previous change to Fcopy_file.
Recent glibc declares fchown with __attribute__((warn_unused_result)),
and without this change, GCC might complain about discarding
fchown's return value.
This commit is contained in:
Paul Eggert 2011-07-16 18:18:51 -07:00
parent 4e190b801d
commit 9e381cdd96
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2011-07-17 Paul Eggert <eggert@cs.ucla.edu>
* fileio.c (Fcopy_file): Pacify gcc re fchown. (Bug#9002)
This works around a problem with the previous change to Fcopy_file.
Recent glibc declares fchown with __attribute__((warn_unused_result)),
and without this change, GCC might complain about discarding
fchown's return value.
2011-07-16 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059).

4
src/fileio.c
View file

@ -38,6 +38,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <selinux/context.h>
#endif
#include <ignore-value.h>
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
@ -1960,7 +1962,7 @@ on the system, we copy the SELinux context of FILE to NEWNAME. */)
if (input_file_statable_p)
{
if (!NILP (preserve_uid_gid))
fchown (ofd, st.st_uid, st.st_gid);
ignore_value (fchown (ofd, st.st_uid, st.st_gid));
if (fchmod (ofd, st.st_mode & 07777) != 0)
report_file_error ("Doing chmod", Fcons (newname, Qnil));
}