diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-28 15:51:40 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-28 16:34:14 +0000 |
| commit | fd3df63fb6649720098597ced59eaa3969bbe067 (patch) | |
| tree | 0b2af09bc08daa4c103e0ab0d7ef5b2bc3728a20 /sysdeps/mach/hurd/close.c | |
| parent | 4cafcd839f8c002c290ec96c64b6d85e87e270e8 (diff) | |
| download | glibc-fd3df63fb6649720098597ced59eaa3969bbe067.tar.gz glibc-fd3df63fb6649720098597ced59eaa3969bbe067.tar.xz glibc-fd3df63fb6649720098597ced59eaa3969bbe067.zip | |
hurd: make close a cancellation point
and add _nocancel variant. * sysdeps/mach/hurd/Makefile [io] (sysdep_routines): Add close_nocancel. * sysdeps/mach/hurd/Versions (libc.GLIBC_PRIVATE, ld.GLIBC_PRIVATE): Add __close_nocancel. * sysdeps/mach/hurd/i386/localplt.data (__close_nocancel): Allow PLT. * sysdeps/mach/hurd/close.c: Include <sysdep-cancel.h> (__libc_close): Surround _hurd_fd_close with enabling async cancel. * sysdeps/mach/hurd/close_nocancel.c: New file. * sysdeps/mach/hurd/not-cancel.h (__close_nocancel): Replace macro with declaration with hidden proto.
Diffstat (limited to 'sysdeps/mach/hurd/close.c')
| -rw-r--r-- | sysdeps/mach/hurd/close.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/close.c b/sysdeps/mach/hurd/close.c index 4b1e203084..b461087447 100644 --- a/sysdeps/mach/hurd/close.c +++ b/sysdeps/mach/hurd/close.c @@ -19,14 +19,18 @@ #include <unistd.h> #include <hurd.h> #include <hurd/fd.h> +#include <sysdep-cancel.h> /* Close the file descriptor FD. */ int __close (int fd) { error_t err; + int cancel_oldtype; + cancel_oldtype = LIBC_CANCEL_ASYNC(); err = HURD_FD_USE (fd, _hurd_fd_close (descriptor)); + LIBC_CANCEL_RESET (cancel_oldtype); return err ? __hurd_fail (err) : 0; } |