mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
f63f2bfdfa
This automatically-generated patch converts 69 function definitions in glibc from old-style K&R to prototype-style. This patch, covering both sysdeps and non-sysdeps files, deals with cases where the prototype needed to be wrapped over more than one line. Otherwise, exclusions and caveats are as for <https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and <https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style function definition. * crypt/crypt_util.c (__encrypt_r): Likewise. * libio/genops.c (_IO_no_init): Likewise. * libio/iofopncook.c (_IO_fopencookie): Likewise. (_IO_old_fopencookie): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iogetline.c (_IO_getline): Likewise. (_IO_getline_info): Likewise. * libio/iogetwline.c (_IO_getwline): Likewise. (_IO_getwline_info): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * locale/programs/simple-hash.c (insert_entry_2): Likewise. (find_entry): Likewise. (iterate_table): Likewise. (lookup): Likewise. * login/forkpty.c (forkpty): Likewise. * misc/hsearch_r.c (__hsearch_r): Likewise. * misc/select.c (__select): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore): Likewise. * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0): Likewise. * nptl/old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0): Likewise. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_getpshared.c (pthread_barrierattr_getpshared): Likewise. * nptl/pthread_getschedparam.c (__pthread_getschedparam): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * nptl/pthread_setschedparam.c (__pthread_setschedparam): Likewise. * socket/recvfrom.c (__recvfrom): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * stdio-common/_itoa.c (_itoa): Likewise. * stdio-common/_itowa.c (_itowa): Likewise. * stdio-common/reg-printf.c (__register_printf_specifier): Likewise. (__register_printf_function): Likewise. * stdio-common/tempname.c (__path_search): Likewise. * stdlib/addmul_1.c (mpn_addmul_1): Likewise. * stdlib/mul_1.c (mpn_mul_1): Likewise. * stdlib/random_r.c (__initstate_r): Likewise. * stdlib/setenv.c (__add_to_environ): Likewise. * stdlib/submul_1.c (mpn_submul_1): Likewise. * streams/getpmsg.c (getpmsg): Likewise. * streams/putmsg.c (putmsg): Likewise. * streams/putpmsg.c (putpmsg): Likewise. * sunrpc/clnt_raw.c (clntraw_call): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. * sunrpc/clnt_udp.c (clntudp_create): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. * sunrpc/pm_getport.c (pmap_getport): Likewise. * sunrpc/svc_udp.c (cache_get): Likewise. * sunrpc/xdr_array.c (xdr_vector): Likewise. * sysdeps/mach/hurd/getcwd.c (__canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/pselect.c (__pselect): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/sparc/nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise. * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Likewise. * sysvipc/semtimedop.c (semtimedop): Likewise. * time/setitimer.c (__setitimer): Likewise. * time/strftime_l.c (emacs_strftime): Likewise.
157 lines
3.7 KiB
C
157 lines
3.7 KiB
C
/* Copyright (C) 1991-2015 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#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>
|
|
|
|
#ifndef MIN
|
|
# define MIN(a, b) ((a) < (b) ? (a) : (b))
|
|
#endif
|
|
|
|
static const char dev[] = "/dev";
|
|
|
|
static int getttyname_r (int fd, char *buf, size_t buflen,
|
|
dev_t mydev, ino_t myino, int save,
|
|
int *dostat) __THROW internal_function;
|
|
|
|
static int
|
|
internal_function
|
|
getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino,
|
|
int save, int *dostat)
|
|
{
|
|
struct stat st;
|
|
DIR *dirstream;
|
|
struct dirent *d;
|
|
|
|
dirstream = __opendir (dev);
|
|
if (dirstream == NULL)
|
|
{
|
|
*dostat = -1;
|
|
return errno;
|
|
}
|
|
|
|
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"))
|
|
{
|
|
char *cp;
|
|
size_t needed = _D_EXACT_NAMLEN (d) + 1;
|
|
|
|
if (needed > buflen)
|
|
{
|
|
*dostat = -1;
|
|
(void) __closedir (dirstream);
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
cp = __stpncpy (&buf[sizeof (dev)], d->d_name, needed);
|
|
cp[0] = '\0';
|
|
|
|
if (stat (buf, &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);
|
|
__set_errno (save);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
(void) __closedir (dirstream);
|
|
__set_errno (save);
|
|
/* It is not clear what to return in this case. `isatty' says FD
|
|
refers to a TTY but no entry in /dev has this inode. */
|
|
return ENOTTY;
|
|
}
|
|
|
|
/* Store at most BUFLEN character of the pathname of the terminal FD is
|
|
open on in BUF. Return 0 on success, otherwise an error number. */
|
|
int
|
|
__ttyname_r (int fd, char *buf, size_t buflen)
|
|
{
|
|
struct stat st;
|
|
int dostat = 0;
|
|
int save = errno;
|
|
int ret;
|
|
|
|
/* Test for the absolute minimal size. This makes life easier inside
|
|
the loop. */
|
|
if (!buf)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return EINVAL;
|
|
}
|
|
|
|
if (buflen < (int) (sizeof (dev) + 1))
|
|
{
|
|
__set_errno (ERANGE);
|
|
return ERANGE;
|
|
}
|
|
|
|
if (!__isatty (fd))
|
|
{
|
|
__set_errno (ENOTTY);
|
|
return ENOTTY;
|
|
}
|
|
|
|
if (fstat (fd, &st) < 0)
|
|
return errno;
|
|
|
|
/* Prepare the result buffer. */
|
|
memcpy (buf, dev, sizeof (dev) - 1);
|
|
buf[sizeof (dev) - 1] = '/';
|
|
buflen -= sizeof (dev);
|
|
|
|
#ifdef _STATBUF_ST_RDEV
|
|
ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino, save,
|
|
&dostat);
|
|
#else
|
|
ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino, save,
|
|
&dostat);
|
|
#endif
|
|
|
|
if (ret && dostat != -1)
|
|
{
|
|
dostat = 1;
|
|
#ifdef _STATBUF_ST_RDEV
|
|
ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino,
|
|
save, &dostat);
|
|
#else
|
|
ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino,
|
|
save, &dostat);
|
|
#endif
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
weak_alias (__ttyname_r, ttyname_r)
|