diff options
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Versions | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/close_nocancel_nostatus.c | 30 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/not-cancel.h | 10 |
4 files changed, 37 insertions, 6 deletions
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 0ae65291d3..6b48d8f843 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -196,7 +196,7 @@ sysdep_routines += cthreads endif ifeq (io, $(subdir)) -sysdep_routines += f_setlk +sysdep_routines += f_setlk close_nocancel_nostatus endif ifeq ($(subdir),sunrpc) diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions index 9dee71efa3..6ddd2977f6 100644 --- a/sysdeps/mach/hurd/Versions +++ b/sysdeps/mach/hurd/Versions @@ -13,6 +13,7 @@ libc { __libc_lock_self0; __sigprocmask; __getcwd; _dl_init_first; + __close_nocancel_nostatus; } } diff --git a/sysdeps/mach/hurd/close_nocancel_nostatus.c b/sysdeps/mach/hurd/close_nocancel_nostatus.c new file mode 100644 index 0000000000..0c7c8acfba --- /dev/null +++ b/sysdeps/mach/hurd/close_nocancel_nostatus.c @@ -0,0 +1,30 @@ +/* Copyright (C) 1991-2019 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <unistd.h> +#include <hurd.h> +#include <hurd/fd.h> +#include <not-cancel.h> + +/* Close the file descriptor FD. */ +void +__close_nocancel_nostatus (int fd) +{ + HURD_FD_USE (fd, _hurd_fd_close (descriptor)); +} +libc_hidden_def (__close_nocancel_nostatus) diff --git a/sysdeps/mach/hurd/not-cancel.h b/sysdeps/mach/hurd/not-cancel.h index b78870a5b7..c9a67c199d 100644 --- a/sysdeps/mach/hurd/not-cancel.h +++ b/sysdeps/mach/hurd/not-cancel.h @@ -40,11 +40,7 @@ #define __close_nocancel(fd) \ __close (fd) -static inline void -__close_nocancel_nostatus (int fd) -{ - HURD_FD_USE (fd, _hurd_fd_close (descriptor)); -} +void __close_nocancel_nostatus (int fd); #define __read_nocancel(fd, buf, n) \ __read (fd, buf, n) @@ -59,4 +55,8 @@ __close_nocancel_nostatus (int fd) #define __fcntl64_nocancel(fd, cmd, ...) \ __fcntl64 (fd, cmd, __VA_ARGS__) +#if IS_IN (libc) || IS_IN (rtld) +hidden_proto (__close_nocancel_nostatus) +#endif + #endif /* NOT_CANCEL_H */ |