diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-08-02 21:00:51 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-08-02 21:00:51 +0000 |
commit | 8f2ece695d8822e9ecc63ecd157e90bf17a6fe65 (patch) | |
tree | 8391ab64ce8c9c6e45d137905f75f1d17c9ed987 /inet | |
parent | 3996f34b46043ed8ea8fdc6f44377d969d64396b (diff) | |
download | glibc-8f2ece695d8822e9ecc63ecd157e90bf17a6fe65.tar.gz |
Update.
1997-08-02 21:27 Ulrich Drepper <drepper@cygnus.com>
* inet/Makefile (headers): Rename netinet/inbits.h to bits/in.h.
* inet/netinet/in.h: Include bits/in.h instead of netinet/inbits.h.
* sysdeps/generic/netinet/inbits.h: Move to...
* sysdeps/generic/bits/in.h: ... here.
* sysdeps/unix/sysv/linux/bits/inbits.h: Move to ...
* sysdeps/unix/sysv/linux/bits/in.h: ... here.
* nis/Makefile (headers): Add bits/nislib.h.
* nis/rpcsvc/nislib.h: Moved to ....
* nis/bits/nislib.h: ... here.
* nis/nss_compat/compat-grp.c: Don't include <rpcsvc/nislib.h>.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nis/nss_nisplus/nisplus-alias.c: Likewise.
* nis/nss_nisplus/nisplus-ethers.c: Likewise.
* nis/nss_nisplus/nisplus-grp.c: Likewise.
* nis/nss_nisplus/nisplus-hosts.c: Likewise.
* nis/nss_nisplus/nisplus-netgrp.c: Likewise.
* nis/nss_nisplus/nisplus-ntework.c: Likewise.
* nis/nss_nisplus/nisplus-proto.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nss_nisplus/nisplus-pwd.c: Likewise.
* nis/nss_nisplus/nisplus-rpc.c: Likewise.
* nis/nss_nisplus/nisplus-service.c: Likewise.
* nis/nss_nisplus/nisplus-spwd.c: Likewise.
* nis/rpcsvc/nis.x: Include bits/nislib.h, not rpcsvc/nislib.h.
* nis/rpcsvc/nis.h: Likewise.
* inet/getnameinfo.c (nrl_domainname): Change return type to const
char *.
(getnameinfo): Change type of local variable c to const char *.
* inet/inet_ntoa.c: Rewrite to use __libc_once for initialization.
* stdlib/fmtmsg.c: Likewise.
* intl/bindtextdom.c: Update from latest gettext.
* intl/dcgettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/localealias.c: Likewise.
* intl/textdomain.c: Likewise.
* login/getutid_r.c: Remove parameter to setutent call.
* login/getutline_r.c: Likewise.
* posix/wordexp.c: Complete rewrite. Not fully implemented yet,
though. Patch by Tim Waugh <tim@cyberelk.demon.co.uk>.
* stdio-common/printf_fp.c: Remove relative include paths.
* stdio-common/printf_fphex.c: Likewise.
* sysdeps/generic/crypt.h: Cleanup. Don't define non standard
elements unless __USE_GNU.
* sysdeps/generic/vlimit.c: Pretty print.
* sysdeps/generic/vtimes.c: Likewise.
* sysdeps/i386/elf/bsd-_setjmp.S: New file. Empty dummy file.
* sysdeps/i386/elf/bsd-setjmp.S: New file. Empty dummy file.
* sysdeps/i386/elf/setjmp.S: New file. Define __setjmp and also
weak definitions of setjmp and _setjmp.
* sysdeps/i386/fpu/bits/mathinline.h: More patches by John Bowman.
* sysdeps/stub/if_index.h: Set errno in all functions and add
stub warnings.
* sysdeps/stub/libc-lock.h: Add __libc_once.
1997-08-02 01:57 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/ptrace.c: Don't set errno in error
case since the __syscall_ptrace call already did this.
Reported by Philip Gladstone <philip@talon.raptor.com>.
1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/fsuid.h: Change include
<gnu/types.h> to <sys/types.h>.
1997-08-01 23:18 Ulrich Drepper <drepper@cygnus.com>
* csu/defs.awk: Fix regexp for end and align.
Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.
* locale/programs/localedef.c (print_escaped): New function.
(show_info): Use print_escaped if strings can control unprintable
characters.
Patch by Jochen Hein <jochen.hein@delphi.central.de>.
1997-08-01 18:45 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_nisplus/nisplus-alias.c: Fix NULL pointer problems
* nis/nss_nisplus/nisplus-grp.c: Likewise.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-profile.c (_dl_start_profile): Use _dl_sysdep_error
instead of fprintf.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* manual/socket.texi (Host Address Functions): Fix arguments of
@deftypefun.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-runtime.c: Avoid warning about profile_fixup being
unused.
* sysdeps/m68k/dl-machine.h: Add support for shared library
profiling.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Add onlymd5-crypt.o for
dependencies.
1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (subdirs): Distribute both aout and elf.
1997-07-31 23:04 Mark Kettenis <kettenis@phys.uva.nl>
* login/utmp-private.h: Remove reset argument from backend
setutent.
* login/getutent_r.c (__setutent): Allways call the setutent
function in the daemon backend.
(setutent_unknown): Function removed.
(getutent_unknown, pututline_unknown): Call __setutent instead of
setutent_unknown.
* login/utmp_file.c (setutent_file): Removed reset argument. All
callers changed.
* login/utmp_daemon.c (setutent_daemon): Removed reset
argument. All callers changed. Try to open connection even if a
previous connection failed, but first check if the sockets exist
in the filesystem.
* login/utmp_daemon.c (pututline_daemon): Try to open connection
before reporting failure.
* login/programs/database.c (open_database): Create compatibility
file if it does not already exist. Supply mode argument in open
calls to guarantee that created files have the proper protection.
* login/programs/utmpd.c (main): Remove files created by a
previous `bind' before creating sockets.
Suggested by a sun <asum@zoology.washington.edu>.
1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c: Remove unneeded function check_int_exec.
* BUGS: Correct typos.
* gmon/gmon.c: Add alias for monstartup, declare _strerror_internal.
1997-07-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/socket.texi (Host Address Functions): Reformat inet_ntop
entry to confirm with expected behaviour of some scripts.
* libc.map: Add functions/variables in global namespace,
remove wildcards.
1997-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* resolv/libresolv.map: Add variables and routines used by named,
nslookup and other bind utils.
* libc.map: Likewise.
1997-07-31 00:35 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/unix/sysv/linux/if_index.c: Rewrite to avoid using /proc
filesystem.
* inet/test_ifindex.c: New file.
* inet/Makefile (tests): Add test_ifindex.
1997-08-01 04:25 Ulrich Drepper <drepper@cygnus.com>
* nis/nss_nisplus/nisplus-parser.c: Fix another bug in the parser.
Patch by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>.
* manual/errno.texi: Fix typo.
Reported by Erik Talvola <etalvo@sapient.com>.
(write_hist): Remove dependency on 32 bit int.
Diffstat (limited to 'inet')
-rw-r--r-- | inet/Makefile | 4 | ||||
-rw-r--r-- | inet/getnameinfo.c | 4 | ||||
-rw-r--r-- | inet/inet_ntoa.c | 74 | ||||
-rw-r--r-- | inet/netinet/in.h | 6 | ||||
-rw-r--r-- | inet/test_ifindex.c | 59 |
5 files changed, 100 insertions, 47 deletions
diff --git a/inet/Makefile b/inet/Makefile index 0237d0b45d..9a70c316b5 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -23,7 +23,7 @@ subdir := inet headers := netinet/ether.h netinet/in.h netinet/if_ether.h \ netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \ - aliases.h netinet/ip6.h netinet/icmp6.h netinet/inbits.h + aliases.h netinet/ip6.h netinet/icmp6.h bits/in.h distribute := netgroup.h @@ -46,7 +46,7 @@ routines := htonl htons \ getaliasent_r getaliasent getaliasname getaliasname_r \ in6_addr getnameinfo if_index -tests := htontest +tests := htontest test_ifindex # No warnings about losing BSD code. CFLAGS-rcmd.c = -w diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 037578f277..e6f4cbfc94 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -77,7 +77,7 @@ struct hostent *_addr2hostname_hosts (const char *, int, int); #endif /* min */ -static char * +static const char * nrl_domainname (void) { static const char *domain = NULL; @@ -267,7 +267,7 @@ getnameinfo (const struct sockaddr *sa, size_t addrlen, char *host, { if (flags & NI_NOFQDN) { - char *c; + const char *c; if ((c = nrl_domainname ()) && (c = strstr(h->h_name, c)) && (c != h->h_name) && (*(--c) == '.')) { diff --git a/inet/inet_ntoa.c b/inet/inet_ntoa.c index 9e4b2af5b9..5dfec626a0 100644 --- a/inet/inet_ntoa.c +++ b/inet/inet_ntoa.c @@ -26,60 +26,45 @@ /* The interface of this function is completely stupid, it requires a static buffer. We relax this a bit in that we allow at least one buffer for each thread. */ -__libc_lock_define_initialized (static, lock); /* This is the key for the thread specific memory. */ static __libc_key_t key; +/* If nonzero the key allocation failed and we should better use a + static buffer than fail. */ +static char local_buf[18]; +static char *static_buf; + /* Destructor for the thread-specific data. */ +static void init (void); static void free_key_mem (void *mem); char * inet_ntoa (struct in_addr in) { - static char static_buf[18]; - static int initialized = 0; - char *buffer = NULL; + __libc_once_define (once); + char *buffer; unsigned char *bytes; /* If we have not yet initialized the buffer do it now. */ - if (!initialized) - { - /* Make sure there is only one process doing the initialization. */ - __libc_lock_lock (lock); - - if (!initialized) - { - if (__libc_key_create (&key, free_key_mem)) - /* Creating the key failed. This either means we run - have only a single-threaded application or something - really went wrong. In any case use a static buffer - which is better than nothing. */ - buffer = static_buf; - else - /* We have a key. */ - initialized = 1; - } - - __libc_lock_unlock (lock); - } + __libc_once (once, init); + if (static_buf != NULL) + return static_buf; + + /* We don't use the static buffer and so we have a key. Use it to + get the thread-specific buffer. */ + buffer = __libc_getspecific (key); if (buffer == NULL) { - /* We don't use the static buffer and so we have a key. Use it - to get the thread-specific buffer. */ - buffer = __libc_getspecific (key); + /* No buffer allocated so far. */ + buffer = malloc (18); if (buffer == NULL) - { - /* No buffer allocated so far. */ - buffer = malloc (18); - if (buffer == NULL) - /* No more memory available. We use the static buffer. */ - buffer = static_buf; - else - __libc_setspecific (key, buffer); - } + /* No more memory available. We use the static buffer. */ + buffer = local_buf; + else + __libc_setspecific (key, buffer); } bytes = (unsigned char *) ∈ @@ -89,12 +74,21 @@ inet_ntoa (struct in_addr in) } +/* Initialize buffer. */ +static void +init (void) +{ + if (__libc_key_create (&key, free_key_mem)) + /* Creating the key failed. This means something really went + wrong. In any case use a static buffer which is better than + nothing. */ + static_buf = local_buf; +} + + +/* free the thread specific data, this is done if a thread terminates. */ static void free_key_mem (void *mem) { free (mem); - - /* And we must set the data to NULL so that the destructor is not - called again. */ - __libc_setspecific (key, NULL); } diff --git a/inet/netinet/in.h b/inet/netinet/in.h index 9eda281360..faaf7e8a63 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -140,7 +140,7 @@ struct in_addr #define IN_LOOPBACKNET 127 /* Address to loopback in software to local host. */ #ifndef INADDR_LOOPBACK -#define INADDR_LOOPBACK ((unsigned) 0x7f000001) /* Inet address 127.0.0.1. */ +# define INADDR_LOOPBACK ((unsigned) 0x7f000001) /* Inet 127.0.0.1. */ #endif @@ -208,7 +208,7 @@ struct ipv6_mreq }; /* Get system-specific definitions. */ -#include <netinet/inbits.h> +#include <bits/in.h> /* Functions to convert between host and network byte order. @@ -272,7 +272,7 @@ extern uint16_t htons __P ((uint16_t __hostshort)); (((uint32_t *) (a))[1] == ((uint32_t *) (b))[2]) && \ (((uint32_t *) (a))[2] == ((uint32_t *) (b))[1]) && \ (((uint32_t *) (a))[3] == ((uint32_t *) (b))[3])) - + /* Bind socket to a privileged IP port. */ extern int bindresvport __P ((int __sockfd, struct sockaddr_in *__sin)); diff --git a/inet/test_ifindex.c b/inet/test_ifindex.c new file mode 100644 index 0000000000..f0a34cf0da --- /dev/null +++ b/inet/test_ifindex.c @@ -0,0 +1,59 @@ +/* Test interface name <-> index conversions. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Philip Blundell <Philip.Blundell@pobox.com>. + + 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 <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <net/if.h> + +int +main (void) +{ + int failures = 0; + struct if_nameindex *idx = if_nameindex (), *p; + if (idx == NULL) + { + if (errno != ENOSYS) + { + printf ("Couldn't get any interfaces.\n"); + exit (1); + } + /* The function is simply not implemented. */ + exit (0); + } + + printf ("Idx Name | Idx Name\n"); + + for (p = idx; p->if_index || p->if_name; ++p) + { + char buf[IFNAMSIZ]; + int ni, result; + printf ("%3d %15s | ", p->if_index, p->if_name); + printf ("%3d", ni = if_nametoindex (p->if_name)); + printf ("%15s", if_indextoname (p->if_index, buf)); + result = (ni != p->if_index || (strcmp (buf, p->if_name))); + printf ("%10s", result ? "fail" : "okay"); + printf ("\n"); + failures += result; + } + if_freenameindex (idx); + exit (failures ? 1 : 0); +} |