about summary refs log tree commit diff
path: root/sysdeps/mach/hurd/openat.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-28 14:27:36 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-28 15:11:23 +0000
commit4cafcd839f8c002c290ec96c64b6d85e87e270e8 (patch)
treec05a300192173a1d1f3c593534703aaf0a6c374b /sysdeps/mach/hurd/openat.c
parent67a78072e2891b8b16a7bfb20675844a5854cff1 (diff)
downloadglibc-4cafcd839f8c002c290ec96c64b6d85e87e270e8.tar.gz
glibc-4cafcd839f8c002c290ec96c64b6d85e87e270e8.tar.xz
glibc-4cafcd839f8c002c290ec96c64b6d85e87e270e8.zip
hurd: make open and openat cancellation points
and add _nocancel variants.

* sysdeps/mach/hurd/Makefile [io] (sysdep_routines): Add open_nocancel
openat_nocancel.
* sysdeps/mach/hurd/Versions (libc.GLIBC_PRIVATE, ld.GLIBC_PRIVATE): Add
__open_nocancel.
* sysdeps/mach/hurd/dl-sysdep.c (__open_nocancel): Add alias, check it
is not hidden.
* sysdeps/mach/hurd/i386/localplt.data (__open_nocancel): Allow PLT.
* sysdeps/mach/hurd/not-cancel.h (__open_nocancel, __openat_nocancel:
Replace macros with declarations with hidden proto.
(__open64_nocancel, __openat64_nocancel): Call __open_nocancel and
__openat_nocancel instead of __open64 and __openat64.
* sysdeps/mach/hurd/open.c: Include <sysdep-cancel.h>
(__libc_open): Surround __file_name_lookup with enabling async cancel.
* sysdeps/mach/hurd/openat.c: Likewise.
* sysdeps/mach/hurd/open_nocancel.c,
sysdeps/mach/hurd/openat_nocancel.c: New files.
Diffstat (limited to 'sysdeps/mach/hurd/openat.c')
-rw-r--r--sysdeps/mach/hurd/openat.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/openat.c b/sysdeps/mach/hurd/openat.c
index 7e241cd36f..5842da05d7 100644
--- a/sysdeps/mach/hurd/openat.c
+++ b/sysdeps/mach/hurd/openat.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <hurd.h>
 #include <hurd/fd.h>
+#include <sysdep-cancel.h>
 
 /* Open FILE with access OFLAG.  Interpret relative paths relative to
    the directory associated with FD.  If O_CREAT or O_TMPFILE is in OFLAG, a
@@ -33,6 +34,7 @@ __openat (int fd, const char *file, int oflag, ...)
 {
   mode_t mode;
   io_t port;
+  int cancel_oldtype;
 
   if (__OPEN_NEEDS_MODE (oflag))
     {
@@ -44,7 +46,10 @@ __openat (int fd, const char *file, int oflag, ...)
   else
     mode = 0;
 
+  cancel_oldtype = LIBC_CANCEL_ASYNC();
   port = __file_name_lookup_at (fd, 0, file, oflag, mode);
+  LIBC_CANCEL_RESET (cancel_oldtype);
+
   if (port == MACH_PORT_NULL)
     return -1;