mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 09:30:06 +00:00
11b076bbae
Now that files using __ASSUME_* macros have been made by <https://sourceware.org/ml/libc-alpha/2014-06/msg00543.html> to include <kernel-features.h> directly, any include from a file not using __ASSUME_* macros can safely be removed (as there will no longer be some other file relying on indirect inclusion via a header from which the include is being removed). This patch removes such unnecessary kernel-features.h includes. Tested x86_64 that disassembly of installed shared libraries is unchanged by this patch, except for line numbers in calls to __assert_fail from libc.so and ld.so. 2014-06-23 Joseph Myers <joseph@codesourcery.com> * nptl/createthread.c: Don't include kernel-features.h. * nptl/pthread_cancel.c: Likewise. * nptl/pthread_condattr_setclock.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pt-raise.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_kill.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c: Likewise. * nptl/sysdeps/unix/sysv/linux/raise.c: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_create.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_delete.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_getoverr.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_gettime.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_routines.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_settime.c: Likewise. * nscd/gai.c: Likewise. * nss/nss_db/db-open.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/sh/nptl/tls.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/aarch64/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise. * sysdeps/unix/sysv/linux/arm/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/clock_getcpuclockid.c: Likewise. * sysdeps/unix/sysv/linux/clock_getres.c: Likewise. * sysdeps/unix/sysv/linux/clock_gettime.c: Likewise. * sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise. * sysdeps/unix/sysv/linux/clock_settime.c: Likewise. * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise. * sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise. * sysdeps/unix/sysv/linux/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/generic/futimesat.c: Likewise. * sysdeps/unix/sysv/linux/generic/poll.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/mmap.S: Likewise. * sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/i386/vfork.S: Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/system.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ifaddrs.c: Likewise. * sysdeps/unix/sysv/linux/ifreq.c: Likewise. * sysdeps/unix/sysv/linux/ldsodefs.h: Likewise. * sysdeps/unix/sysv/linux/lutimes.c: Likewise. * sysdeps/unix/sysv/linux/m68k/vfork.S: Likewise. * sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/accept4.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/mmap64.c: Likewise. * sysdeps/unix/sysv/linux/netlinkaccess.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_mask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/prof-freq.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/mmap.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/s390/system.c: Likewise. * sysdeps/unix/sysv/linux/sh/pread.c: Likewise. * sysdeps/unix/sysv/linux/sh/pread64.c: Likewise. * sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise. * sysdeps/unix/sysv/linux/sparc/system.c: Likewise. * sysdeps/unix/sysv/linux/syslog.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/unix/sysv/linux/testrtsig.h: Likewise. * sysdeps/unix/sysv/linux/timespec_get.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/utimensat.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/xstatconv.h: Likewise.
213 lines
5.3 KiB
C
213 lines
5.3 KiB
C
/* Copyright (C) 1991-2014 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 <errno.h>
|
|
#include <limits.h>
|
|
#include <stddef.h>
|
|
#include <dirent.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <_itoa.h>
|
|
|
|
static int getttyname_r (char *buf, size_t buflen,
|
|
dev_t mydev, ino64_t myino, int save,
|
|
int *dostat) internal_function;
|
|
|
|
static int
|
|
internal_function attribute_compat_text_section
|
|
getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino,
|
|
int save, int *dostat)
|
|
{
|
|
struct stat64 st;
|
|
DIR *dirstream;
|
|
struct dirent64 *d;
|
|
size_t devlen = strlen (buf);
|
|
|
|
dirstream = __opendir (buf);
|
|
if (dirstream == NULL)
|
|
{
|
|
*dostat = -1;
|
|
return errno;
|
|
}
|
|
|
|
while ((d = __readdir64 (dirstream)) != NULL)
|
|
if ((d->d_fileno == myino || *dostat)
|
|
&& strcmp (d->d_name, "stdin")
|
|
&& strcmp (d->d_name, "stdout")
|
|
&& strcmp (d->d_name, "stderr"))
|
|
{
|
|
char *cp;
|
|
size_t needed = _D_EXACT_NAMLEN (d) + 1;
|
|
|
|
if (needed > buflen)
|
|
{
|
|
*dostat = -1;
|
|
(void) __closedir (dirstream);
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
cp = __stpncpy (buf + devlen, d->d_name, needed);
|
|
cp[0] = '\0';
|
|
|
|
if (__xstat64 (_STAT_VER, buf, &st) == 0
|
|
#ifdef _STATBUF_ST_RDEV
|
|
&& S_ISCHR (st.st_mode) && st.st_rdev == mydev
|
|
#else
|
|
&& d->d_fileno == myino && st.st_dev == mydev
|
|
#endif
|
|
)
|
|
{
|
|
(void) __closedir (dirstream);
|
|
__set_errno (save);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
(void) __closedir (dirstream);
|
|
__set_errno (save);
|
|
/* It is not clear what to return in this case. `isatty' says FD
|
|
refers to a TTY but no entry in /dev has this inode. */
|
|
return ENOTTY;
|
|
}
|
|
|
|
/* Store at most BUFLEN character of the pathname of the terminal FD is
|
|
open on in BUF. Return 0 on success, otherwise an error number. */
|
|
int
|
|
__ttyname_r (int fd, char *buf, size_t buflen)
|
|
{
|
|
char procname[30];
|
|
struct stat64 st, st1;
|
|
int dostat = 0;
|
|
int save = errno;
|
|
|
|
/* Test for the absolute minimal size. This makes life easier inside
|
|
the loop. */
|
|
if (!buf)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return EINVAL;
|
|
}
|
|
|
|
if (buflen < sizeof ("/dev/pts/"))
|
|
{
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
/* isatty check, tcgetattr is used because it sets the correct
|
|
errno (EBADF resp. ENOTTY) on error. */
|
|
struct termios term;
|
|
if (__glibc_unlikely (__tcgetattr (fd, &term) < 0))
|
|
return errno;
|
|
|
|
if (__fxstat64 (_STAT_VER, fd, &st) < 0)
|
|
return errno;
|
|
|
|
/* We try using the /proc filesystem. */
|
|
*_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0';
|
|
|
|
ssize_t ret = __readlink (procname, buf, buflen - 1);
|
|
if (__glibc_unlikely (ret == -1 && errno == ENAMETOOLONG))
|
|
{
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
if (__glibc_likely (ret != -1))
|
|
{
|
|
#define UNREACHABLE_LEN strlen ("(unreachable)")
|
|
if (ret > UNREACHABLE_LEN
|
|
&& memcmp (buf, "(unreachable)", UNREACHABLE_LEN) == 0)
|
|
{
|
|
memmove (buf, buf + UNREACHABLE_LEN, ret - UNREACHABLE_LEN);
|
|
ret -= UNREACHABLE_LEN;
|
|
}
|
|
|
|
/* readlink need not terminate the string. */
|
|
buf[ret] = '\0';
|
|
|
|
/* Verify readlink result, fall back on iterating through devices. */
|
|
if (buf[0] == '/'
|
|
&& __xstat64 (_STAT_VER, buf, &st1) == 0
|
|
#ifdef _STATBUF_ST_RDEV
|
|
&& S_ISCHR (st1.st_mode)
|
|
&& st1.st_rdev == st.st_rdev
|
|
#else
|
|
&& st1.st_ino == st.st_ino
|
|
&& st1.st_dev == st.st_dev
|
|
#endif
|
|
)
|
|
return 0;
|
|
}
|
|
|
|
/* Prepare the result buffer. */
|
|
memcpy (buf, "/dev/pts/", sizeof ("/dev/pts/"));
|
|
buflen -= sizeof ("/dev/pts/") - 1;
|
|
|
|
if (__xstat64 (_STAT_VER, buf, &st1) == 0 && S_ISDIR (st1.st_mode))
|
|
{
|
|
#ifdef _STATBUF_ST_RDEV
|
|
ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino, save,
|
|
&dostat);
|
|
#else
|
|
ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino, save,
|
|
&dostat);
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
__set_errno (save);
|
|
ret = ENOENT;
|
|
}
|
|
|
|
if (ret && dostat != -1)
|
|
{
|
|
buf[sizeof ("/dev/") - 1] = '\0';
|
|
buflen += sizeof ("pts/") - 1;
|
|
#ifdef _STATBUF_ST_RDEV
|
|
ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino, save,
|
|
&dostat);
|
|
#else
|
|
ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino, save,
|
|
&dostat);
|
|
#endif
|
|
}
|
|
|
|
if (ret && dostat != -1)
|
|
{
|
|
buf[sizeof ("/dev/") - 1] = '\0';
|
|
dostat = 1;
|
|
#ifdef _STATBUF_ST_RDEV
|
|
ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino,
|
|
save, &dostat);
|
|
#else
|
|
ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino,
|
|
save, &dostat);
|
|
#endif
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
weak_alias (__ttyname_r, ttyname_r)
|