mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
0bb2fabcb3
This patch consolidates all the non cancellable openat{64} calls to use
the __openat{64}_nocancel identifier. For non cancellable targets it will
be just a macro to call the default respective symbol while on Linux
will be a internal one.
Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.
* sysdeps/generic/not-cancel.h (openat_not_cancel): Remove macro.
(openat_not_cancel_3): Likewise.
(openat64_not_cancel_3): Likewise).
(openat_not_cancel_3): Likewise).
* sysdeps/unix/sysv/linux/not-cancel.h (openat_not_cancel): Remove
macro.
(openat_not_cancel_3): Likewise.
(openat64_not_cancel): Likewise.
(openat64_not_cancel_3): Likewise.
* sysdeps/unix/sysv/linux/openat.c (__openat_nocancel): New function.
* sysdeps/unix/sysv/linux/openat64.c (__openat64_nocancel): Likewise.
* io/ftw.c (open_dir_stream): Replace openat{64}_not_cancel{_3} with
__open{64}_nocancel.
* sysdeps/mach/hurd/opendir.c (__opendirat): Likewise.
* sysdeps/posix/getcwd.c (__getcwd): Likewise.
* sysdeps/posix/opendir.c (__opendirat): Likewise.
67 lines
1.9 KiB
C
67 lines
1.9 KiB
C
/* Copyright (C) 2005-2017 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <fcntl.h>
|
|
#include <stdarg.h>
|
|
|
|
#include <sysdep-cancel.h>
|
|
#include <not-cancel.h>
|
|
|
|
#ifndef __OFF_T_MATCHES_OFF64_T
|
|
|
|
/* Open FILE with access OFLAG. Interpret relative paths relative to
|
|
the directory associated with FD. If OFLAG includes O_CREAT or
|
|
O_TMPFILE, a fourth argument is the file protection. */
|
|
int
|
|
__libc_openat (int fd, const char *file, int oflag, ...)
|
|
{
|
|
mode_t mode = 0;
|
|
if (__OPEN_NEEDS_MODE (oflag))
|
|
{
|
|
va_list arg;
|
|
va_start (arg, oflag);
|
|
mode = va_arg (arg, mode_t);
|
|
va_end (arg);
|
|
}
|
|
|
|
return SYSCALL_CANCEL (openat, fd, file, oflag, mode);
|
|
}
|
|
weak_alias (__libc_openat, __openat)
|
|
libc_hidden_weak (__openat)
|
|
weak_alias (__libc_openat, openat)
|
|
|
|
# if !IS_IN (rtld)
|
|
int
|
|
__openat_nocancel (int fd, const char *file, int oflag, ...)
|
|
{
|
|
mode_t mode = 0;
|
|
if (__OPEN_NEEDS_MODE (oflag))
|
|
{
|
|
va_list arg;
|
|
va_start (arg, oflag);
|
|
mode = va_arg (arg, mode_t);
|
|
va_end (arg);
|
|
}
|
|
|
|
return INLINE_SYSCALL_CALL (openat, fd, file, oflag, mode);
|
|
}
|
|
# else
|
|
strong_alias (__libc_openat, __openat_nocancel)
|
|
# endif
|
|
libc_hidden_weak (__openat_nocancel)
|
|
#endif
|