mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 21:40:12 +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.
216 lines
5.5 KiB
C
216 lines
5.5 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>
|
|
|
|
#if 0
|
|
/* Is this used anywhere? It is not exported. */
|
|
char *__ttyname;
|
|
#endif
|
|
|
|
static char *getttyname (const char *dev, dev_t mydev,
|
|
ino64_t myino, int save, int *dostat)
|
|
internal_function;
|
|
|
|
|
|
libc_freeres_ptr (static char *getttyname_name);
|
|
|
|
static char *
|
|
internal_function attribute_compat_text_section
|
|
getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)
|
|
{
|
|
static size_t namelen;
|
|
struct stat64 st;
|
|
DIR *dirstream;
|
|
struct dirent64 *d;
|
|
size_t devlen = strlen (dev) + 1;
|
|
|
|
dirstream = __opendir (dev);
|
|
if (dirstream == NULL)
|
|
{
|
|
*dostat = -1;
|
|
return NULL;
|
|
}
|
|
|
|
/* Prepare for the loop. If we already have a buffer copy the directory
|
|
name we look at into it. */
|
|
if (devlen < namelen)
|
|
*((char *) __mempcpy (getttyname_name, dev, devlen - 1)) = '/';
|
|
|
|
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"))
|
|
{
|
|
size_t dlen = _D_ALLOC_NAMLEN (d);
|
|
if (devlen + dlen > namelen)
|
|
{
|
|
free (getttyname_name);
|
|
namelen = 2 * (devlen + dlen); /* Big enough. */
|
|
getttyname_name = malloc (namelen);
|
|
if (! getttyname_name)
|
|
{
|
|
*dostat = -1;
|
|
/* Perhaps it helps to free the directory stream buffer. */
|
|
(void) __closedir (dirstream);
|
|
return NULL;
|
|
}
|
|
*((char *) __mempcpy (getttyname_name, dev, devlen - 1)) = '/';
|
|
}
|
|
memcpy (&getttyname_name[devlen], d->d_name, dlen);
|
|
if (__xstat64 (_STAT_VER, getttyname_name, &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);
|
|
#if 0
|
|
__ttyname = getttyname_name;
|
|
#endif
|
|
__set_errno (save);
|
|
return getttyname_name;
|
|
}
|
|
}
|
|
|
|
(void) __closedir (dirstream);
|
|
__set_errno (save);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Static buffer in `ttyname'. */
|
|
libc_freeres_ptr (static char *ttyname_buf);
|
|
|
|
|
|
/* Return the pathname of the terminal FD is open on, or NULL on errors.
|
|
The returned storage is good only until the next call to this function. */
|
|
char *
|
|
ttyname (int fd)
|
|
{
|
|
static size_t buflen;
|
|
char procname[30];
|
|
struct stat64 st, st1;
|
|
int dostat = 0;
|
|
char *name;
|
|
int save = errno;
|
|
struct termios term;
|
|
|
|
/* isatty check, tcgetattr is used because it sets the correct
|
|
errno (EBADF resp. ENOTTY) on error. */
|
|
if (__glibc_unlikely (__tcgetattr (fd, &term) < 0))
|
|
return NULL;
|
|
|
|
if (__fxstat64 (_STAT_VER, fd, &st) < 0)
|
|
return NULL;
|
|
|
|
/* We try using the /proc filesystem. */
|
|
*_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0';
|
|
|
|
if (buflen == 0)
|
|
{
|
|
buflen = 4095;
|
|
ttyname_buf = (char *) malloc (buflen + 1);
|
|
if (ttyname_buf == NULL)
|
|
{
|
|
buflen = 0;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
ssize_t len = __readlink (procname, ttyname_buf, buflen);
|
|
if (__glibc_likely (len != -1))
|
|
{
|
|
if ((size_t) len >= buflen)
|
|
return NULL;
|
|
|
|
#define UNREACHABLE_LEN strlen ("(unreachable)")
|
|
if (len > UNREACHABLE_LEN
|
|
&& memcmp (ttyname_buf, "(unreachable)", UNREACHABLE_LEN) == 0)
|
|
{
|
|
memmove (ttyname_buf, ttyname_buf + UNREACHABLE_LEN,
|
|
len - UNREACHABLE_LEN);
|
|
len -= UNREACHABLE_LEN;
|
|
}
|
|
|
|
/* readlink need not terminate the string. */
|
|
ttyname_buf[len] = '\0';
|
|
|
|
/* Verify readlink result, fall back on iterating through devices. */
|
|
if (ttyname_buf[0] == '/'
|
|
&& __xstat64 (_STAT_VER, ttyname_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 ttyname_buf;
|
|
}
|
|
|
|
if (__xstat64 (_STAT_VER, "/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode))
|
|
{
|
|
#ifdef _STATBUF_ST_RDEV
|
|
name = getttyname ("/dev/pts", st.st_rdev, st.st_ino, save, &dostat);
|
|
#else
|
|
name = getttyname ("/dev/pts", st.st_dev, st.st_ino, save, &dostat);
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
__set_errno (save);
|
|
name = NULL;
|
|
}
|
|
|
|
if (!name && dostat != -1)
|
|
{
|
|
#ifdef _STATBUF_ST_RDEV
|
|
name = getttyname ("/dev", st.st_rdev, st.st_ino, save, &dostat);
|
|
#else
|
|
name = getttyname ("/dev", st.st_dev, st.st_ino, save, &dostat);
|
|
#endif
|
|
}
|
|
|
|
if (!name && dostat != -1)
|
|
{
|
|
dostat = 1;
|
|
#ifdef _STATBUF_ST_RDEV
|
|
name = getttyname ("/dev", st.st_rdev, st.st_ino, save, &dostat);
|
|
#else
|
|
name = getttyname ("/dev", st.st_dev, st.st_ino, save, &dostat);
|
|
#endif
|
|
}
|
|
|
|
return name;
|
|
}
|