mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
c877418f2e
New macros. * elf/dl-close.c (free_mem): Use libc_freeres_fn macro, remove text_set_element. * elf/dl-libc.c (free_mem): Likewise. * iconv/gconv_conf.c (free_mem): Likewise. * iconv/gconv_db.c (free_mem): Likewise. * iconv/gconv_dl.c (free_mem): Likewise. * iconv/gconv_cache.c (free_mem): Likewise. * intl/finddomain.c (free_mem): Likewise. * intl/dcigettext.c (free_mem): Likewise. * locale/setlocale.c (free_mem): Likewise. * misc/fstab.c (fstab_free): Likewise. * nss/nsswitch.c (free_mem): Likewise. * posix/regcomp.c (free_mem): Likewise. * resolv/gai_misc.c (free_res): Likewise. * stdlib/fmtmsg.c (free_mem): Likewise. * sunrpc/clnt_perr.c (free_mem): Likewise. * sysdeps/generic/setenv.c (free_mem): Likewise. * sysdeps/unix/sysv/linux/shm_open.c (freeit): Likewise. * sysdeps/pthread/aio_misc.c (free_res): Likewise. * time/tzset.c (free_mem): Likewise. * malloc/mtrace.c (release_libc_mem): Add __libc_freeres_fn_section. * locale/loadarchive.c (_nl_archive_subfreeres): Likewise. * malloc/set-freeres.c (__libc_freeres): Likewise. * login/getutent.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutent): Allocate buffer the first time it is run. * login/getutid.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutid): Allocate buffer the first time it is run. * login/getutline.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutline): Allocate buffer the first time it is run. * malloc/mtrace.c (malloc_trace_buffer): Change into char *. (mtrace): Allocate malloc_trace_buffer. * resolv/nsap_addr.c (inet_nsap_ntoa): Decrease size of tmpbuf. * resolv/ns_print.c (ns_sprintrrf): Decrease size of t. * string/strerror.c: Include libintl.h and errno.h. (buf): New variable. (strerror): Only allocate buffer if actually needed (unknown error). * time/tzfile.c (transitions): Add libc_freeres_ptr. (freeres): Remove. 2002-10-25 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (libc_freeres_ptr): New macro. * malloc/set-freeres.c (__libc_freeres_ptrs): Define using symbol_set_define. (__libc_freeres): Free all pointers in that section. * Makerules (build-shlib): Add $(LDSEDCMD-$(@F:lib%.so=%).so) to sed commands when creating .lds script. (LDSEDCMD-c.so): New variable. * inet/rcmd.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rcmd_af): Use strdup to allocate ahostbuf. * inet/rexec.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rexec_af): Use strdup to allocate ahostbuf. * stdio-common/reg-printf.c (printf_funcs): Remove. (__printf_arginfo_table): Change into printf_arginfo_function **. Add libc_freeres_ptr. (__register_printf_function): Allocate __printf_arginfo_table and __printf_function_table the first time it is called. * stdio-common/printf-parse.h (__printf_arginfo_table): Change into printf_arginfo_function **. (parse_one_spec): Add __builtin_expect. * grp/fgetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * inet/getnetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * intl/localealias.c (libc_freeres_ptr): Define if !_LIBC. (string_space, map): Add libc_freeres_ptr. (free_mem): Remove. * misc/efgcvt.c (FCVT_BUFPTR): Add libc_freeres_ptr. (free_mem): Remove. * misc/mntent.c (getmntent_buffer): Add libc_freeres_ptr. (free_mem): Remove. * crypt/md5-crypt.c (libc_freeres_ptr): Define if !_LIBC. (buffer): Add libc_freeres_ptr. (free_mem): Remove for _LIBC. * nss/getXXbyYY.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * nss/getXXent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * pwd/fgetpwent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * resolv/res_hconf.c (ifaddrs): Add libc_freeres_ptr. (free_mem): Remove. * shadow/fgetspent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/posix/ttyname.c (getttyname_name): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/getsysstats.c (mount_proc): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/ttyname.c (getttyname_name, ttyname_buf): Add libc_freeres_ptr. (free_mem): Remove. 2002-10-30 Jakub Jelinek <jakub@redhat.com> * malloc/obstack.c [_LIBC] (obstack_free): Change into strong_alias instead of duplicating the whole function in libc.
189 lines
4.6 KiB
C
189 lines
4.6 KiB
C
/* Copyright (C) 1991,92,93,1996-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 <limits.h>
|
|
#include <stddef.h>
|
|
#include <dirent.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio-common/_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
|
|
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;
|
|
}
|
|
|
|
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;
|
|
int len;
|
|
|
|
if (!__isatty (fd))
|
|
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;
|
|
}
|
|
}
|
|
|
|
len = __readlink (procname, ttyname_buf, buflen);
|
|
if (len != -1
|
|
/* This is for Linux 2.0. */
|
|
&& ttyname_buf[0] != '[')
|
|
{
|
|
if ((size_t) len >= buflen)
|
|
return NULL;
|
|
/* readlink need not terminate the string. */
|
|
ttyname_buf[len] = '\0';
|
|
return ttyname_buf;
|
|
}
|
|
|
|
if (__fxstat64 (_STAT_VER, fd, &st) < 0)
|
|
return NULL;
|
|
|
|
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;
|
|
}
|