mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 13:50:06 +00:00
c4563d2d66
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
184 lines
4.4 KiB
C
184 lines
4.4 KiB
C
/* Copyright (C) 1991, 92, 93, 96, 97, 98, 99 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. 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>
|
|
|
|
char *__ttyname;
|
|
|
|
static char * getttyname __P ((const char *dev, dev_t mydev,
|
|
ino_t myino, int save, int *dostat))
|
|
internal_function;
|
|
|
|
static char *
|
|
internal_function
|
|
getttyname (dev, mydev, myino, save, dostat)
|
|
const char *dev;
|
|
dev_t mydev;
|
|
ino_t myino;
|
|
int save;
|
|
int *dostat;
|
|
{
|
|
static char *name;
|
|
static size_t namelen;
|
|
struct stat st;
|
|
DIR *dirstream;
|
|
struct dirent *d;
|
|
size_t devlen = strlen (dev) + 1;
|
|
|
|
dirstream = opendir (dev);
|
|
if (dirstream == NULL)
|
|
{
|
|
*dostat = -1;
|
|
return NULL;
|
|
}
|
|
|
|
while ((d = readdir (dirstream)) != NULL)
|
|
if (((ino_t) 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 (name);
|
|
namelen = 2 * (devlen + dlen); /* Big enough. */
|
|
name = malloc (namelen);
|
|
if (! name)
|
|
{
|
|
*dostat = -1;
|
|
/* Perhaps it helps to free the directory stream buffer. */
|
|
(void) __closedir (dirstream);
|
|
return NULL;
|
|
}
|
|
*((char *) __mempcpy (name, dev, devlen - 1)) = '/';
|
|
}
|
|
memcpy (&name[devlen], d->d_name, dlen);
|
|
if (__xstat (_STAT_VER, name, &st) == 0
|
|
#ifdef _STATBUF_ST_RDEV
|
|
&& S_ISCHR (st.st_mode) && st.st_rdev == mydev
|
|
#else
|
|
&& (ino_t) d->d_fileno == myino && st.st_dev == mydev
|
|
#endif
|
|
)
|
|
{
|
|
(void) __closedir (dirstream);
|
|
__ttyname = name;
|
|
__set_errno (save);
|
|
return name;
|
|
}
|
|
}
|
|
|
|
(void) __closedir (dirstream);
|
|
__set_errno (save);
|
|
return NULL;
|
|
}
|
|
|
|
/* 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 (fd)
|
|
int fd;
|
|
{
|
|
static char *buf;
|
|
static size_t buflen;
|
|
char procname[30];
|
|
struct stat 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;
|
|
buf = (char *) malloc (buflen + 1);
|
|
if (buf == NULL)
|
|
{
|
|
buflen = 0;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
len = __readlink (procname, buf, buflen);
|
|
if (len != -1
|
|
/* This is for Linux 2.0. */
|
|
&& buf[0] != '[')
|
|
{
|
|
if (len >= buflen)
|
|
return NULL;
|
|
/* readlink need not terminate the string. */
|
|
buf[len] = '\0';
|
|
return buf;
|
|
}
|
|
|
|
if (__fxstat (_STAT_VER, fd, &st) < 0)
|
|
return NULL;
|
|
|
|
if (__xstat (_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;
|
|
}
|