diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:20:53 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:21:19 +0000 |
| commit | 68e2fa8ed9dbf0edfdaed0310801e764c12af46e (patch) | |
| tree | 101f4c8b7ec20470739855bc4cf0cc4fb01f6f4b /sysdeps/mach/hurd/opendir.c | |
| parent | f1018448e82ec658352d1dc6cefb65b70f564cad (diff) | |
| parent | 8d59503b977070aaa4e504e8d6dcb7da3711893e (diff) | |
Merge commit 'refs/top-bases/t/gsync-libc' into t/gsync-libc
Diffstat (limited to 'sysdeps/mach/hurd/opendir.c')
| -rw-r--r-- | sysdeps/mach/hurd/opendir.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c index a62af6ffcd..bda138e439 100644 --- a/sysdeps/mach/hurd/opendir.c +++ b/sysdeps/mach/hurd/opendir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -69,7 +69,6 @@ _hurd_fd_opendir (struct hurd_fd *d) DIR * -internal_function __opendirat (int dfd, const char *name) { if (name[0] == '\0') @@ -84,9 +83,9 @@ __opendirat (int dfd, const char *name) int fd; #if IS_IN (rtld) assert (dfd == AT_FDCWD); - fd = open_not_cancel_2 (name, flags); + fd = __open_nocancel (name, flags); #else - fd = openat_not_cancel_3 (dfd, name, flags); + fd = __openat_nocancel (dfd, name, flags); #endif if (fd < 0) return NULL; |