checkpoint
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
DAEMON_OBJS=daemon.@O@
|
||||
STRSEP_OBJS=strsep.@O@
|
||||
|
||||
OBJS= @DAEMON_OBJS@ ftruncate.@O@ gettimeofday.@O@ mktemp.@O@ putenv.@O@ \
|
||||
OBJS= @DAEMON_OBJS@ @STRSEP_OBJS@ ftruncate.@O@ gettimeofday.@O@ \
|
||||
mktemp.@O@ putenv.@O@ \
|
||||
readv.@O@ setenv.@O@ setitimer.@O@ strcasecmp.@O@ strdup.@O@ \
|
||||
strerror.@O@ strpbrk.@O@ strsep.@O@ strtoul.@O@ utimes.@O@ \
|
||||
strerror.@O@ strpbrk.@O@ strtoul.@O@ utimes.@O@ \
|
||||
writev.@O@
|
||||
|
||||
SRCS= daemon.c ftruncate.c gettimeofday.c mktemp.c putenv.c \
|
||||
|
||||
444
lib/bind/configure
vendored
444
lib/bind/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
|
||||
AC_REVISION($Revision: 1.8 $)
|
||||
AC_REVISION($Revision: 1.9 $)
|
||||
|
||||
AC_INIT(resolv/herror.c)
|
||||
AC_PREREQ(2.13)
|
||||
@@ -548,6 +548,14 @@ AC_CHECK_FUNC(daemon,
|
||||
AC_SUBST(DAEMON_OBJS)
|
||||
AC_SUBST(NEED_DAEMON)
|
||||
|
||||
AC_CHECK_FUNC(strsep,
|
||||
[STRSEP_OBJS="" NEED_STRSEP="#undef NEED_STRSEP"]
|
||||
,
|
||||
[STRSEP_OBJS="\${STRSEP_OBJS}" NEED_STRSEP="#define NEED_STRSEP 1"]
|
||||
)
|
||||
AC_SUBST(STRSEP_OBJS)
|
||||
AC_SUBST(NEED_STRSEP)
|
||||
|
||||
#
|
||||
# flockfile is usually provided by pthreads, but we may want to use it
|
||||
# even if compiled with --disable-threads.
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = "$Id: inet_net_pton.c,v 1.1 2001/03/29 06:31:38 marka Exp $";
|
||||
static const char rcsid[] = "$Id: inet_net_pton.c,v 1.2 2001/04/03 05:52:50 marka Exp $";
|
||||
#endif
|
||||
|
||||
#include "port_before.h"
|
||||
@@ -103,7 +103,7 @@ inet_net_pton_ipv4(src, dst, size)
|
||||
|
||||
ch = *src++;
|
||||
if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
|
||||
&& isascii(src[1]) && isxdigit(src[1])) {
|
||||
&& isascii(src[1]&0xff) && isxdigit(src[1]&0xff)) {
|
||||
/* Hexadecimal: Eat nybble string. */
|
||||
if (size <= 0)
|
||||
goto emsgsize;
|
||||
|
||||
@@ -65,7 +65,7 @@ again:
|
||||
if (*cp == 'x' || *cp == 'X')
|
||||
base = 16, cp++;
|
||||
while ((c = *cp) != 0) {
|
||||
if (isdigit(c)) {
|
||||
if (isdigit(c&0xff)) {
|
||||
if (base == 8 && (c == '8' || c == '9'))
|
||||
return (INADDR_NONE);
|
||||
val = (val * base) + (c - '0');
|
||||
@@ -73,8 +73,9 @@ again:
|
||||
digit = 1;
|
||||
continue;
|
||||
}
|
||||
if (base == 16 && isxdigit(c)) {
|
||||
val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
|
||||
if (base == 16 && isxdigit(c&0xff)) {
|
||||
val = (val << 4) +
|
||||
(c + 10 - (islower(c&0xff) ? 'a' : 'A'));
|
||||
cp++;
|
||||
digit = 1;
|
||||
continue;
|
||||
@@ -89,7 +90,7 @@ again:
|
||||
*pp++ = val, cp++;
|
||||
goto again;
|
||||
}
|
||||
if (*cp && !isspace(*cp))
|
||||
if (*cp && !isspace(*cp&0xff))
|
||||
return (INADDR_NONE);
|
||||
*pp++ = val;
|
||||
n = pp - parts;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = "$Id: dns_nw.c,v 1.1 2001/03/29 06:31:42 marka Exp $";
|
||||
static const char rcsid[] = "$Id: dns_nw.c,v 1.2 2001/04/03 05:52:54 marka Exp $";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
/* Imports. */
|
||||
@@ -545,7 +545,7 @@ normalize_name(char *name) {
|
||||
|
||||
/* Make lower case. */
|
||||
for (t = name; *t; t++)
|
||||
if (isascii(*t) && isupper(*t))
|
||||
if (isascii(*t&0xff) && isupper(*t&0xff))
|
||||
*t = tolower(*t);
|
||||
|
||||
/* Remove trailing dots. */
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = "$Id: dns_pr.c,v 1.1 2001/03/29 06:31:42 marka Exp $";
|
||||
static const char rcsid[] = "$Id: dns_pr.c,v 1.2 2001/04/03 05:52:55 marka Exp $";
|
||||
#endif
|
||||
|
||||
/* Imports */
|
||||
@@ -204,7 +204,7 @@ parse_hes_list(struct irs_pr *this, char **hes_list) {
|
||||
|
||||
/* Skip blank lines. */
|
||||
p = cp;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (!*p)
|
||||
continue;
|
||||
@@ -216,14 +216,14 @@ parse_hes_list(struct irs_pr *this, char **hes_list) {
|
||||
|
||||
p = pvt->prbuf;
|
||||
pvt->proto.p_name = p;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (!*p)
|
||||
continue;
|
||||
*p++ = '\0';
|
||||
|
||||
pvt->proto.p_proto = atoi(p);
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (*p)
|
||||
*p++ = '\0';
|
||||
@@ -240,7 +240,7 @@ parse_hes_list(struct irs_pr *this, char **hes_list) {
|
||||
pvt->proto.p_aliases = new;
|
||||
}
|
||||
pvt->proto.p_aliases[num++] = p;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (*p)
|
||||
*p++ = '\0';
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = "$Id: dns_sv.c,v 1.1 2001/03/29 06:31:43 marka Exp $";
|
||||
static const char rcsid[] = "$Id: dns_sv.c,v 1.2 2001/04/03 05:52:56 marka Exp $";
|
||||
#endif
|
||||
|
||||
/* Imports */
|
||||
@@ -198,7 +198,7 @@ parse_hes_list(struct irs_sv *this, char **hes_list, const char *proto) {
|
||||
|
||||
/* Check to make sure the protocol matches. */
|
||||
p = cp;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (!*p)
|
||||
continue;
|
||||
@@ -206,7 +206,7 @@ parse_hes_list(struct irs_sv *this, char **hes_list, const char *proto) {
|
||||
proto_len = strlen(proto);
|
||||
if (strncasecmp(++p, proto, proto_len) != 0)
|
||||
continue;
|
||||
if (p[proto_len] && !isspace(p[proto_len]))
|
||||
if (p[proto_len] && !isspace(p[proto_len]&0xff))
|
||||
continue;
|
||||
}
|
||||
/* OK, we've got a live one. Let's parse it for real. */
|
||||
@@ -216,21 +216,21 @@ parse_hes_list(struct irs_sv *this, char **hes_list, const char *proto) {
|
||||
|
||||
p = pvt->svbuf;
|
||||
pvt->serv.s_name = p;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (!*p)
|
||||
continue;
|
||||
*p++ = '\0';
|
||||
|
||||
pvt->serv.s_proto = p;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (!*p)
|
||||
continue;
|
||||
*p++ = '\0';
|
||||
|
||||
pvt->serv.s_port = htons((u_short) atoi(p));
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (*p)
|
||||
*p++ = '\0';
|
||||
@@ -247,7 +247,7 @@ parse_hes_list(struct irs_sv *this, char **hes_list, const char *proto) {
|
||||
pvt->serv.s_aliases = new;
|
||||
}
|
||||
pvt->serv.s_aliases[num++] = p;
|
||||
while (*p && !isspace(*p))
|
||||
while (*p && !isspace(*p&0xff))
|
||||
p++;
|
||||
if (*p)
|
||||
*p++ = '\0';
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if !defined(LINT) && !defined(CODECENTER)
|
||||
static const char rcsid[] = "$Id: gen.c,v 1.1 2001/03/29 06:31:43 marka Exp $";
|
||||
static const char rcsid[] = "$Id: gen.c,v 1.2 2001/04/03 05:52:57 marka Exp $";
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -399,7 +399,9 @@ init_map_rules(struct gen_p *irs, const char *conf_file) {
|
||||
char *tmp;
|
||||
int n;
|
||||
|
||||
for (tmp = line; isascii(*tmp) && isspace(*tmp); tmp++)
|
||||
for (tmp = line;
|
||||
isascii(*tmp&0xff) && isspace(*tmp&0xff);
|
||||
tmp++)
|
||||
(void)NULL;
|
||||
if (*tmp == '#' || *tmp == '\n' || *tmp == '\0')
|
||||
continue;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if !defined(LINT) && !defined(CODECENTER)
|
||||
static const char rcsid[] = "$Id: getnetent.c,v 1.1 2001/03/29 06:31:46 marka Exp $";
|
||||
static const char rcsid[] = "$Id: getnetent.c,v 1.2 2001/04/03 05:52:58 marka Exp $";
|
||||
#endif
|
||||
|
||||
/* Imports */
|
||||
@@ -259,7 +259,7 @@ fakeaddr(const char *name, int af, struct net_data *net_data) {
|
||||
RES_SET_H_ERRNO(net_data->res, NETDB_INTERNAL);
|
||||
return (NULL);
|
||||
}
|
||||
if (!isascii(name[0]) || !isdigit(name[0]))
|
||||
if (!isascii(name[0]&0xff) || !isdigit(name[0]&0xff))
|
||||
return (NULL);
|
||||
for (cp = name; *cp; ++cp)
|
||||
if (!isascii(*cp) || (!isdigit(*cp) && *cp != '.'))
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#if !defined(LINT) && !defined(CODECENTER)
|
||||
static const char rcsid[] = "$Id: irp.c,v 1.1 2001/03/29 06:31:48 marka Exp $";
|
||||
static const char rcsid[] = "$Id: irp.c,v 1.2 2001/04/03 05:52:59 marka Exp $";
|
||||
#endif
|
||||
|
||||
/* Imports */
|
||||
@@ -389,9 +389,9 @@ irs_irp_read_response(struct irp_p *pvt, char *text, size_t textlen) {
|
||||
code = 0;
|
||||
} else if (text != NULL && textlen > 0) {
|
||||
p = line;
|
||||
while (isspace(*p)) p++;
|
||||
while (isdigit(*p)) p++;
|
||||
while (isspace(*p)) p++;
|
||||
while (isspace(*p&0xff)) p++;
|
||||
while (isdigit(*p&0xff)) p++;
|
||||
while (isspace(*p&0xff)) p++;
|
||||
strncpy(text, p, textlen - 1);
|
||||
p[textlen - 1] = '\0';
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = "$Id: irpmarshall.c,v 1.1 2001/03/29 06:31:50 marka Exp $";
|
||||
static const char rcsid[] = "$Id: irpmarshall.c,v 1.2 2001/04/03 05:53:00 marka Exp $";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#if 0
|
||||
@@ -1260,7 +1260,7 @@ irp_unmarshall_ng(const char **hostp, const char **userp, const char **domainp,
|
||||
host = user = domain = NULL;
|
||||
|
||||
p = buffer;
|
||||
while (isspace(*p)) {
|
||||
while (isspace(*p&0xff)) {
|
||||
p++;
|
||||
}
|
||||
if (*p != '(') {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#if !defined(lint) && !defined(SABER)
|
||||
static const char rcsid[] = "$Id: ctl_clnt.c,v 1.1 2001/03/29 06:31:53 marka Exp $";
|
||||
static const char rcsid[] = "$Id: ctl_clnt.c,v 1.2 2001/04/03 05:53:02 marka Exp $";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
@@ -55,8 +55,8 @@ static const char rcsid[] = "$Id: ctl_clnt.c,v 1.1 2001/03/29 06:31:53 marka Exp
|
||||
/* Macros. */
|
||||
|
||||
#define donefunc_p(ctx) ((ctx).donefunc != NULL)
|
||||
#define arpacode_p(line) (isdigit(line[0]) && isdigit(line[1]) && \
|
||||
isdigit(line[2]))
|
||||
#define arpacode_p(line) (isdigit(line[0]&0xff) && isdigit(line[1]&0xff) && \
|
||||
isdigit(line[2]&0xff))
|
||||
#define arpacont_p(line) (line[3] == '-')
|
||||
#define arpadone_p(line) (line[3] == ' ' || line[3] == '\t' || \
|
||||
line[3] == '\r' || line[3] == '\0')
|
||||
@@ -243,7 +243,7 @@ ctl_command(struct ctl_cctx *ctx, const char *cmd, size_t len,
|
||||
memcpy(tran->outbuf.text, cmd, len);
|
||||
tran->outbuf.used = len;
|
||||
for (pc = tran->outbuf.text, n = 0; n < tran->outbuf.used; pc++, n++)
|
||||
if (!isascii(*pc) || !isprint(*pc))
|
||||
if (!isascii(*pc&0xff) || !isprint(*pc&0xff))
|
||||
*pc = '\040';
|
||||
start_write(ctx);
|
||||
return (0);
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
@HAVE_SA_LEN@
|
||||
@HAVE_MINIMUM_IFREQ@
|
||||
@NEED_DAEMON@
|
||||
@NEED_STRSEP@
|
||||
@HAS_INET6_STRUCTS@
|
||||
@NEED_IN6ADDR_ANY@
|
||||
@HAS_IN_ADDR6@
|
||||
@@ -96,4 +97,12 @@ extern const struct in6_addr in6addr_any;
|
||||
#define MAX(x,y) (((x) >= (y)) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#ifdef NEED_DAEMON
|
||||
int daemon(int nochdir, int noclose);
|
||||
#endif
|
||||
|
||||
#ifdef NEED_STRSEP
|
||||
char * strsep(char **stringp, const char *delim)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user