mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 19:00:09 +00:00
c22845744c
This patch consolidates all the non cancellable open calls to use
the __open_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.
To be consistent with the following non cancellable openat call, a
new __open64_nocancel is also added (although not currently used).
Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.
* sysdeps/generic/not-cancel.h (open_not_cancel): Remove macro.
(open_not_cancel_2): Likewise.
(open_nocancel): New macro.
(open64_nocancel): Likewise.
* sysdeps/unix/sysv/linux/not-cancel.h (open_not_cancel): Remove macro.
(open_not_cancel_2): Likewise.
(__open_nocancel): New prototype.
(__open64_nocancel): Likewise.
* sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add
__open_nocancel.
* sysdeps/unix/sysv/linux/open.c (__open_nocancel): New function.
* sysdeps/unix/sysv/linux/open64.c (__open64_nocancel): Likewise.
* catgets/open_catalog.c (__open_catalog): Replace open_not_cancel{_2}
with __open_nocancel.
* csu/check_fds.c (check_one_fd): Likewise.
* gmon/gmon.c (write_gmon): Likewise.
* iconv/gconv_cache.c (__gconv_load_cached): Likewise.
* intl/loadmsgcat.c (open): Likewise.
* libio/fileops.c (_IO_file_open): Likewise.
* locale/loadarchive.c (_nl_load_locale_from_archive): Likewise.
* locale/loadlocale.c (_nl_load_locale): Likewise.
* login/utmp_file.c (setutent_file): Likewise.
* misc/daemon.c (daemon): Likewise.
* nss/nss_db/db-open.c (internal_setent): Likewise.
* sysdeps/mach/hurd/opendir.c (__opendirat): Likewise.
* sysdeps/posix/libc_fatal.c (__libc_message): Likewise.
* sysdeps/posix/opendir.c (tryopen_o_directory): Likewise.
(__opendir): Likewise.
* sysdeps/posix/spawni.c (__spawni_child): Likewise.
* sysdeps/unix/sysv/linux/fips-private.h (fips_enable_p): Likewise.
* sysdeps/unix/sysv/linux/gethostid.c (sethostid): Likewise.
(gethostid): Likewise.
* sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise.
* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):
Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Likewise.
* sysdeps/unix/sysv/linux/grantpt.c (__close_all_fds): Likewise.
* sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise.
* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock):
Likewise.
* sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps):
Likewise.
* sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap):
Likewise.
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c (__get_clockfreq):
Likewise.
* sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np):
Likewise.
* sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np):
Likewise.
* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise.
* sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
86 lines
2.2 KiB
C
86 lines
2.2 KiB
C
/* Copyright (C) 1991-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 <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <stdarg.h>
|
|
|
|
#include <sysdep-cancel.h>
|
|
#include <not-cancel.h>
|
|
|
|
#ifdef __OFF_T_MATCHES_OFF64_T
|
|
# define EXTRA_OPEN_FLAGS 0
|
|
#else
|
|
# define EXTRA_OPEN_FLAGS O_LARGEFILE
|
|
#endif
|
|
|
|
/* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG,
|
|
a third argument is the file protection. */
|
|
int
|
|
__libc_open64 (const char *file, int oflag, ...)
|
|
{
|
|
int mode = 0;
|
|
|
|
if (__OPEN_NEEDS_MODE (oflag))
|
|
{
|
|
va_list arg;
|
|
va_start (arg, oflag);
|
|
mode = va_arg (arg, int);
|
|
va_end (arg);
|
|
}
|
|
|
|
return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag | EXTRA_OPEN_FLAGS,
|
|
mode);
|
|
}
|
|
|
|
strong_alias (__libc_open64, __open64)
|
|
libc_hidden_weak (__open64)
|
|
weak_alias (__libc_open64, open64)
|
|
|
|
# if !IS_IN (rtld)
|
|
int
|
|
__open64_nocancel (const char *file, int oflag, ...)
|
|
{
|
|
int mode = 0;
|
|
|
|
if (__OPEN_NEEDS_MODE (oflag))
|
|
{
|
|
va_list arg;
|
|
va_start (arg, oflag);
|
|
mode = va_arg (arg, int);
|
|
va_end (arg);
|
|
}
|
|
|
|
return INLINE_SYSCALL_CALL (openat, AT_FDCWD, file, oflag | EXTRA_OPEN_FLAGS,
|
|
mode);
|
|
}
|
|
#else
|
|
strong_alias (__libc_open64, __open64_nocancel)
|
|
#endif
|
|
libc_hidden_def (__open64_nocancel)
|
|
|
|
#ifdef __OFF_T_MATCHES_OFF64_T
|
|
strong_alias (__libc_open64, __libc_open)
|
|
strong_alias (__libc_open64, __open)
|
|
libc_hidden_weak (__open)
|
|
weak_alias (__libc_open64, open)
|
|
|
|
strong_alias (__open64_nocancel, __open_nocancel)
|
|
libc_hidden_weak (__open_nocancel)
|
|
#endif
|