mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
1997-07-13 01:18 Ulrich Drepper <drepper@cygnus.com> * setjmp/setjmp.h: Define _setjmp and _longjmp also if __USE_XOPEN. * sysdeps/unix/sysv/linux/bits/ipc.h: Fix comment. * sysdeps/unix/sysv/linux/bits/msq.h: Likewise. * sysdeps/unix/sysv/linux/bits/sem.h: Likewise. * sysdeps/unix/sysv/linux/bits/shm.h: Likewise. * time/Makefile (routines): Add getdate. * time/time.h: Add prototype for getdate and getdate_r. * time/getdate.c: New file. Provided by Mark Kettenis <kettenis@phys.uva.nl>. 1997-06-30 14:49 H.J. Lu <hjl@gnu.ai.mit.edu> From Ralf Baechle <ralf@informatik.uni-koblenz.de> on Sat Jun 21 18:11:21 1997: * sysdeps/unix/sysv/linux/syscalls.list (swapon): Add __swapon alias. (swapoff): New. * elf/Makefile: Add linker script support. (headers): Add bits/dlfcn.h. * elf/dl-load.c (MAP_BASE_ADDR): New. * elf/dlfcn.h: Include <bits/dlfcn.h>. * elf/elf.h: Add MIPS support. * sysdeps/generic/Dist: Add entry.h. * sysdeps/generic/entry.h: New, define the entry symbol. * elf/rtld.c (_start): Include <entry.h>. Change to ENTRY_POINT. * sysdeps/generic/dl-sysdep.c (_start): Likewise. * mips/elf/start.S (_start): Likewise. * sysdeps/mips/bsd-_setjmp.S: Fix PIC. * sysdeps/mips/bsd-setjmp.S: Likewise. * sysdeps/mips/setjmp.S: Likewise. * mips/elf/start.S: Likewise. * sysdeps/unix/mips/brk.S: Likewise. * sysdeps/unix/mips/sysdep.S: Likewise. * sysdeps/unix/mips/sysdep.h: Likewise. * sysdeps/unix/mips/wait.S: Likewise. * sysdeps/mips/dl-machine.h: Update for Linux/MIPS. * sysdeps/mips/fpu_control.h: Likewise. * sysdeps/generic/bits/dlfcn.h: New file. * sysdeps/mips/rtld-ldscript.in: New for Linux/MIPS. * sysdeps/mips/rtld-parms: Likewise. * sysdeps/mips/bits/dlfcn.h: Likewise. * sysdeps/mips/mips64/rtld-parms: Likewise. * sysdeps/mips/mipsel/rtld-parms: Likewise. * sysdeps/unix/sysv/linux/mips/Dist: Likewise. * sysdeps/unix/sysv/linux/mips/Makefile: Likewise. * sysdeps/unix/sysv/linux/mips/clone.S: Likewise. * sysdeps/unix/sysv/linux/mips/entry.h: Likewise. * sysdeps/unix/sysv/linux/mips/fpregdef.h: Likewise. * sysdeps/unix/sysv/linux/mips/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/mips/kernel_sigaction.h: Likewise. * sysdeps/unix/sysv/linux/mips/kernel_stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/kernel_termios.h: Likewise. * sysdeps/unix/sysv/linux/mips/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/mips/regdef.h: Likewise. * sysdeps/unix/sysv/linux/mips/sgidefs.h: Likewise. * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/mips/ustat.c: Likewise. * sysdeps/unix/sysv/linux/mips/xmknod.c: Likewise. * sysdeps/unix/sysv/linux/mips/xstat.c: Likewise. * sysdeps/unix/sysv/linux/mips/bits/endian.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h: * sysdeps/unix/sysv/linux/mips/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/statfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/acct.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/asm.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/cachectl.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/fpregdef.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/regdef.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/syscall.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/sysmips.h: Likewise. 1997-04-09 19:05 H.J. Lu (hjl@gnu.ai.mit.edu) * isomac.c (xstrndup): New, use it instead of strndup (). 1997-07-02 08:55 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/i386/dl-machine.h (elf_machine_rel): Print the program name for different sizes. 1997-07-10 15:47 Fila Kolodny <fila@ibi.com> * nis/ypclnt.c: Change references to MAXHOSTNAMELEN to NIS_MAXNAMELEN. Add include of rpcsvc/nis.h. * inet/getnameinfo.c: Delete references to MAXHOSTNAMELEN. * sysdeps/posix/getaddrinfo.c: Likewise. Change size of variable buffer to be big enough to hold an IPv6 address in printable format. 1997-07-12 18:47 Ulrich Drepper <drepper@cygnus.com> * assert/assert.h [!NDEBUG] (assert, assert_perror): Don't use || and && in tests to allow use in C++ code which overloads these operators. Reported by Istvan Marko <istvan@cmdmail.amd.com>. * configure.in: Move mips64* recognition before mips*. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-07-03 20:44 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (lib%.so, $(common-objpfx)libc.so): Don't use automatic variables in dependency lists. (build-shlib): Always filter out the version script file. * extra-lib.mk ($(objpfx)$(lib).so): Depend on version script. 1997-07-12 17:56 Ulrich Drepper <drepper@cygnus.com> * login/login.c (tty_name): Test return value of ttyname_r for != 0, not < 0. * misc/ttyslot.c (ttyslot): Test return value of ttyname_r for == 0, not >= 0. * sysdeps/unix/getlogin.c (getlogin): Test return value of ttyname_r for != 0. * sysdeps/unix/getlogin_r.c (getlogin_r): Likewise. 1997-07-10 Andreas Jaeger <aj@arthur.rhein-neckar.de> * login/utmp_file.c (getutline_r_file): Fix type: compare with *result. 1997-07-11 00:21 Mark Kettenis <kettenis@phys.uva.nl> * login/Makefile (headers): Add utmpx.h and bits/utmpx.h. 1997-07-09 19:21 Mark Kettenis <kettenis@phys.uva.nl> * login/programs/utmpd.c, login/programs/database.c, login/programs/request.c: Prepare messages for internationalization. * login/programs/utmpd.c: (main): Change handling of errors in opening the database. * login/programs/database.c: (open_database, synchronize_dtatabase, initialize_database): Properly handle errors. (get_mtime): Use fstat instead of stat. All callers changed. * login/getutent_r.c: Make setutxent a weak alias for __setutxent. * login/getutent.c: Rename getutent to __getutent and make getutent a weak alias. Make getutxent a weak alias for __getutent. * login/utmpx.h: New file. * sysdeps/gnu/bits/utmp.h: Cleanup. Added comments. * sysdeps/gnu/bits/utmpx.h: New file. * stdio-common/strops.c: Partialy undo last change. Will need more investigation.
327 lines
8.1 KiB
C
327 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. */
|
|
|
|
#define INET6 1
|
|
#define LOCAL 1
|
|
#define HOSTTABLE 0
|
|
#define RESOLVER 1
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
#if LOCAL
|
|
#include <sys/un.h>
|
|
#include <sys/utsname.h>
|
|
#endif /* LOCAL */
|
|
#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 AF_LOCAL
|
|
#define AF_LOCAL AF_UNIX
|
|
#endif /* AF_LOCAL */
|
|
|
|
#if HOSTTABLE
|
|
struct hostent *_addr2hostname_hosts(const char *, int, int);
|
|
#endif /* HOSTTABLE */
|
|
|
|
#ifndef min
|
|
#define min(x,y) (((x) > (y)) ? (y) : (x))
|
|
#endif /* min */
|
|
|
|
static const char *domain;
|
|
|
|
static char *nrl_domainname(void)
|
|
{
|
|
static int first = 1;
|
|
|
|
if (first) {
|
|
|
|
__libc_lock_define_initialized (static, lock);
|
|
__libc_lock_lock (lock);
|
|
|
|
if (first) {
|
|
char *c;
|
|
struct hostent *h, th;
|
|
int tmpbuflen = 1024;
|
|
char *tmpbuf = __alloca(tmpbuflen);
|
|
int herror;
|
|
|
|
first = 0;
|
|
|
|
while (__gethostbyname_r("localhost", &th, tmpbuf, tmpbuflen, &h,
|
|
&herror)) {
|
|
if (herror == NETDB_INTERNAL) {
|
|
if (errno == ERANGE) {
|
|
tmpbuflen *= 2;
|
|
tmpbuf = __alloca(tmpbuflen);
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (h && (c = strchr(h->h_name, '.'))) {
|
|
domain = __strdup (++c);
|
|
goto ret;
|
|
}
|
|
|
|
while (gethostname (tmpbuf, tmpbuflen)) {
|
|
tmpbuflen *= 2;
|
|
tmpbuf = __alloca (tmpbuflen);
|
|
}
|
|
if (c = strchr(tmpbuf, '.')) {
|
|
domain = __strdup(++c);
|
|
goto ret;
|
|
}
|
|
|
|
while (__gethostbyname_r(tmpbuf, &th, tmpbuf, tmpbuflen, &h,
|
|
&herror)) {
|
|
if (herror == NETDB_INTERNAL) {
|
|
if (errno == ERANGE) {
|
|
tmpbuflen *= 2;
|
|
tmpbuf = __alloca(tmpbuflen);
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (h && (c = strchr(h->h_name, '.'))) {
|
|
domain = __strdup(++c);
|
|
goto ret;
|
|
}
|
|
|
|
{
|
|
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) {
|
|
if (errno == ERANGE) {
|
|
tmpbuflen *= 2;
|
|
tmpbuf = __alloca(tmpbuflen);
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (h && (c = strchr(h->h_name, '.'))) {
|
|
domain = __strdup(++c);
|
|
goto ret;
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
ret:
|
|
__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)
|
|
return -1;
|
|
|
|
if (host && (hostlen > 0))
|
|
switch(sa->sa_family) {
|
|
case AF_INET:
|
|
#if INET6
|
|
case AF_INET6:
|
|
#endif /* INET6 */
|
|
if (!(flags & NI_NUMERICHOST)) {
|
|
struct hostent *h = NULL;
|
|
#if HOSTTABLE
|
|
#if INET6
|
|
if (sa->sa_family == AF_INET6)
|
|
h = _addr2hostname_hosts((void *)&(((struct sockaddr_in6 *)sa)->sin6_addr), sizeof(struct in6_addr), AF_INET6);
|
|
else
|
|
#endif /* INET6 */
|
|
h = _addr2hostname_hosts((void *)&(((struct sockaddr_in *)sa)->sin_addr), sizeof(struct in_addr), AF_INET);
|
|
#endif /* HOSTTABLE */
|
|
|
|
#if RESOLVER
|
|
if (!h) {
|
|
#if INET6
|
|
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);
|
|
goto fail;
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
} else {
|
|
#endif /* INET6 */
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif /* RESOLVER */
|
|
|
|
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)
|
|
goto fail;
|
|
|
|
{
|
|
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)
|
|
goto fail;
|
|
};
|
|
break;
|
|
#if LOCAL
|
|
case AF_LOCAL:
|
|
if (!(flags & NI_NUMERICHOST)) {
|
|
struct utsname utsname;
|
|
|
|
if (!uname(&utsname)) {
|
|
strncpy(host, utsname.nodename, hostlen);
|
|
break;
|
|
};
|
|
};
|
|
|
|
if (flags & NI_NAMEREQD)
|
|
goto fail;
|
|
|
|
strncpy(host, "localhost", hostlen);
|
|
break;
|
|
#endif /* LOCAL */
|
|
default:
|
|
return -1;
|
|
};
|
|
|
|
if (serv && (servlen > 0))
|
|
switch(sa->sa_family) {
|
|
case AF_INET:
|
|
#if INET6
|
|
case AF_INET6:
|
|
#endif /* 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 {
|
|
goto fail;
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
if (s) {
|
|
strncpy(serv, s->s_name, servlen);
|
|
break;
|
|
};
|
|
};
|
|
snprintf(serv, servlen, "%d", ntohs(((struct sockaddr_in *)sa)->sin_port));
|
|
break;
|
|
#if LOCAL
|
|
case AF_LOCAL:
|
|
strncpy(serv, ((struct sockaddr_un *)sa)->sun_path, servlen);
|
|
break;
|
|
#endif /* LOCAL */
|
|
};
|
|
if (host && (hostlen > 0))
|
|
host[hostlen-1] = 0;
|
|
if (serv && (servlen > 0))
|
|
serv[servlen-1] = 0;
|
|
errno = serrno;
|
|
return 0;
|
|
|
|
fail:
|
|
errno = serrno;
|
|
return -1;
|
|
};
|