mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
739d440d2a
2002-07-19 Ulrich Drepper <drepper@redhat.com> * configure.in: Add test for __thread support in compiler. * config.h.in: Add HAVE___THREAD. * Makefile (headers): Remove errno.h, sys/errno.h, and bits/errno.h. * include/sys/errno.h: Moved to... * stdlib/sys/errno.h: ...here. New file. * stdlib/errno.h: New file. Moved from... * include/errno.h: ...here. Changed into an internal header defining libc-local things like __set_errno. * stdlib/Makefile (headers): Add errno.h, sys/errno.h, and bits/errno.h. * elf/dl-minimal.c: Include <tls.h>. Define errno as thread-local variable if USE_TLS && HAVE___THREAD. Don't define __errno_location either. * elf/rtld.c (_dl_start): Add code to initialize TLS for ld.so from... (_dl_start_final): ...here. Add code to initialize tls elements from bootstrap_map. * sysdeps/generic/errno-loc.c: Define errno as thread-local variable if USE_TLS && HAVE___THREAD. * sysdeps/generic/bits/errno.h: Remove __set_errno definition. * sysdeps/mach/hurd/bits/errno.h: Likewise. * sysdeps/standalone/arm/bits/errno.h: Likewise. * sysdeps/standalone/bits/errno.h: Likewise. * sysdeps/unix/bsd/bsd4.4/bits/errno.h: Likewise. * sysdeps/unix/sysv/aix/bits/errno.h: Likewise. * sysdeps/unix/sysv/hpux/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/errno.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/errno.h: Likewise. * sysdeps/i386/dl-machine.c (elf_machine_rel) [RTLD_BOOTSTRAP]: Don't use GL(dl_rtld_map), use map parameter. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Define errno in .tbss if USE_TLS && HAVE___THREAD. * sysdeps/unix/sysv/linux/i386/sysdep.h: Unify SETUP_PIC_REG definitions. If USE_TLS && HAVE___THREAD store errooor value using TLS code sequence. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: No real need to restore errno. * sysdeps/unix/sysv/linux/grantpt.c: Likewise. * sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise. * sysdeps/unix/sysv/linux/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise.
82 lines
2.5 KiB
C
82 lines
2.5 KiB
C
/* Copyright (C) 1998, 1999, 2001, 2002 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <sys/statfs.h>
|
|
|
|
#include "linux_fsinfo.h"
|
|
|
|
/* Prototype for function that changes ownership and access permission
|
|
for slave pseudo terminals that do not live on a `devpts'
|
|
filesystem. */
|
|
static int __unix_grantpt (int fd);
|
|
|
|
/* Prototype for private function that gets the name of the slave
|
|
pseudo terminal in a safe way. */
|
|
static int pts_name (int fd, char **pts, size_t buf_len);
|
|
|
|
/* Change the ownership and access permission of the slave pseudo
|
|
terminal associated with the master pseudo terminal specified
|
|
by FD. */
|
|
int
|
|
grantpt (int fd)
|
|
{
|
|
struct statfs fsbuf;
|
|
#ifdef PATH_MAX
|
|
char _buf[PATH_MAX];
|
|
#else
|
|
char _buf[512];
|
|
#endif
|
|
char *buf = _buf;
|
|
|
|
if (__builtin_expect (pts_name (fd, &buf, sizeof (_buf)), 0))
|
|
{
|
|
int save_errno = errno;
|
|
|
|
/* Check, if the file descriptor is valid. pts_name returns the
|
|
wrong errno number, so we cannot use that. */
|
|
if (__libc_fcntl (fd, F_GETFD) == -1 && errno == EBADF)
|
|
return -1;
|
|
|
|
/* If the filedescriptor is no TTY, grantpt has to set errno
|
|
to EINVAL. */
|
|
if (save_errno == ENOTTY)
|
|
__set_errno (EINVAL);
|
|
else
|
|
__set_errno (save_errno);
|
|
|
|
return -1;
|
|
}
|
|
|
|
if (__statfs (buf, &fsbuf) < 0)
|
|
return -1;
|
|
|
|
/* If the slave pseudo terminal lives on a `devpts' filesystem, the
|
|
ownership and access permission are already set. */
|
|
if (fsbuf.f_type == DEVPTS_SUPER_MAGIC || fsbuf.f_type == DEVFS_SUPER_MAGIC)
|
|
return 0;
|
|
|
|
return __unix_grantpt (fd);
|
|
}
|
|
|
|
#define grantpt static __unix_grantpt
|
|
#include <sysdeps/unix/grantpt.c>
|