mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-12 12:07:12 +08:00
55c14926be
1997-08-04 15:29 Ulrich Drepper <drepper@cygnus.com> * locale/programs/localedef.c (main): Set bit in avail for those categories which are successfully read. * locale/programs/locfile.c (check_all_categories): Don't check categories if they are not available. (write_all_categories): Don't write categories if they are not available. * login/setutent_r.c (setutent_unknown): Change return type to int and return result of called function. * manual/arith.texi: Mark floating-point test macro from ISO C 9X as macros (not functions). * manual/libc.texinfo (UPDATED): Update. * manual/math.texi: Document exceptions, functions to handle exceptions, mathematical constants, FP comparison functions and several new functions from ISO C 9X. Change parameter of drand48, lrand48, and mrand48 to void (not empty). * manual/pattern.texi: Remove paragraph which explained that wordexp is executed by running a shell. * manual/time.texi: Explain difficulties with strftime if the functions returns 0 and no error occurred. * math/math.h: Correct comment for some M_* constants. (isgreater, isgreaterequal, isless, islessequal, islessgreater, inunordered): Rewrite to make sure the arguments are evaluated exactly once. * nis/rpcsvc/nis.x: Undo last change. * nis/rpcsvc/nis.h: Likewise. * nis/rpcsvc/nislib.h: File moved back to here. * posix/sys/types.h: Don't define socklen_t. Pretty print. * socket/sys/socket.h (bind, getsockname, connect, sendto, recvfrom, getsockopt, setsockopt, accept): Change size argument to type socklen_t. Pretty print. * manual/socket.texi: Describe socklen_t and change prototypes of socket functions to use socklen_t. * sysdeps/generic/bits/socket.h: Define socklen_t. (struct msghdr): Correct types to use socklen_t. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * stdio-common/printf_fp.c (__printf_fp): Correct rouding of number 1.0 < x < 8.0. * stdio-common/tfformat.c: Add new tests for above bug. * stdlib/strtod.c: Fix typo. * string/Makefile (headers): Add bits/string.h. (CFLAGS-*): Add -D__NO_STRING_INLINES. * string/string.h: Include <bits/string.h> if optimizing and __NO_STRING_INLINES is not defined. * sysdeps/stub/bits/string.h: New file. * sysdeps/powerpc/bits/fenv.h: Fix typos. * sysdeps/unix/sysv/linux/if_index.c: Let functions return ENOSYS if SIOGIFINDEX is not defined. * sysdeps/wordsize-32/inttypes.h: Pretty print. * sysdeps/wordsize-64/inttypes.h: Pretty print. * termios/cfsetspeed.c: Rewrite loop to do what it shall do. * wcsmbs/Makefile (tests): Add tst-wcstof. * wcsmbs/tst-wcstof.c: New file. 1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/__longjmp.c: Replace call to abort by infinite loop, to avoid dragging stdio into the dynamic linker. 1997-08-02 19:44 H.J. Lu <hjl@gnu.ai.mit.edu> * nis/nis_findserv.c (xid, xid_seed, xid_lookup): Make them u_int32_t. 1997-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c (parse_tilde): Fix calls to __getpwnam_r and __getpwuid_r. Include <stdio.h> to get prototypes of *printf. (exec_comm): Remove unneeded variable *sh. * libc.map: Add wordexp, wordfree. * posix/Makefile (routines): Add wordexp. 1997-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c: Correct typo in comment. (wordexp): Likewise. * manual/errno.texi (Error Codes): Fix typo. 1997-08-03 15:28 Ulrich Drepper <drepper@cygnus.com> * csu/initfini.c (SECTION): Don't put quotes around section name since this is not understood by all assemblers. Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.
203 lines
4.4 KiB
C
203 lines
4.4 KiB
C
/* Copyright (C) 1997 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 <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.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. */
|
|
static int
|
|
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;
|
|
}
|
|
|
|
unsigned int
|
|
if_nametoindex (const char *ifname)
|
|
{
|
|
#ifndef SIOGIFINDEX
|
|
__set_errno (ENOSYS);
|
|
#else
|
|
struct ifreq ifr;
|
|
int rc;
|
|
int fd = opensock ();
|
|
|
|
if (fd < 0)
|
|
return 0;
|
|
|
|
strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
|
|
rc = ioctl (fd, SIOGIFINDEX, &ifr);
|
|
if (rc < 0)
|
|
{
|
|
close (fd);
|
|
__set_errno (rc == -EINVAL ? ENOSYS : -rc);
|
|
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 rc;
|
|
int fd = opensock ();
|
|
struct ifconf ifc;
|
|
unsigned int rq_ifs = 4, nifs, i;
|
|
struct if_nameindex *idx = NULL;
|
|
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
ifc.ifc_buf = NULL;
|
|
|
|
/* Read all the interfaces out of the kernel. */
|
|
do
|
|
{
|
|
rq_ifs *= 2;
|
|
ifc.ifc_len = rq_ifs * sizeof (struct ifreq);
|
|
ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
|
|
if (ifc.ifc_buf == NULL)
|
|
{
|
|
close(fd);
|
|
return NULL;
|
|
}
|
|
if (ioctl (fd, SIOCGIFCONF, &ifc) < 0)
|
|
goto jump;
|
|
}
|
|
while ((unsigned int) ifc.ifc_len == (rq_ifs * sizeof (struct ifreq)));
|
|
|
|
nifs = ifc.ifc_len / sizeof (struct ifreq);
|
|
ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
|
|
|
|
idx = malloc ((nifs+1) * sizeof (struct if_nameindex));
|
|
if (idx == NULL)
|
|
goto jump;
|
|
|
|
for (i = 0; i < nifs; ++i)
|
|
{
|
|
struct ifreq *ifr = &ifc.ifc_req[i];
|
|
if ((idx[i].if_name = malloc (strlen (ifr->ifr_name)+1)) == NULL)
|
|
{
|
|
free (idx);
|
|
idx = NULL;
|
|
goto jump;
|
|
}
|
|
strcpy (idx[i].if_name, ifr->ifr_name);
|
|
rc = ioctl (fd, SIOGIFINDEX, ifr);
|
|
if (rc < 0)
|
|
{
|
|
free (idx);
|
|
idx = NULL;
|
|
__set_errno (rc == -EINVAL ? ENOSYS : -rc);
|
|
goto jump;
|
|
}
|
|
idx[i].if_index = ifr->ifr_ifindex;
|
|
}
|
|
idx[i].if_index = 0;
|
|
idx[i].if_name = NULL;
|
|
|
|
jump:
|
|
free (ifc.ifc_buf);
|
|
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 = if_nameindex ();
|
|
struct if_nameindex *p;
|
|
char *result;
|
|
|
|
if (idx == NULL)
|
|
result = NULL;
|
|
else
|
|
{
|
|
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
|
|
}
|