From 794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 16 Aug 2017 13:55:46 -0700 Subject: Merge from Gnulib; use ‘open’ for O_CLOEXEC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This incorporates: 2017-08-15 renameat: ensure declaration in on NetBSD 2017-08-15 extensions: enable NetBSD specific extensions 2017-08-14 open: support O_CLOEXEC 2017-08-13 reallocarray: new module * admin/merge-gnulib (AVOIDED_MODULES): Remove ‘open’, since it now supports O_CLOEXEC and this simplifies Emacs. * build-aux/config.guess, lib/fcntl.in.h, lib/stdio.in.h: * lib/stdlib.in.h, m4/extensions.m4, m4/stdlib_h.m4: Copy from Gnulib. * lib/cloexec.c, lib/cloexec.h, lib/open.c: * m4/mode_t.m4, m4/open-cloexec.m4, m4/open.m4: New files, copied from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib-src/etags.c (O_CLOEXEC) [WINDOWSNT]: Remove, as Gnulib does this for us. * src/filelock.c (create_lock_file): * src/sysdep.c (emacs_open, emacs_pipe): Don’t worry about O_CLOEXEC == 0, as Gnulib no longer sets it to 0. --- src/filelock.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/filelock.c') diff --git a/src/filelock.c b/src/filelock.c index 3d6941695ae..fec9bc044ae 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -403,8 +403,6 @@ create_lock_file (char *lfname, char *lock_info_str, bool force) else { ptrdiff_t lock_info_len; - if (! O_CLOEXEC) - fcntl (fd, F_SETFD, FD_CLOEXEC); lock_info_len = strlen (lock_info_str); err = 0; if (emacs_write (fd, lock_info_str, lock_info_len) != lock_info_len -- cgit v1.2.3