mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 10:50:07 +00:00
ffa8d2a098
name of "", store a null pointer instead. * configure.in (elf): Set to yes for freebsd*, netbsd*. * configure: Regenerated. * locale/xlocale.c [! (USE_TLS && HAVE___THREAD)] (__libc_tsd_LOCALE): Initialize this instead of __libc_tsd_LOCALE_data. * sysdeps/unix/grantpt.c (pts_name): Convert ENOTTY return from ptsname_r to EINVAL. * sysdeps/generic/ptsname.c (__ptsname_r): Return ENOSYS instead of 0. * rt/Makefile: Revert last change, it was inappropriate to presume aio implementations depend on pthreads. * rt/tst-aio.c (do_test): Exit happy if first failure is ENOSYS. * rt/tst-aio64.c (do_test): Likewise. * rt/tst-aio2.c (do_test): Likewise. * rt/tst-aio3.c (do_test): Likewise. * rt/tst-aio4.c (do_test): Likewise. * rt/tst-aio5.c (do_test): Likewise. * rt/tst-aio6.c (do_test): Likewise. * rt/tst-aio7.c (do_test): Likewise. * sysdeps/generic/bits/libc-lock.h (__libc_setspecific): Use a cast to void so as to avoid compiler warnings. * libio/oldstdfiles.c [! _IO_MTSAFE_IO] (DEF_STDFILE): Don't define _IO_wide_data_FD, which is never used here. * libio/iofread.c [! _IO_MTSAFE_IO] (fread_unlocked): Add libc_hidden_ver defn. * libio/iofputs.c [! _IO_MTSAFE_IO] (fputs_unlocked): Likewise. * libio/iofgets.c [! _IO_MTSAFE_IO] (fgets_unlocked): Likewise. * include/resolv.h [! _LIBC_REENTRANT] (_res): #undef it before decl. * include/netdb.h [! _LIBC_REENTRANT] (h_errno): Declare normal extern. * misc/syslog.c (openlog): Conditionalize locking on [_LIBC_REENTRANT]. (closelog): Likewise. 2002-07-06 Bruno Haible <bruno@clisp.org> * sysdeps/alpha/fpu/fpu_control.h: Comment fix. * sysdeps/unix/sysv/linux/alpha/pipe.S: Moved to ... * sysdeps/unix/alpha/pipe.S: ... here. * sysdeps/unix/bsd/osf/alpha/pipe.S: File removed. * sysdeps/unix/i386/brk.S: Rename local label to '.Lhere' in ELF. * sysdeps/unix/i386/brk.S: Add PSEUDO_END invocation. * sysdeps/unix/i386/fork.S: Likewise. * sysdeps/unix/i386/pipe.S: Likewise. * sysdeps/unix/i386/wait.S: Likewise. * sysdeps/unix/fork.S: Fix PSEUDO_END argument. * sysdeps/unix/arm/fork.S: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/hppa/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/i386/sysdep.h (PSEUDO): Fix syntax error. (L): Define right for ELF. * sysdeps/unix/sysv/linux/i386/sysdep.h (L): Remove definition. Now defined in sysdeps/i386/sysdep.h. * sysdeps/posix/readv.c: Ansify function definition. * sysdeps/posix/writev.c: Likewise. * stdio-common/tst-fseek.c (main): Don't assume that off_t and size_t have the same size. Avoid direct cast from size_t to off_t. * login/tst-utmp.c (simulate_login): Don't leave garbage after the nul byte in entry[n].ut_user. (simulate_logout): Likewise. * login/programs/utmpdump.c (print_entry): Test _HAVE_UT_TYPE, _HAVE_UT_PID, _HAVE_UT_ID, _HAVE_UT_HOST, instead of assuming the existence of corresponding members of 'struct utmp'. * login/tst-utmp.c: Trivialize the test if testing 'struct utmp' and !_HAVE_UT_TYPE. * sysdeps/unix/opendir.c (__opendir): If st_blksize is 0 or too small, allocate a buffer of at least BUFSIZ bytes, not just of sizeof (struct dirent). * sysdeps/generic/glob.c: Include <limits.h>. (NAME_MAX): Define a fallback. (glob_in_dir): Allocate enough room for a 'struct dirent64' on the stack. * posix/tst-dir.c: Include <stddef.h>, for offsetof. (main): Allocate enough room for a 'struct dirent64' on the stack. * posix/tst-gnuglob.c (my_DIR): Allocate enough room for a 'struct dirent'. * sysdeps/unix/sysv/linux/init-first.c: Don't include kernel-features.h. * inet/htontest.c: Include <sys/types.h>. * sysdeps/generic/sys/sysinfo.h: Surround with __{BEGIN,END}_DECLS. * include/sys/sysctl.h: Comment fix. * elf/rtld.c (_rtld_global) [! _LIBC_REENTRANT]: Don't initialize _dl_load_lock. * libio/fileno.c (fileno_unlocked): Define regardless of _IO_MTSAFE_IO. * sysdeps/unix/bsd/bsd4.4/syscalls.list (__sigaltstack): New alias. * sysdeps/unix/inet/syscalls.list (__connect_internal): New alias. (__getpeername): New alias. (__getsockname): New alias. (__socket): New alias. * sysdeps/unix/common/syscalls.list (getpgid): Remove. * sysdeps/unix/syscalls.list (__chown_internal): New alias. (__fcntl_internal): New alias. (__profil): New alias.
216 lines
5.2 KiB
C
216 lines
5.2 KiB
C
/* Copyright (C) 1998, 2000, 2001, 2002 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <grp.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
|
|
#include "pty-private.h"
|
|
|
|
|
|
/* Return the result of ptsname_r in the buffer pointed to by PTS,
|
|
which should be of length BUF_LEN. If it is too long to fit in
|
|
this buffer, a sufficiently long buffer is allocated using malloc,
|
|
and returned in PTS. 0 is returned upon success, -1 otherwise. */
|
|
static int
|
|
pts_name (int fd, char **pts, size_t buf_len)
|
|
{
|
|
int rv;
|
|
char *buf = *pts;
|
|
|
|
for (;;)
|
|
{
|
|
char *new_buf;
|
|
|
|
if (buf_len)
|
|
{
|
|
rv = __ptsname_r (fd, buf, buf_len);
|
|
if (rv != 0)
|
|
{
|
|
if (rv == ENOTTY)
|
|
/* ptsname_r returns with ENOTTY to indicate
|
|
a descriptor not referring to a pty master.
|
|
For this condition, grantpt must return EINVAL. */
|
|
errno = EINVAL;
|
|
break;
|
|
}
|
|
|
|
if (memchr (buf, '\0', buf_len))
|
|
/* We succeeded and the returned name fit in the buffer. */
|
|
break;
|
|
|
|
/* Try again with a longer buffer. */
|
|
buf_len += buf_len; /* Double it */
|
|
}
|
|
else
|
|
/* No initial buffer; start out by mallocing one. */
|
|
buf_len = 128; /* First time guess. */
|
|
|
|
if (buf != *pts)
|
|
/* We've already malloced another buffer at least once. */
|
|
new_buf = (char *) realloc (buf, buf_len);
|
|
else
|
|
new_buf = (char *) malloc (buf_len);
|
|
if (! new_buf)
|
|
{
|
|
rv = -1;
|
|
__set_errno (ENOMEM);
|
|
break;
|
|
}
|
|
buf = new_buf;
|
|
}
|
|
|
|
if (rv == 0)
|
|
*pts = buf; /* Return buffer to the user. */
|
|
else if (buf != *pts)
|
|
free (buf); /* Free what we malloced when returning an error. */
|
|
|
|
return rv;
|
|
}
|
|
|
|
/* Change the ownership and access permission of the slave pseudo
|
|
terminal associated with the master pseudo terminal specified
|
|
by FD. */
|
|
int
|
|
grantpt (int fd)
|
|
{
|
|
int retval = -1;
|
|
#ifdef PATH_MAX
|
|
char _buf[PATH_MAX];
|
|
#else
|
|
char _buf[512];
|
|
#endif
|
|
char *buf = _buf;
|
|
struct stat64 st;
|
|
char *grtmpbuf;
|
|
struct group grbuf;
|
|
size_t grbuflen = __sysconf (_SC_GETGR_R_SIZE_MAX);
|
|
struct group *p;
|
|
uid_t uid;
|
|
gid_t gid;
|
|
pid_t pid;
|
|
|
|
if (pts_name (fd, &buf, sizeof (_buf)))
|
|
return -1;
|
|
|
|
if (__xstat64 (_STAT_VER, buf, &st) < 0)
|
|
goto cleanup;
|
|
|
|
/* Make sure that we own the device. */
|
|
uid = __getuid ();
|
|
if (st.st_uid != uid)
|
|
{
|
|
if (__chown (buf, uid, st.st_gid) < 0)
|
|
goto helper;
|
|
}
|
|
|
|
/* Get the group ID of the special `tty' group. */
|
|
if (grbuflen == -1)
|
|
/* `sysconf' does not support _SC_GETGR_R_SIZE_MAX.
|
|
Try a moderate value. */
|
|
grbuflen = 1024;
|
|
grtmpbuf = (char *) __alloca (grbuflen);
|
|
__getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
|
|
gid = p ? p->gr_gid : __getgid ();
|
|
|
|
/* Make sure the group of the device is that special group. */
|
|
if (st.st_gid != gid)
|
|
{
|
|
if (__chown (buf, uid, gid) < 0)
|
|
goto helper;
|
|
}
|
|
|
|
/* Make sure the permission mode is set to readable and writable by
|
|
the owner, and writable by the group. */
|
|
if ((st.st_mode & ACCESSPERMS) != (S_IRUSR|S_IWUSR|S_IWGRP))
|
|
{
|
|
if (__chmod (buf, S_IRUSR|S_IWUSR|S_IWGRP) < 0)
|
|
goto helper;
|
|
}
|
|
|
|
retval = 0;
|
|
goto cleanup;
|
|
|
|
/* We have to use the helper program. */
|
|
helper:
|
|
|
|
pid = __fork ();
|
|
if (pid == -1)
|
|
goto cleanup;
|
|
else if (pid == 0)
|
|
{
|
|
/* Disable core dumps. */
|
|
struct rlimit rl = { 0, 0 };
|
|
__setrlimit (RLIMIT_CORE, &rl);
|
|
|
|
/* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
|
|
if (fd != PTY_FILENO)
|
|
if (__dup2 (fd, PTY_FILENO) < 0)
|
|
_exit (FAIL_EBADF);
|
|
|
|
execle (_PATH_PT_CHOWN, basename (_PATH_PT_CHOWN), NULL, NULL);
|
|
_exit (FAIL_EXEC);
|
|
}
|
|
else
|
|
{
|
|
int w;
|
|
|
|
if (__waitpid (pid, &w, 0) == -1)
|
|
goto cleanup;
|
|
if (!WIFEXITED (w))
|
|
__set_errno (ENOEXEC);
|
|
else
|
|
switch (WEXITSTATUS(w))
|
|
{
|
|
case 0:
|
|
retval = 0;
|
|
break;
|
|
case FAIL_EBADF:
|
|
__set_errno (EBADF);
|
|
break;
|
|
case FAIL_EINVAL:
|
|
__set_errno (EINVAL);
|
|
break;
|
|
case FAIL_EACCES:
|
|
__set_errno (EACCES);
|
|
break;
|
|
case FAIL_EXEC:
|
|
__set_errno (ENOEXEC);
|
|
break;
|
|
|
|
default:
|
|
assert(! "getpt: internal error: invalid exit code from pt_chown");
|
|
}
|
|
}
|
|
|
|
cleanup:
|
|
if (buf != _buf)
|
|
free (buf);
|
|
|
|
return retval;
|
|
}
|