diff options
Diffstat (limited to 'newlib/libc/sys/linux/net/res_comp.c')
| -rw-r--r-- | newlib/libc/sys/linux/net/res_comp.c | 74 |
1 files changed, 40 insertions, 34 deletions
diff --git a/newlib/libc/sys/linux/net/res_comp.c b/newlib/libc/sys/linux/net/res_comp.c index 51211f743..12ea02c6d 100644 --- a/newlib/libc/sys/linux/net/res_comp.c +++ b/newlib/libc/sys/linux/net/res_comp.c @@ -1,7 +1,7 @@ /* * Copyright (c) 1985, 1993 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,10 +10,14 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. * 4. Neither the name of the University 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 THE REGENTS 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 @@ -29,14 +33,14 @@ /* * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -48,7 +52,7 @@ */ /* - * Portions Copyright (c) 1996-1999 by Internet Software Consortium. + * Portions Copyright (c) 1996 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -65,9 +69,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$BINDId: res_comp.c,v 8.15 1999/10/13 16:39:39 vixie Exp $"; +static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; +static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +#include <sys/types.h> #include <sys/types.h> #include <sys/param.h> @@ -78,7 +84,8 @@ static const char rcsid[] = "$BINDId: res_comp.c,v 8.15 1999/10/13 16:39:39 vixi #include <stdio.h> #include <string.h> #include <unistd.h> -#include "libc-symbols.h" + +#define BIND_4_COMPAT /* * Expand compressed domain name 'comp_dn' to full domain name. @@ -97,7 +104,6 @@ dn_expand(const u_char *msg, const u_char *eom, const u_char *src, dst[0] = '\0'; return (n); } -libresolv_hidden_def (dn_expand) /* * Pack domain name 'exp_dn' in presentation form into 'comp_dn'. @@ -112,7 +118,6 @@ dn_comp(const char *src, u_char *dst, int dstsiz, (const u_char **)dnptrs, (const u_char **)lastdnptr)); } -libresolv_hidden_def (dn_comp) /* * Skip over a compressed domain name. Return the size or -1. @@ -125,7 +130,6 @@ dn_skipname(const u_char *ptr, const u_char *eom) { return (-1); return (ptr - saveptr); } -libresolv_hidden_def (dn_skipname) /* * Verify that a domain name uses an acceptable character set. @@ -139,7 +143,6 @@ libresolv_hidden_def (dn_skipname) */ #define PERIOD 0x2e #define hyphenchar(c) ((c) == 0x2d) -#define underscorechar(c) ((c) == 0x5f) #define bslashchar(c) ((c) == 0x5c) #define periodchar(c) ((c) == PERIOD) #define asterchar(c) ((c) == 0x2a) @@ -148,11 +151,13 @@ libresolv_hidden_def (dn_skipname) #define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) #define borderchar(c) (alphachar(c) || digitchar(c)) -#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c)) +#define middlechar(c) (borderchar(c) || hyphenchar(c)) #define domainchar(c) ((c) > 0x20 && (c) < 0x7f) int -res_hnok(const char *dn) { +res_hnok(dn) + const char *dn; +{ int ppch = '\0', pch = PERIOD, ch = *dn++; while (ch != '\0') { @@ -174,14 +179,15 @@ res_hnok(const char *dn) { } return (1); } -libresolv_hidden_def (res_hnok) /* * hostname-like (A, MX, WKS) owners can have "*" as their first label * but must otherwise be as a host name. */ int -res_ownok(const char *dn) { +res_ownok(dn) + const char *dn; +{ if (asterchar(dn[0])) { if (periodchar(dn[1])) return (res_hnok(dn+2)); @@ -196,7 +202,9 @@ res_ownok(const char *dn) { * label, but the rest of the name has to look like a host name. */ int -res_mailok(const char *dn) { +res_mailok(dn) + const char *dn; +{ int ch, escaped = 0; /* "." is a valid missing representation */ @@ -224,7 +232,9 @@ res_mailok(const char *dn) { * recommendations. */ int -res_dnok(const char *dn) { +res_dnok(dn) + const char *dn; +{ int ch; while ((ch = *dn++) != '\0') @@ -232,31 +242,27 @@ res_dnok(const char *dn) { return (0); return (1); } -libresolv_hidden_def (res_dnok) #ifdef BIND_4_COMPAT /* * This module must export the following externally-visible symbols: - * ___putlong - * ___putshort - * __getlong - * __getshort + * ___putlong + * ___putshort + * __getlong + * __getshort * Note that one _ comes from C and the others come from us. */ void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } -libresolv_hidden_def (__putlong) void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } -libresolv_hidden_def (__putshort) -#ifndef __ultrix__ u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); } u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); } -#endif /*__ultrix__*/ #endif /*BIND_4_COMPAT*/ - -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libresolv, GLIBC_2_0, GLIBC_2_2) -# undef dn_expand -weak_alias (__dn_expand, dn_expand); -#endif +/* + * Weak aliases for applications that use certain private entry points, + * and fail to include <resolv.h>. + */ +#undef dn_comp +__weak_reference(__dn_comp, dn_comp); +#undef dn_expand +__weak_reference(__dn_expand, dn_expand); |