5a97622d5e
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Change to use argp. * db/makedb: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locale.c: Little adjustment for better usage of argp. 1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com> * Makeconfig: Add rules for libc with bounded pointers. * Makerules: Likewise. * config.make.in: Likewise. * configure.in: Likewise. 1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu> * argp.h (OPTION_NO_USAGE): New macro. * argp-help.c (usage_long_opt, usage_argful_short_opt, add_argless_short_opt): Implement OPTION_NO_USAGE. 1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/obstack.h: Fix typo. 1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu> * argp-fmtstream.c (__argp_fmtstream_update): Account for case where NEXTLINE points one past the end of the active buffer. * argp-help.c <stddef.h>: New include. (__argp_failure): Only exit if STATE says it's ok. (print_header, hol_entry_help): Use UPARAMS fields rather than constants. (_help): Call fill_in_uparams if necessary. (struct hol_help_state): New type. (struct pentry_state): Add hhstate field. Remove prev_entry & sep_groups fields. (hol_entry_help): Add HHSTATE parameter. Remove prev_entry & sep_groups parameters. Suppress duplicate arguments if requested, and note the fact. (print_header, comma): Use PEST->hhstate fields. (hol_help): Add HHSTATE variable & pass to hol_entry_help. Remove LAST_ENTRY & SEP_GROUPS variables. If any suplicate arguments were suppressed, print explanatory note. (filter_doc): Replace PEST parameter with STATE. (struct uparams): New type. (uparams): New variable. (struct uparam_name): New type. (uparam_names): New variable. (fill_in_uparams): New function. (__argp_failure, __argp_error, __argp_state_help): Make STATE parameter const. * argp.h (argp_state_help, __argp_state_help, argp_usage, __argp_usage, argp_error, __argp_error, argp_failure, __argp_failure): Make STATE parameter const. (ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro. * argp.h (argp_program_bug_address): Make const. 1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/mman/syscalls.list: Explain msync interface. 1997-02-19 01:37 Erik Troan <ewt@redhat.com> * shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields. 1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de> * stdio-common/test-fseek.c: Remove temporary file, add copyright. 1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/netinet/in.h: Protect contents using __BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>. * inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net. * inet/Makefile (headers): Remove net/ethernet.h. * sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h. * sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h. 1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de> * nss/nsswitch.c (__nss_configure_lookup): Use correct test when searching in sorted array. 1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk> * inet/getnameinfo.c: Change to use reentrant getXXbyYY functions and protect modification of global data. 1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu> * argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME. (parser_init): Use the basename for PARSER->state.name. * argp-help.c (__argp_error, __argp_failure, __argp_state_help): Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME. * argp-parse.c (parser_init): Set PARSER->state.flags. Make check whether PARSER has the prog name in argv[0] at the proper place. 1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional. Use default value instead of printing a warning. * nss/XXX-lookup.c: Add misssing explanation. 1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de> * inet/in6_addr.c: Add missing braces. * inet/getnameinfo.c: Include <arpa/inet.h>. * sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>. 1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com> * string/strxfrm.c (STRCOLL): Correct handling of `position' levels with no non-IGNOREd element and handling of NUL byte. * string/strcoll.c (STRXFRM): Likewise. * locale/weight.h: Likewise. * shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
329 lines
8.2 KiB
C
329 lines
8.2 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 <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 MAXHOSTNAMELEN
|
|
#define MAXHOSTNAMELEN 128
|
|
#endif
|
|
|
|
#ifndef min
|
|
#define min(x,y) (((x) > (y)) ? (y) : (x))
|
|
#endif /* min */
|
|
|
|
static char *domain;
|
|
static char domainbuffer[MAXHOSTNAMELEN];
|
|
|
|
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, '.'))) {
|
|
strcpy(domain = domainbuffer, ++c);
|
|
goto ret;
|
|
}
|
|
|
|
if (!gethostname(domainbuffer, sizeof(domainbuffer))) {
|
|
if (c = strchr(domainbuffer, '.')) {
|
|
domain = ++c;
|
|
goto ret;
|
|
}
|
|
|
|
while (__gethostbyname_r(domainbuffer, &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, '.'))) {
|
|
strcpy(domain = domainbuffer, ++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 = domainbuffer, ++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;
|
|
};
|