mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 01:40:26 +00:00
40a55d2054
1997-08-20 05:30 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c (catclose): Use __munmap instead of munmap. * catgets/gencat.c (read_input_file): Fix typo. * dirent/dirent.h: Make seekdir and telldir available for __USE_XOPEN. * elf/dl-load.c: Fix case of missing DT_RPATH in object which gets executed (e.g., when it is a static binary). * intl/bindtextdomain.c: Use strdup in glibc. Correct comment. * intl/dcgettext.c: Likewise. * intl/dgettext.c: Likewise. * intl/explodename.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettext.c: Likewise. * intl/gettext.h: Likewise. * intl/hash-string.h: Likewise. * intl/l10nflist.c: Likewise. * intl/libintl.h: Likewise. * intl/loadinfo.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. Unify libio sources with code in libg++. * libio/fcloseall.c: Update and reformat copyright. Protect use of weak_alias. Use _IO_* thread macros instead of __libc_*. * libio/feof.c: Likewise. * libio/feof_u.c: Likewise. * libio/ferror.c: Likewise. * libio/ferror_u.c: Likewise. * libio/fgetc.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileno.c: Likewise. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/fputc_u.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/genops.c: Likewise. * libio/getc.c: Likewise. * libio/getc_u.c: Likewise. * libio/getchar.c: Likewise. * libio/getchar_u.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofprintf.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/iosprintf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/obprintf.c: Likewise. * libio/pclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strfile.h: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * manual/libc.texinfo: Add menu entries for chapter on message translation. * manual/locale.texi: Correct next entry in @node for new chapter. * manual/search.texi: Likewise for previous link. * manual/message.texi: New file. * manual/startup.texi: Document LC_ALL, LC_MESSAGES, NLSPATH, setenv, unsetenv, and clearenv. * manual/string.texi: Fix typos. Patch by Jim Meyering. * math/Makefile (test-longdouble-yes): Enable. We want long double tests now. Crusade against strcat. * nis/nss_nisplus/nisplus-publickey.c: Remove uses of strcat. * stdlib/canonicalize.c: Likewise. * posix/glob.h: Define __const if necessary. Use __const in all prototypes. * sysdeps/generic/stpcpy.c: Use K&R form to allow use in other GNU packages. * posix/wordexp.c: Completely reworked buffer handling for much better performance. Patch by Tim Waugh. * socket/sys/sochet.h (getpeername): Fix type of LEN parameter, it must be socklen_t. * sysdeps/libm-i387/e_remainder.S: Pretty print. * sysdeps/libm-i387/e_remainderf.S: Likewise. * sysdeps/libm-i387/e_remainderl.S: Pop extra value for FPU stack. * sysdeps/libm-i387/s_cexp.S: Little optimization. * sysdeps/libm-i387/s_cexpl.S: Likewise. * sysdep/libm-ieee754/s_csinhl.c: Include <fenv.h>. 1997-08-18 15:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Fix memory leak in cleanup code. 1997-08-17 Paul Eggert <eggert@twinsun.com> * tzset.c (__tzset_internal): Fix memory leak when the user specifies a TZ value that uses a default rule file. Do not assume US DST rules when the user specifies that there is no DST. 1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c: Tidy up. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0 if using stub code. (if_indextoname): Use SIOGIFNAME ioctl if the kernel supports it. (if_nameindex): Use alloca() rather than malloc(); use SIOCGIFCOUNT ioctl if the kernel supports it. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sys/mount.h: Remove the IS_* macros, they operate on internal kernel structures and have no place in a user header. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (lib%.so): Depend on $(+preinit) and $(+postinit). (build-shlib): Filter them out of $^. 1997-08-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-error.c (_dl_signal_error): Fix error message. 1997-08-16 04:06 Ulrich Drepper <drepper@cygnus.com> * assert/assert.h [__USE_GNU]: Undefine assert_perror. Reported by Theodore C. Belding <Ted.Belding@umich.edu>. 1997-08-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Change object suffixes from *.[spgb]o to *.o[spgb] to avoid conflict with PO files. * Makerules: Likewise. * Rules: Likewise. * elf/Makefile: Likewise. * extra-lib.mk: Likewise. * gmon/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * resolv/Makefile: Likewise. * rpm/Makefile: Likewise. * sunrpc/Makefile: Likewise. * sysdeps/sparc/elf/Makefile: Likewise. * sysdeps/sparc64/elf/Makefile: Likewise. * sysdeps/unix/sysv/linux/sparc/Makefile: Likewise. (ASFLAGS-.os): Renamed from as-FLAGS.os.
357 lines
8.1 KiB
C
357 lines
8.1 KiB
C
/* The Inner Net License, Version 2.00
|
|
|
|
The author(s) grant permission for redistribution and use in source and
|
|
binary forms, with or without modification, of the software and documentation
|
|
provided that the following conditions are met:
|
|
|
|
0. If you receive a version of the software that is specifically labelled
|
|
as not being for redistribution (check the version message and/or README),
|
|
you are not permitted to redistribute that version of the software in any
|
|
way or form.
|
|
1. All terms of the all other applicable copyrights and licenses must be
|
|
followed.
|
|
2. Redistributions of source code must retain the authors' copyright
|
|
notice(s), this list of conditions, and the following disclaimer.
|
|
3. Redistributions in binary form must reproduce the authors' copyright
|
|
notice(s), this list of conditions, and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
4. All advertising materials mentioning features or use of this software
|
|
must display the following acknowledgement with the name(s) of the
|
|
authors as specified in the copyright notice(s) substituted where
|
|
indicated:
|
|
|
|
This product includes software developed by <name(s)>, The Inner
|
|
Net, and other contributors.
|
|
|
|
5. Neither the name(s) of the author(s) nor the names of its contributors
|
|
may be used to endorse or promote products derived from this software
|
|
without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY ITS AUTHORS AND CONTRIBUTORS ``AS IS'' AND ANY
|
|
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY
|
|
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
If these license terms cause you a real problem, contact the author. */
|
|
|
|
/* This software is Copyright 1996 by Craig Metz, All Rights Reserved. */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
#include <sys/un.h>
|
|
#include <sys/utsname.h>
|
|
#include <netdb.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <alloca.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#ifndef min
|
|
# define min(x,y) (((x) > (y)) ? (y) : (x))
|
|
#endif /* min */
|
|
|
|
|
|
static char *
|
|
nrl_domainname (void)
|
|
{
|
|
static char *domain = NULL;
|
|
static int first = 1;
|
|
|
|
if (first)
|
|
{
|
|
__libc_lock_define_initialized (static, lock);
|
|
__libc_lock_lock (lock);
|
|
|
|
if (first)
|
|
{
|
|
char *c;
|
|
struct hostent *h, th;
|
|
size_t tmpbuflen = 1024;
|
|
char *tmpbuf = alloca (tmpbuflen);
|
|
int herror;
|
|
|
|
first = 0;
|
|
|
|
while (__gethostbyname_r ("localhost", &th, tmpbuf, tmpbuflen, &h,
|
|
&herror))
|
|
{
|
|
if (herror == NETDB_INTERNAL && errno == ERANGE)
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = alloca (tmpbuflen);
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
if (h && (c = strchr (h->h_name, '.')))
|
|
domain = __strdup (++c);
|
|
else
|
|
{
|
|
/* The name contains no domain information. Use the name
|
|
now to get more information. */
|
|
while (gethostname (tmpbuf, tmpbuflen))
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = alloca (tmpbuflen);
|
|
}
|
|
|
|
if ((c = strchr (tmpbuf, '.')))
|
|
domain = __strdup (++c);
|
|
else
|
|
{
|
|
/* We need to preserve the hostname. */
|
|
const char *hstname = strdupa (tmpbuf);
|
|
|
|
while (__gethostbyname_r (hstname, &th, tmpbuf, tmpbuflen,
|
|
&h, &herror))
|
|
{
|
|
if (herror == NETDB_INTERNAL && errno == ERANGE)
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = alloca (tmpbuflen);
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
if (h && (c = strchr(h->h_name, '.')))
|
|
domain = __strdup (++c);
|
|
else
|
|
{
|
|
struct in_addr in_addr;
|
|
|
|
in_addr.s_addr = htonl (0x7f000001);
|
|
|
|
while (__gethostbyaddr_r ((const char *) &in_addr,
|
|
sizeof (struct in_addr),
|
|
AF_INET, &th, tmpbuf,
|
|
tmpbuflen, &h, &herror))
|
|
{
|
|
if (herror == NETDB_INTERNAL && errno == ERANGE)
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = alloca (tmpbuflen);
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
if (h && (c = strchr (h->h_name, '.')))
|
|
domain = __strdup (++c);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
return domain;
|
|
};
|
|
|
|
|
|
int
|
|
getnameinfo (const struct sockaddr *sa, size_t addrlen, char *host,
|
|
size_t hostlen, char *serv, size_t servlen, int flags)
|
|
{
|
|
int serrno = errno;
|
|
int tmpbuflen = 1024;
|
|
int herrno;
|
|
char *tmpbuf = alloca (tmpbuflen);
|
|
struct hostent th;
|
|
|
|
if (sa == NULL)
|
|
return -1;
|
|
|
|
if (host != NULL && hostlen > 0)
|
|
switch(sa->sa_family)
|
|
{
|
|
case AF_INET:
|
|
case AF_INET6:
|
|
if (!(flags & NI_NUMERICHOST))
|
|
{
|
|
struct hostent *h = NULL;
|
|
if (h == NULL)
|
|
{
|
|
if (sa->sa_family == AF_INET6)
|
|
{
|
|
while (__gethostbyaddr_r ((void *) &(((struct sockaddr_in6 *) sa)->sin6_addr),
|
|
sizeof(struct in6_addr),
|
|
AF_INET6, &th, tmpbuf, tmpbuflen,
|
|
&h, &herrno))
|
|
{
|
|
if (herrno == NETDB_INTERNAL)
|
|
{
|
|
if (errno == ERANGE)
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = alloca (tmpbuflen);
|
|
}
|
|
else
|
|
{
|
|
__set_h_errno (herrno);
|
|
__set_errno (serrno);
|
|
return -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
while (__gethostbyaddr_r ((void *) &(((struct sockaddr_in *)sa)->sin_addr),
|
|
sizeof(struct in_addr), AF_INET,
|
|
&th, tmpbuf, tmpbuflen,
|
|
&h, &herrno))
|
|
{
|
|
if (errno == ERANGE)
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = alloca (tmpbuflen);
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (h)
|
|
{
|
|
if (flags & NI_NOFQDN)
|
|
{
|
|
char *c;
|
|
if ((c = nrl_domainname ()) && (c = strstr(h->h_name, c))
|
|
&& (c != h->h_name) && (*(--c) == '.'))
|
|
{
|
|
strncpy (host, h->h_name,
|
|
min(hostlen, (size_t) (c - h->h_name)));
|
|
break;
|
|
}
|
|
}
|
|
strncpy (host, h->h_name, hostlen);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (flags & NI_NAMEREQD)
|
|
{
|
|
__set_errno (serrno);
|
|
return -1;
|
|
}
|
|
else
|
|
{
|
|
const char *c;
|
|
#if INET6
|
|
if (sa->sa_family == AF_INET6)
|
|
c = inet_ntop (AF_INET6,
|
|
(void *) &(((struct sockaddr_in6 *) sa)->sin6_addr),
|
|
host, hostlen);
|
|
else
|
|
#endif /* INET6 */
|
|
c = inet_ntop (AF_INET,
|
|
(void *) &(((struct sockaddr_in *) sa)->sin_addr),
|
|
host, hostlen);
|
|
|
|
if (c == NULL)
|
|
{
|
|
__set_errno (serrno);
|
|
return -1;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case AF_LOCAL:
|
|
if (!(flags & NI_NUMERICHOST))
|
|
{
|
|
struct utsname utsname;
|
|
|
|
if (!uname (&utsname))
|
|
{
|
|
strncpy (host, utsname.nodename, hostlen);
|
|
break;
|
|
};
|
|
};
|
|
|
|
if (flags & NI_NAMEREQD)
|
|
{
|
|
__set_errno (serrno);
|
|
return -1;
|
|
}
|
|
|
|
strncpy (host, "localhost", hostlen);
|
|
break;
|
|
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
if (serv && (servlen > 0))
|
|
switch(sa->sa_family)
|
|
{
|
|
case AF_INET:
|
|
case AF_INET6:
|
|
if (!(flags & NI_NUMERICSERV))
|
|
{
|
|
struct servent *s, ts;
|
|
while (__getservbyport_r (((struct sockaddr_in *) sa)->sin_port,
|
|
((flags & NI_DGRAM) ? "udp" : "tcp"),
|
|
&ts, tmpbuf, tmpbuflen, &s))
|
|
{
|
|
if (herrno == NETDB_INTERNAL)
|
|
{
|
|
if (errno == ERANGE)
|
|
{
|
|
tmpbuflen *= 2;
|
|
tmpbuf = __alloca (tmpbuflen);
|
|
}
|
|
else
|
|
{
|
|
__set_errno (serrno);
|
|
return -1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
if (s)
|
|
{
|
|
strncpy (serv, s->s_name, servlen);
|
|
break;
|
|
}
|
|
}
|
|
snprintf (serv, servlen, "%d",
|
|
ntohs (((struct sockaddr_in *) sa)->sin_port));
|
|
break;
|
|
|
|
case AF_LOCAL:
|
|
strncpy (serv, ((struct sockaddr_un *) sa)->sun_path, servlen);
|
|
break;
|
|
}
|
|
|
|
if (host && (hostlen > 0))
|
|
host[hostlen-1] = 0;
|
|
if (serv && (servlen > 0))
|
|
serv[servlen-1] = 0;
|
|
errno = serrno;
|
|
return 0;
|
|
}
|