picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hurd: Fix __close_nocancel_nostatus availability

Browse source 
Not only libc/rtld use __close_nocancel_nostatus.

* sysdeps/mach/hurd/Makefile [$(subdir) == io] (sysdep_routines): Add
close_nocancel_nostatus.
* sysdeps/mach/hurd/Versions (libc): Add __close_nocancel_nostatus to
GLIBC_PRIVATE.
* sysdeps/mach/hurd/not-cancel.h (__close_nocancel_nostatus): Declare
function instead of defining inline.
[IS_IN (libc) || IS_IN (rtld)] (__close_nocancel_nostatus): Make
function hidden.
* sysdeps/mach/hurd/close_nocancel_nostatus.c: New file.
This commit is contained in:
Samuel Thibault 2019-12-13 03:32:21 +01:00
parent fe75ee0ca6
commit 186e119bbd
4 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysdeps/mach/hurd/Makefile
View file

@ -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)

1
sysdeps/mach/hurd/Versions
View file

@ -13,6 +13,7 @@ libc {
__libc_lock_self0; __sigprocmask; __getcwd;
_dl_init_first;
__close_nocancel_nostatus;
}
}

30
sysdeps/mach/hurd/close_nocancel_nostatus.c Normal file
View file

@ -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)

10
sysdeps/mach/hurd/not-cancel.h
View file

@ -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 */