mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 02:40:06 +00:00
102dde842a
The NO_CANCELLATION macro is used currently on generic headers to define non cancellable syscalls and on Linux fcntl to implement the non cancellable variation. Former should be single-handled by not-cancel.h header and former could be simplified build both cancellable and non cancellable for default objects and alias the non-cancellable to default one for rtld ones (since Linux already support cancellation as default). This patch thus removes the NO_CANCELLATION macro and its usage. The generic non cancellable fcntl is route to internal fcntl. Checked on x86_64-linux-gnu and i686-linux-gnu. Also checked with a build again major ABIs. * sysdeps/generic/not-cancel.h (NO_CANCELLATION): Remove macro. * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (NO_CANCELLATION): Likewise * sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/not-cancel.h (__fcntl_nocancel): Add hidden prototype. * sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Define only for !IS_IN (rtld) and remove NO_CANCELLATION usage.
90 lines
2.2 KiB
C
90 lines
2.2 KiB
C
/* Copyright (C) 2000-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 <errno.h>
|
|
#include <sysdep-cancel.h>
|
|
#include <not-cancel.h>
|
|
|
|
#ifndef __NR_fcntl64
|
|
# define __NR_fcntl64 __NR_fcntl
|
|
#endif
|
|
|
|
#ifndef FCNTL_ADJUST_CMD
|
|
# define FCNTL_ADJUST_CMD(__cmd) __cmd
|
|
#endif
|
|
|
|
static int
|
|
fcntl_common (int fd, int cmd, void *arg)
|
|
{
|
|
if (cmd == F_GETOWN)
|
|
{
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
struct f_owner_ex fex;
|
|
int res = INTERNAL_SYSCALL_CALL (fcntl64, err, fd, F_GETOWN_EX, &fex);
|
|
if (!INTERNAL_SYSCALL_ERROR_P (res, err))
|
|
return fex.type == F_OWNER_GID ? -fex.pid : fex.pid;
|
|
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (res,
|
|
err));
|
|
}
|
|
|
|
return INLINE_SYSCALL_CALL (fcntl64, fd, cmd, (void *) arg);
|
|
}
|
|
|
|
int
|
|
__libc_fcntl (int fd, int cmd, ...)
|
|
{
|
|
va_list ap;
|
|
void *arg;
|
|
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, void *);
|
|
va_end (ap);
|
|
|
|
cmd = FCNTL_ADJUST_CMD (cmd);
|
|
|
|
if (cmd == F_SETLKW || cmd == F_SETLKW64)
|
|
return SYSCALL_CANCEL (fcntl64, fd, cmd, (void *) arg);
|
|
|
|
return fcntl_common (fd, cmd, arg);
|
|
}
|
|
libc_hidden_def (__libc_fcntl)
|
|
|
|
#if !IS_IN (rtld)
|
|
int
|
|
__fcntl_nocancel (int fd, int cmd, ...)
|
|
{
|
|
va_list ap;
|
|
void *arg;
|
|
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, void *);
|
|
va_end (ap);
|
|
|
|
return fcntl_common (fd, cmd, arg);
|
|
}
|
|
#else
|
|
strong_alias (__libc_fcntl, __fcntl_nocancel)
|
|
#endif
|
|
libc_hidden_def (__fcntl_nocancel)
|
|
|
|
weak_alias (__libc_fcntl, __fcntl)
|
|
libc_hidden_weak (__fcntl)
|
|
weak_alias (__libc_fcntl, fcntl)
|