mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
8b4a118222
Building with -Os produces linknamespace and localplt failures for, among other functions, gnu_dev_major, gnu_dev_minor and gnu_dev_makedev. The issue is that those functions are not inlined when building with -Os. While one could force them to be inlined in that case, it seems more natural to fix this issue similarly to other namespace issues. Thus, this patch makes gnu_dev_* into weak aliases for hidden symbols __gnu_dev_*; __gnu_dev_* are then defined as inlines in the internal include/sys/sysmacros.h, and uses of gnu_dev_* (often via the macros major, minor and makedev) for which there are namespace issues are changed to use __gnu_dev_*; where there are no namespace issues, use of libc_hidden_proto serves to avoid unnecessary local PLT entry use. Tested for x86_64, (a) without -Os, to verify the testsuite continues to pass without problems and that the functions called under their new names continue to be inlined as expected in that case; (b) with -Os, to verify that the linknamespace and localplt failures in question go away (but because of other such failures present, neither of the relevant bugs can yet be closed). [BZ #15105] [BZ #19463] * include/sys/sysmacros.h [!_ISOMAC] (__SYSMACROS_NEED_IMPLEMENTATION): Define macro. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (_SYS_SYSMACROS_H_WRAPPER): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (gnu_dev_major): Use libc_hidden_proto. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (gnu_dev_minor): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (gnu_dev_makedev): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__SYSMACROS_DECL_TEMPL): Undefine and redefine to add use __gnu_dev_ prefix. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__SYSMACROS_IMPL_TEMPL): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__gnu_dev_major): Declare and define as hidden inline function. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__gnu_dev_minor): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__gnu_dev_makedev): Likewise. * misc/makedev.c (OUT_OF_LINE_IMPL_TEMPL): Use __gnu_dev_ prefix. (gnu_dev_major): Use weak_alias and libc_hidden_weak. (gnu_dev_minor): Likewise. (gnu_dev_makedev): Likewise. * csu/check_fds.c (check_one_fd): Use __gnu_dev_makedev instead of makedev. * posix/wordexp.c (exec_comm_child): Likewise. * sysdeps/mach/hurd/xmknodat.c (__xmknodat): Use __gnu_dev_minor instead of minor and __gnu_dev_major instead of major. * sysdeps/unix/sysv/linux/device-nrs.h (DEV_TTY_P): Use __gnu_dev_major instead of major. * sysdeps/unix/sysv/linux/pathconf.c (distinguish_extX): Use __gnu_dev_major instead of gnu_dev_major and __gnu_dev_minor instead of gnu_dev_minor. * sysdeps/unix/sysv/linux/ptsname.c (MASTER_P): Likewise. (SLAVE_P): Likewise. (__ptsname_internal): Use __gnu_dev_minor instead of minor. * sysdeps/unix/sysv/linux/ttyname.h (is_pty): Use __gnu_dev_major instead of major.
168 lines
4.7 KiB
C
168 lines
4.7 KiB
C
/* Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
|
|
|
|
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 <paths.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/sysmacros.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
|
|
#include <_itoa.h>
|
|
|
|
/* Check if DEV corresponds to a master pseudo terminal device. */
|
|
#define MASTER_P(Dev) \
|
|
(__gnu_dev_major ((Dev)) == 2 \
|
|
|| (__gnu_dev_major ((Dev)) == 4 \
|
|
&& __gnu_dev_minor ((Dev)) >= 128 && __gnu_dev_minor ((Dev)) < 192) \
|
|
|| (__gnu_dev_major ((Dev)) >= 128 && __gnu_dev_major ((Dev)) < 136))
|
|
|
|
/* Check if DEV corresponds to a slave pseudo terminal device. */
|
|
#define SLAVE_P(Dev) \
|
|
(__gnu_dev_major ((Dev)) == 3 \
|
|
|| (__gnu_dev_major ((Dev)) == 4 \
|
|
&& __gnu_dev_minor ((Dev)) >= 192 && __gnu_dev_minor ((Dev)) < 256) \
|
|
|| (__gnu_dev_major ((Dev)) >= 136 && __gnu_dev_major ((Dev)) < 144))
|
|
|
|
/* Note that major number 4 corresponds to the old BSD style pseudo
|
|
terminal devices. As of Linux 2.1.115 these are no longer
|
|
supported. They have been replaced by major numbers 2 (masters)
|
|
and 3 (slaves). */
|
|
|
|
/* Directory where we can find the slave pty nodes. */
|
|
#define _PATH_DEVPTS "/dev/pts/"
|
|
|
|
/* The are declared in getpt.c. */
|
|
extern const char __libc_ptyname1[] attribute_hidden;
|
|
extern const char __libc_ptyname2[] attribute_hidden;
|
|
|
|
/* Static buffer for `ptsname'. */
|
|
static char buffer[sizeof (_PATH_DEVPTS) + 20];
|
|
|
|
|
|
/* Return the pathname of the pseudo terminal slave associated with
|
|
the master FD is open on, or NULL on errors.
|
|
The returned storage is good until the next call to this function. */
|
|
char *
|
|
ptsname (int fd)
|
|
{
|
|
return __ptsname_r (fd, buffer, sizeof (buffer)) != 0 ? NULL : buffer;
|
|
}
|
|
|
|
|
|
int
|
|
__ptsname_internal (int fd, char *buf, size_t buflen, struct stat64 *stp)
|
|
{
|
|
int save_errno = errno;
|
|
unsigned int ptyno;
|
|
|
|
if (!__isatty (fd))
|
|
{
|
|
__set_errno (ENOTTY);
|
|
return ENOTTY;
|
|
}
|
|
|
|
#ifdef TIOCGPTN
|
|
if (__ioctl (fd, TIOCGPTN, &ptyno) == 0)
|
|
{
|
|
/* Buffer we use to print the number in. For a maximum size for
|
|
`int' of 8 bytes we never need more than 20 digits. */
|
|
char numbuf[21];
|
|
const char *devpts = _PATH_DEVPTS;
|
|
const size_t devptslen = strlen (_PATH_DEVPTS);
|
|
char *p;
|
|
|
|
numbuf[sizeof (numbuf) - 1] = '\0';
|
|
p = _itoa_word (ptyno, &numbuf[sizeof (numbuf) - 1], 10, 0);
|
|
|
|
if (buflen < devptslen + (&numbuf[sizeof (numbuf)] - p))
|
|
{
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
memcpy (__stpcpy (buf, devpts), p, &numbuf[sizeof (numbuf)] - p);
|
|
}
|
|
else if (errno != EINVAL)
|
|
return errno;
|
|
else
|
|
#endif
|
|
{
|
|
char *p;
|
|
|
|
if (buflen < strlen (_PATH_TTY) + 3)
|
|
{
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
if (__fxstat64 (_STAT_VER, fd, stp) < 0)
|
|
return errno;
|
|
|
|
/* Check if FD really is a master pseudo terminal. */
|
|
if (! MASTER_P (stp->st_rdev))
|
|
{
|
|
__set_errno (ENOTTY);
|
|
return ENOTTY;
|
|
}
|
|
|
|
ptyno = __gnu_dev_minor (stp->st_rdev);
|
|
|
|
if (ptyno / 16 >= strlen (__libc_ptyname1))
|
|
{
|
|
__set_errno (ENOTTY);
|
|
return ENOTTY;
|
|
}
|
|
|
|
p = __stpcpy (buf, _PATH_TTY);
|
|
p[0] = __libc_ptyname1[ptyno / 16];
|
|
p[1] = __libc_ptyname2[ptyno % 16];
|
|
p[2] = '\0';
|
|
}
|
|
|
|
if (__xstat64 (_STAT_VER, buf, stp) < 0)
|
|
return errno;
|
|
|
|
/* Check if the name we're about to return really corresponds to a
|
|
slave pseudo terminal. */
|
|
if (! S_ISCHR (stp->st_mode) || ! SLAVE_P (stp->st_rdev))
|
|
{
|
|
/* This really is a configuration problem. */
|
|
__set_errno (ENOTTY);
|
|
return ENOTTY;
|
|
}
|
|
|
|
__set_errno (save_errno);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Store at most BUFLEN characters of the pathname of the slave pseudo
|
|
terminal associated with the master FD is open on in BUF.
|
|
Return 0 on success, otherwise an error number. */
|
|
int
|
|
__ptsname_r (int fd, char *buf, size_t buflen)
|
|
{
|
|
struct stat64 st;
|
|
return __ptsname_internal (fd, buf, buflen, &st);
|
|
}
|
|
weak_alias (__ptsname_r, ptsname_r)
|