mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
6591c33562
1998-01-30 19:58 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: Move to ... * posix/cpio.h: ...here. * locale/programs/ld-collate.c: Fix typo. * signal/signal.h: Declare _sys_siglist with NSIG+1 elements. * stdio-common/tiformat.c: Add checks for %#.0o and friends. * login/utmp_file.c (pututline_file): Don't always report success if similar entry is found. Patch by Mark M. Kettenis. 1998-01-30 16:06 Philip Blundell <pb@nexus.co.uk> * manual/Makefile: Don't try to install the info files if makeinfo is not available. 1998-01-30 12:05 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/bits/ioctls.h: Include a copy of the kernel's network ioctls, rather than using <linux/sockios.h> to get them. This way we are sure of maintaining compatibility if the kernel interface should change. 1998-01-30 15:52 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/Dist: Add netrose/rose.h. 1998-01-25 19:54 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/netrose/rose.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Install it. 1998-01-27 22:29 Zack Weinberg <zack@rabi.phys.columbia.edu> Implement System V pseudoterminal handling. * login/Makefile (routines): Add getpt, grantpt, unlockpt, ptsname. (libutil-routines): Remove pty. Add openpty, forkpty. (distribute): New internal header pty-internal.h. (others): Add the helper program, pt_chown. (install-others): Install it, in $(libexecdir), mode 4755. * login/pty-internal.h: New file. * login/openpty.c: New file. * login/forkpty.c: New file. * login/programs/pt_chown.c: New file. * libc.map: Add getpt, grantpt, unlockpt, ptsname, ptsname_r. * stdlib/stdlib.h: Prototype them. * config.make.in: Define $(libexecdir). * Makeconfig: Define $(inst_libexecdir). * sysdeps/generic/pty.c: Removed. * sysdeps/unix/sysv/linux/pty.c: Removed. * sysdeps/generic/getpt.c: Stub out. * sysdeps/generic/grantpt.c: Likewise. * sysdeps/generic/ptsname.c: Likewise. * sysdeps/generic/unlockpt.c: Likewise. * sysdeps/unix/grantpt.c: New file. * sysdeps/unix/bsd/getpt.c: New file. * sysdeps/unix/bsd/unlockpt.c: New file. * sysdeps/unix/sysv/linux/getpt.c: New file. * sysdeps/unix/sysv/linux/ptsname.c: New file. * sysdeps/unix/sysv/linux/unlockpt.c: New file. 1998-01-29 23:56 Ulrich Drepper <drepper@cygnus.com> * localedata/locales/ru_RU: Fix YESEXPR. Patch by lav@yars.free.net. 1998-01-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/Makefile (tests): Add rule for test-netdb.c. * nss/test-netdb.c: New file. 1998-01-29 02:38 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open.c (_dl_open): Make sure the variable `reloc' is really kept as a variable. Patch by Richard Henderson, reported by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. * elf/rtld.c (dl_main): Call _dl_init_paths before handling preloading. * elf/genrtldtbl.awk: Mark machine dependent directory of generated entries as not existing. 1998-01-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfprintf.c (process_arg): Fix printing of octal zero in alternate form with precision of zero, which must produce "0". Add braces to avoid ambiguous `else'. 1998-01-26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Fix memory leak and trailing null problem with strncpy. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/comapt-spwd.c: Likewise. 1998-01-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * assert/assert.h (assert_perror): Correct test for errnum. Patch by uch@nop.or.jp. [PR libc/437] 1997-12-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locales/pl_PL: Fix int_curr_symbol. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/nis_cache.c: Include <unistd.h> for declaration of close. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdio-common/test-popen.c: Include <errno.h>. * sysdeps/unix/sysv/linux/if_index.c: Include <unistd.h> for close. * inet/getnetgrent_r.c: Include <errno.h>. * db2/db/db_conv.c: Include <string.h> for memcpy. * gmon/bb_exit_func.c: Include <string.h> instead of <strings.h> so that memcpy is declared. * iconv/iconv_open.c: Include <stdlib.h> for alloca. * misc/init-misc.c: Remove unneeded inclusion of <errno.h>. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * pwd/fgetpwent_r.c (__fgetpwent_r): Correctly handle buffer overflow while reading line with fgets. * grp/fgetgrent_r.c (__fgetgrent_r): Likewise. 1998-01-27 00:46 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/types.h (__ipc_pid_t): Change to unsigned short, not short. Reported by Andreas Jaeger. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/mips/syscalls.list: Correct typo (ccept->accept). * sysdeps/generic/inttypes.h: Fix spelling. 1998-01-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/arm/Dist: Add bits/mman.h. * sysdeps/unix/sysv/linux/alpha/Dist: Add net/route.h. 1998-01-27 00:30 Ulrich Drepper <drepper@cygnus.com> * stdio-common/printf.h (struct print_info): Add new bitfield is_char. * stdio-common/printf-parse.h (parse_one_spec): Fill in is_char field for hh modifier. * stdio-common/vfprint.c: Use is_char field and do not depend in is_short having the value 2. Bug reported by Andreas Jaeger. 1998-01-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/freopen.c (freopen): Call _IO_old_freopen only if defined PIC && DO_VERSIONING. 1998-01-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Add rules for $(common-objpfx)dummy$o.
266 lines
5.6 KiB
C
266 lines
5.6 KiB
C
/* Copyright (C) 1997, 1998 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 <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <net/if.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/ioctl.h>
|
|
#include <bits/libc-lock.h>
|
|
|
|
/* Try to get a socket to talk to the kernel. */
|
|
#if defined SIOGIFINDEX || defined SIOGIFNAME
|
|
static int
|
|
internal_function
|
|
opensock (void)
|
|
{
|
|
/* Cache the last AF that worked, to avoid many redundant calls to
|
|
socket(). */
|
|
static int sock_af = -1;
|
|
int fd = -1;
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
if (sock_af != -1)
|
|
{
|
|
fd = socket (sock_af, SOCK_DGRAM, 0);
|
|
if (fd != -1)
|
|
return fd;
|
|
}
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (sock_af != -1)
|
|
fd = socket (sock_af, SOCK_DGRAM, 0);
|
|
|
|
if (fd == -1)
|
|
{
|
|
fd = socket (sock_af = AF_INET6, SOCK_DGRAM, 0);
|
|
if (fd < 0)
|
|
fd = socket (sock_af = AF_INET, SOCK_DGRAM, 0);
|
|
if (fd < 0)
|
|
fd = socket (sock_af = AF_IPX, SOCK_DGRAM, 0);
|
|
if (fd < 0)
|
|
fd = socket (sock_af = AF_AX25, SOCK_DGRAM, 0);
|
|
if (fd < 0)
|
|
fd = socket (sock_af = AF_APPLETALK, SOCK_DGRAM, 0);
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
return fd;
|
|
}
|
|
#endif
|
|
|
|
unsigned int
|
|
if_nametoindex (const char *ifname)
|
|
{
|
|
#ifndef SIOGIFINDEX
|
|
__set_errno (ENOSYS);
|
|
return 0;
|
|
#else
|
|
struct ifreq ifr;
|
|
int fd = opensock ();
|
|
|
|
if (fd < 0)
|
|
return 0;
|
|
|
|
strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
|
|
if (ioctl (fd, SIOGIFINDEX, &ifr) < 0)
|
|
{
|
|
int saved_errno = errno;
|
|
close (fd);
|
|
if (saved_errno == EINVAL)
|
|
__set_errno (ENOSYS);
|
|
return 0;
|
|
}
|
|
close (fd);
|
|
return ifr.ifr_ifindex;
|
|
#endif
|
|
}
|
|
|
|
void
|
|
if_freenameindex (struct if_nameindex *ifn)
|
|
{
|
|
struct if_nameindex *ptr = ifn;
|
|
while (ptr->if_name || ptr->if_index)
|
|
{
|
|
if (ptr->if_name)
|
|
free (ptr->if_name);
|
|
++ptr;
|
|
}
|
|
free (ifn);
|
|
}
|
|
|
|
struct if_nameindex *
|
|
if_nameindex (void)
|
|
{
|
|
#ifndef SIOGIFINDEX
|
|
__set_errno (ENOSYS);
|
|
return NULL;
|
|
#else
|
|
int fd = opensock ();
|
|
struct ifconf ifc;
|
|
unsigned int rq_ifs = 4, nifs, i;
|
|
int rq_len;
|
|
struct if_nameindex *idx = NULL;
|
|
#ifdef SIOCGIFCOUNT
|
|
static int siocgifcount_works = 1;
|
|
#endif
|
|
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
#ifdef SIOCGIFCOUNT
|
|
/* We may be able to find out how many interfaces really exist, rather
|
|
than guessing. This ioctl is not present in kernels before version
|
|
2.1.50. */
|
|
if (siocgifcount_works)
|
|
{
|
|
int serrno = errno;
|
|
|
|
if (ioctl (fd, SIOCGIFCOUNT, &nifs) < 0)
|
|
{
|
|
if (errno == EINVAL)
|
|
{
|
|
siocgifcount_works = 0;
|
|
__set_errno (serrno);
|
|
}
|
|
}
|
|
else
|
|
rq_ifs = nifs + 1;
|
|
}
|
|
#endif
|
|
|
|
ifc.ifc_buf = NULL;
|
|
|
|
/* Read all the interfaces out of the kernel. */
|
|
do
|
|
{
|
|
rq_len = ifc.ifc_len = rq_ifs * sizeof (struct ifreq);
|
|
ifc.ifc_buf = alloca (ifc.ifc_len);
|
|
if ((ifc.ifc_buf == NULL) || (ioctl (fd, SIOCGIFCONF, &ifc) < 0))
|
|
{
|
|
close (fd);
|
|
return NULL;
|
|
}
|
|
rq_ifs *= 2;
|
|
}
|
|
while (ifc.ifc_len == rq_len);
|
|
|
|
nifs = ifc.ifc_len / sizeof (struct ifreq);
|
|
|
|
idx = malloc ((nifs + 1) * sizeof (struct if_nameindex));
|
|
if (idx == NULL)
|
|
{
|
|
close (fd);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < nifs; ++i)
|
|
{
|
|
struct ifreq *ifr = &ifc.ifc_req[i];
|
|
idx[i].if_name = __strdup (ifr->ifr_name);
|
|
if (idx[i].if_name == NULL
|
|
|| ioctl (fd, SIOGIFINDEX, ifr) < 0)
|
|
{
|
|
int saved_errno = errno;
|
|
unsigned int j;
|
|
|
|
for (j = 0; j < i; ++j)
|
|
free (idx[j].if_name);
|
|
free (idx);
|
|
close (fd);
|
|
if (saved_errno == EINVAL)
|
|
__set_errno (ENOSYS);
|
|
return NULL;
|
|
}
|
|
idx[i].if_index = ifr->ifr_ifindex;
|
|
}
|
|
|
|
idx[i].if_index = 0;
|
|
idx[i].if_name = NULL;
|
|
|
|
close (fd);
|
|
return idx;
|
|
#endif
|
|
}
|
|
|
|
char *
|
|
if_indextoname (unsigned int ifindex, char *ifname)
|
|
{
|
|
#ifndef SIOGIFINDEX
|
|
__set_errno (ENOSYS);
|
|
return NULL;
|
|
#else
|
|
struct if_nameindex *idx;
|
|
struct if_nameindex *p;
|
|
char *result = NULL;
|
|
|
|
#ifdef SIOGIFNAME
|
|
/* We may be able to do the conversion directly, rather than searching a
|
|
list. This ioctl is not present in kernels before version 2.1.50. */
|
|
struct ifreq ifr;
|
|
int fd;
|
|
static int siogifname_works = 1;
|
|
|
|
if (siogifname_works)
|
|
{
|
|
int serrno = errno;
|
|
|
|
fd = opensock ();
|
|
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
ifr.ifr_ifindex = ifindex;
|
|
if (ioctl (fd, SIOGIFNAME, &ifr) < 0)
|
|
{
|
|
if (errno == EINVAL)
|
|
siogifname_works = 0; /* Don't make the same mistake twice. */
|
|
}
|
|
else
|
|
{
|
|
close (fd);
|
|
return strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
|
|
}
|
|
|
|
close (fd);
|
|
|
|
__set_errno (serrno);
|
|
}
|
|
#endif
|
|
|
|
idx = if_nameindex ();
|
|
|
|
if (idx != NULL)
|
|
{
|
|
for (p = idx; p->if_index || p->if_name; ++p)
|
|
if (p->if_index == ifindex)
|
|
{
|
|
result = strncpy (ifname, p->if_name, IFNAMSIZ);
|
|
break;
|
|
}
|
|
|
|
if_freenameindex (idx);
|
|
}
|
|
return result;
|
|
#endif
|
|
}
|