diff options
| author | Paul Eggert | 2017-08-16 13:55:46 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-08-16 14:04:33 -0700 |
| commit | 794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1 (patch) | |
| tree | 728839628834cbd80dc3bd8f795e9a5598fdffaf /lib/cloexec.c | |
| parent | 69f2b755f44a5e447b3ad482ce0b409764fa10e6 (diff) | |
| download | emacs-794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1.tar.gz emacs-794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1.zip | |
Merge from Gnulib; use ‘open’ for O_CLOEXEC
This incorporates:
2017-08-15 renameat: ensure declaration in <stdio.h> 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.
Diffstat (limited to 'lib/cloexec.c')
| -rw-r--r-- | lib/cloexec.c | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/lib/cloexec.c b/lib/cloexec.c new file mode 100644 index 00000000000..e34aef87976 --- /dev/null +++ b/lib/cloexec.c | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | /* cloexec.c - set or clear the close-on-exec descriptor flag | ||
| 2 | |||
| 3 | Copyright (C) 1991, 2004-2006, 2009-2017 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | This program is free software: you can redistribute it and/or modify | ||
| 6 | it under the terms of the GNU General Public License as published by | ||
| 7 | the Free Software Foundation; either version 3 of the License, or | ||
| 8 | (at your option) any later version. | ||
| 9 | |||
| 10 | This program is distributed in the hope that it will be useful, | ||
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | GNU General Public License for more details. | ||
| 14 | |||
| 15 | You should have received a copy of the GNU General Public License | ||
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | |||
| 18 | The code is taken from glibc/manual/llio.texi */ | ||
| 19 | |||
| 20 | #include <config.h> | ||
| 21 | |||
| 22 | #include "cloexec.h" | ||
| 23 | |||
| 24 | #include <errno.h> | ||
| 25 | #include <fcntl.h> | ||
| 26 | #include <unistd.h> | ||
| 27 | |||
| 28 | /* Set the 'FD_CLOEXEC' flag of DESC if VALUE is true, | ||
| 29 | or clear the flag if VALUE is false. | ||
| 30 | Return 0 on success, or -1 on error with 'errno' set. | ||
| 31 | |||
| 32 | Note that on MingW, this function does NOT protect DESC from being | ||
| 33 | inherited into spawned children. Instead, either use dup_cloexec | ||
| 34 | followed by closing the original DESC, or use interfaces such as | ||
| 35 | open or pipe2 that accept flags like O_CLOEXEC to create DESC | ||
| 36 | non-inheritable in the first place. */ | ||
| 37 | |||
| 38 | int | ||
| 39 | set_cloexec_flag (int desc, bool value) | ||
| 40 | { | ||
| 41 | #ifdef F_SETFD | ||
| 42 | |||
| 43 | int flags = fcntl (desc, F_GETFD, 0); | ||
| 44 | |||
| 45 | if (0 <= flags) | ||
| 46 | { | ||
| 47 | int newflags = (value ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC); | ||
| 48 | |||
| 49 | if (flags == newflags | ||
| 50 | || fcntl (desc, F_SETFD, newflags) != -1) | ||
| 51 | return 0; | ||
| 52 | } | ||
| 53 | |||
| 54 | return -1; | ||
| 55 | |||
| 56 | #else /* !F_SETFD */ | ||
| 57 | |||
| 58 | /* Use dup2 to reject invalid file descriptors; the cloexec flag | ||
| 59 | will be unaffected. */ | ||
| 60 | if (desc < 0) | ||
| 61 | { | ||
| 62 | errno = EBADF; | ||
| 63 | return -1; | ||
| 64 | } | ||
| 65 | if (dup2 (desc, desc) < 0) | ||
| 66 | /* errno is EBADF here. */ | ||
| 67 | return -1; | ||
| 68 | |||
| 69 | /* There is nothing we can do on this kind of platform. Punt. */ | ||
| 70 | return 0; | ||
| 71 | #endif /* !F_SETFD */ | ||
| 72 | } | ||
| 73 | |||
| 74 | |||
| 75 | /* Duplicates a file handle FD, while marking the copy to be closed | ||
| 76 | prior to exec or spawn. Returns -1 and sets errno if FD could not | ||
| 77 | be duplicated. */ | ||
| 78 | |||
| 79 | int | ||
| 80 | dup_cloexec (int fd) | ||
| 81 | { | ||
| 82 | return fcntl (fd, F_DUPFD_CLOEXEC, 0); | ||
| 83 | } | ||