mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
fa0bc87c32
* stdlib/canonicalize.c: New file. * stdlib/stdlib.h: Declare canonicalize_file_name, realpath. * stdlib/Makefile (routines): Add canonicalize. * posix/unistd.h: Declare __canonicalize_directory_name_internal. Thu May 23 00:01:10 1996 Ulrich Drepper <drepper@cygnus.com> * db/recno/rec_seq.c: Prevent `sccsid' definition by using the same #if condition as in the other db files. * intl/Makefile: Add -Wno-unused CFLAGS for compilation of bindtextdom.c, finddomain.c, and localealias.c. * intl/dcgettext.c: Don't define prototype for getcwd() when compiling in glibc. * libio/cleanup.c: Add prototype for _IO_register_cleanup. * libio/filedoalloc.c, libio/fileops.c, libio/iopopen.c: Don't define _POSIX_SOURCE unconditionally. * libio/filedoalloc.c, libio/iopopen.c: Include <unistd.h> if compiling in glibc. * libio/fileops.c (_IO_file_close_it): Don't sync file, call flush instead. This relaxes the rules from POSIX.1 about changing the active handle a bit. * libio/iofopncook.c (struct _IO_cookie_file): Move definition into <libio.h>. Add prototypes for local functions to prevent warnings. * libio/iopopen.c: Change prototypes for _IO_fork, _IO_pipe, and _IO_DUP2 to contain complete parameter list. * libio/libio.h: Add definition of struct _IO_cookie_file. * libio/libioP.h: Add prototypes for _IO_vasprintf, _IO_vdprintf, and _IO_vsnprintf. * libio/memstream.c: Include <stdio.h>. * libio/stdio.h: Add prototypes for fopencookie, __stdio_gen_tempname, __vfscanf, __vsscanf, and __vsnprintf. * libio/strops.c: Avoid useless expression in `for' initializer. * locale/findlocale.c: Add some casts to prevent warnings. * locale/programs/locfile.c (write_locale_data): Don't use double `/' in locale binary file. * posix/unistd.h: Remove prototype for `reboot'. Update from bind-4.9.4-T1A. * resolv/Makefile (routines): Add inet_ntop and inet_pton. * resolv/arpa/nameser.h: Add definition of IN6ADDRSZ. * resolv/gethnamaddr.c, resolv/getnetnamadr.c, resolv/res_comp.c, resolv/res_debug.c, resolv/res_init.c * resolv/inet_ntop.c, resolv/inet_pton.c: New files. * resolv/resolv.h: Add RES_USE_INET6 flag. (__dn_isvalid): Renamed to __res_dnok. Add prototypes for __res_ownok and __res_mailok. * stdio-common/Makefile: Add -Wno-unused to CFLAGS for _itoa.c. * stdio-common/getline.c, stdio-common/vfscanf.c, sysdeps/posix/tempname.c: Don't use <ansidecl.h> anymore. * sysdeps/unix/sysv/linux/Makefile [$subdir == misc] (sysdep_routines): Add s_reboot. (install-others): Add $(includedir)/sys/syscall.h. New rule for $(includedir)/sys/syscall.h to produce from <asm/unistd.h>. * sysdeps/unix/sysv/linux/reboot.c: New file. Make single argument function call 3 argument system call. * sysdeps/unix/sysv/linux/sys/reboot.h: New file. Linux specific definition for reboot function. * sysdeps/unix/sysv/linux/syscall.h: Remove old and obsolete comment. * sysdeps/unix/sysv/linux/syscalls.list: Rename function for reboot syscall to __syscall_reboot. * wcsmbs/wchar.h: Protect prototypes for wcstof and wcstold by __USE_GNU, not USE_GNU. Tue May 21 21:55:49 1996 David Mosberger-Tang <davidm@AZStarNet.com> * locale/programs/charset.c, locale/programs/ld-collate.c: Add casts to prevent warnings on 64-bit machines. * locale/programs/ld-monetary.c: Don't do unnecessary tests for int_frac_digits and frac_digits which only produce warnings. Mon May 13 23:45:29 1996 David Mosberger-Tang <davidm@AZStarNet.com> * inet/arpa/inet.h: Backup return type of inet_addr to u_long. * resolv/inet_addr.c: Likewise. * resolv/Makefile (distribute): Add res_hconf.h (routines): Add res_hconf. * resolv/gethnamaddr.c: Add support for /etc/host.conf. * resolv/res_init.c: Initialize /etc/host.conf reader. * resolv/res_hconf.c, resolv/res_hconf.h: New files. Implementation of reading /etc/host.conf. Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * Rules (%.out rules): Prepend $($*-ENV) to the command. * sysdeps/unix/sysv/linux/i386/brk.c (___brk_addr): Define as weak alias for __curbrk. Wed May 22 19:37:27 1996 Miles Bader <miles@gnu.ai.mit.edu> * hurd/hurdexec.c (_hurd_exec): Pass INIT_TRACEMASK. * hurd/hurdmsg.c (set_int): Support INIT_TRACEMASK. Wed May 22 18:47:31 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. (__canonicalize_directory_name_internal): New function using it. * sysdeps/posix/getcwd.c (__canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. Wed May 22 18:14:05 1996 Miles Bader <miles@gnu.ai.mit.edu> * string/argz-create.c (__argz_create): Correctly calculate length. * string/argz-extract.c (__argz_extract): Add terminating 0 entry. * hurd/hurdstartup.c (_hurd_startup): ... and don't so here. [HAVE_VMSDIR_H]: Include "vmsdir.h". (glob) [VMS]: Don't grok ~.
554 lines
13 KiB
C
554 lines
13 KiB
C
/*
|
|
* ++Copyright++ 1985, 1993
|
|
* -
|
|
* 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:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 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
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 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.
|
|
* -
|
|
* 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
|
|
* CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
* -
|
|
* --Copyright--
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <resolv.h>
|
|
#include <ctype.h>
|
|
|
|
#if defined(BSD) && (BSD >= 199103)
|
|
# include <unistd.h>
|
|
# include <string.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
static int dn_find __P((u_char *exp_dn, u_char *msg,
|
|
u_char **dnptrs, u_char **lastdnptr));
|
|
|
|
/*
|
|
* Expand compressed domain name 'comp_dn' to full domain name.
|
|
* 'msg' is a pointer to the begining of the message,
|
|
* 'eomorig' points to the first location after the message,
|
|
* 'exp_dn' is a pointer to a buffer of size 'length' for the result.
|
|
* Return size of compressed name or -1 if there was an error.
|
|
*/
|
|
int
|
|
dn_expand(msg, eomorig, comp_dn, exp_dn, length)
|
|
const u_char *msg, *eomorig, *comp_dn;
|
|
char *exp_dn;
|
|
int length;
|
|
{
|
|
register const u_char *cp;
|
|
register char *dn;
|
|
register int n, c;
|
|
char *eom;
|
|
int len = -1, checked = 0;
|
|
|
|
dn = exp_dn;
|
|
cp = comp_dn;
|
|
eom = exp_dn + length;
|
|
/*
|
|
* fetch next label in domain name
|
|
*/
|
|
while (n = *cp++) {
|
|
/*
|
|
* Check for indirection
|
|
*/
|
|
switch (n & INDIR_MASK) {
|
|
case 0:
|
|
if (dn != exp_dn) {
|
|
if (dn >= eom)
|
|
return (-1);
|
|
*dn++ = '.';
|
|
}
|
|
if (dn+n >= eom)
|
|
return (-1);
|
|
checked += n + 1;
|
|
while (--n >= 0) {
|
|
if (((c = *cp++) == '.') || (c == '\\')) {
|
|
if (dn + n + 2 >= eom)
|
|
return (-1);
|
|
*dn++ = '\\';
|
|
}
|
|
*dn++ = c;
|
|
if (cp >= eomorig) /* out of range */
|
|
return (-1);
|
|
}
|
|
break;
|
|
|
|
case INDIR_MASK:
|
|
if (len < 0)
|
|
len = cp - comp_dn + 1;
|
|
cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff));
|
|
if (cp < msg || cp >= eomorig) /* out of range */
|
|
return (-1);
|
|
checked += 2;
|
|
/*
|
|
* Check for loops in the compressed name;
|
|
* if we've looked at the whole message,
|
|
* there must be a loop.
|
|
*/
|
|
if (checked >= eomorig - msg)
|
|
return (-1);
|
|
break;
|
|
|
|
default:
|
|
return (-1); /* flag error */
|
|
}
|
|
}
|
|
*dn = '\0';
|
|
if (len < 0)
|
|
len = cp - comp_dn;
|
|
return (len);
|
|
}
|
|
|
|
/*
|
|
* Compress domain name 'exp_dn' into 'comp_dn'.
|
|
* Return the size of the compressed name or -1.
|
|
* 'length' is the size of the array pointed to by 'comp_dn'.
|
|
* 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0]
|
|
* is a pointer to the beginning of the message. The list ends with NULL.
|
|
* 'lastdnptr' is a pointer to the end of the arrary pointed to
|
|
* by 'dnptrs'. Side effect is to update the list of pointers for
|
|
* labels inserted into the message as we compress the name.
|
|
* If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
|
|
* is NULL, we don't update the list.
|
|
*/
|
|
int
|
|
dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
|
|
const char *exp_dn;
|
|
u_char *comp_dn, **dnptrs, **lastdnptr;
|
|
int length;
|
|
{
|
|
register u_char *cp, *dn;
|
|
register int c, l;
|
|
u_char **cpp, **lpp, *sp, *eob;
|
|
u_char *msg;
|
|
|
|
dn = (u_char *)exp_dn;
|
|
cp = comp_dn;
|
|
eob = cp + length;
|
|
lpp = cpp = NULL;
|
|
if (dnptrs != NULL) {
|
|
if ((msg = *dnptrs++) != NULL) {
|
|
for (cpp = dnptrs; *cpp != NULL; cpp++)
|
|
;
|
|
lpp = cpp; /* end of list to search */
|
|
}
|
|
} else
|
|
msg = NULL;
|
|
for (c = *dn++; c != '\0'; ) {
|
|
/* look to see if we can use pointers */
|
|
if (msg != NULL) {
|
|
if ((l = dn_find(dn-1, msg, dnptrs, lpp)) >= 0) {
|
|
if (cp+1 >= eob)
|
|
return (-1);
|
|
*cp++ = (l >> 8) | INDIR_MASK;
|
|
*cp++ = l % 256;
|
|
return (cp - comp_dn);
|
|
}
|
|
/* not found, save it */
|
|
if (lastdnptr != NULL && cpp < lastdnptr-1) {
|
|
*cpp++ = cp;
|
|
*cpp = NULL;
|
|
}
|
|
}
|
|
sp = cp++; /* save ptr to length byte */
|
|
do {
|
|
if (c == '.') {
|
|
c = *dn++;
|
|
break;
|
|
}
|
|
if (c == '\\') {
|
|
if ((c = *dn++) == '\0')
|
|
break;
|
|
}
|
|
if (cp >= eob) {
|
|
if (msg != NULL)
|
|
*lpp = NULL;
|
|
return (-1);
|
|
}
|
|
*cp++ = c;
|
|
} while ((c = *dn++) != '\0');
|
|
/* catch trailing '.'s but not '..' */
|
|
if ((l = cp - sp - 1) == 0 && c == '\0') {
|
|
cp--;
|
|
break;
|
|
}
|
|
if (l <= 0 || l > MAXLABEL) {
|
|
if (msg != NULL)
|
|
*lpp = NULL;
|
|
return (-1);
|
|
}
|
|
*sp = l;
|
|
}
|
|
if (cp >= eob) {
|
|
if (msg != NULL)
|
|
*lpp = NULL;
|
|
return (-1);
|
|
}
|
|
*cp++ = '\0';
|
|
return (cp - comp_dn);
|
|
}
|
|
|
|
/*
|
|
* Skip over a compressed domain name. Return the size or -1.
|
|
*/
|
|
int
|
|
__dn_skipname(comp_dn, eom)
|
|
const u_char *comp_dn, *eom;
|
|
{
|
|
register const u_char *cp;
|
|
register int n;
|
|
|
|
cp = comp_dn;
|
|
while (cp < eom && (n = *cp++)) {
|
|
/*
|
|
* check for indirection
|
|
*/
|
|
switch (n & INDIR_MASK) {
|
|
case 0: /* normal case, n == len */
|
|
cp += n;
|
|
continue;
|
|
case INDIR_MASK: /* indirection */
|
|
cp++;
|
|
break;
|
|
default: /* illegal type */
|
|
return (-1);
|
|
}
|
|
break;
|
|
}
|
|
if (cp > eom)
|
|
return (-1);
|
|
return (cp - comp_dn);
|
|
}
|
|
|
|
static int
|
|
mklower(ch)
|
|
register int ch;
|
|
{
|
|
if (isascii(ch) && isupper(ch))
|
|
return (tolower(ch));
|
|
return (ch);
|
|
}
|
|
|
|
/*
|
|
* Search for expanded name from a list of previously compressed names.
|
|
* Return the offset from msg if found or -1.
|
|
* dnptrs is the pointer to the first name on the list,
|
|
* not the pointer to the start of the message.
|
|
*/
|
|
static int
|
|
dn_find(exp_dn, msg, dnptrs, lastdnptr)
|
|
u_char *exp_dn, *msg;
|
|
u_char **dnptrs, **lastdnptr;
|
|
{
|
|
register u_char *dn, *cp, **cpp;
|
|
register int n;
|
|
u_char *sp;
|
|
|
|
for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
|
|
dn = exp_dn;
|
|
sp = cp = *cpp;
|
|
while (n = *cp++) {
|
|
/*
|
|
* check for indirection
|
|
*/
|
|
switch (n & INDIR_MASK) {
|
|
case 0: /* normal case, n == len */
|
|
while (--n >= 0) {
|
|
if (*dn == '.')
|
|
goto next;
|
|
if (*dn == '\\')
|
|
dn++;
|
|
if (mklower(*dn++) != mklower(*cp++))
|
|
goto next;
|
|
}
|
|
if ((n = *dn++) == '\0' && *cp == '\0')
|
|
return (sp - msg);
|
|
if (n == '.')
|
|
continue;
|
|
goto next;
|
|
|
|
case INDIR_MASK: /* indirection */
|
|
cp = msg + (((n & 0x3f) << 8) | *cp);
|
|
break;
|
|
|
|
default: /* illegal type */
|
|
return (-1);
|
|
}
|
|
}
|
|
if (*dn == '\0')
|
|
return (sp - msg);
|
|
next: ;
|
|
}
|
|
return (-1);
|
|
}
|
|
|
|
/*
|
|
* Verify that a domain name uses an acceptable character set.
|
|
*/
|
|
|
|
/****
|
|
To: "Lawrence R. Rogers" <lrr@cert.org>
|
|
cc: cert@cert.org, pvm@home.net
|
|
Subject: Re: VU#14542
|
|
In-reply-to: Your message of "Mon, 19 Feb 1996 17:16:27 PST."
|
|
Date: Tue, 20 Feb 1996 22:37:21 -0800
|
|
From: Paul A Vixie <vixie@wisdom.home.vix.com>
|
|
|
|
in retrospect,
|
|
|
|
hostname = firstlabel ( "." otherlabel )+
|
|
firstchar = [a-zA-Z0-9_]
|
|
otherchar = [a-zA-Z0-9_-/]
|
|
firstlabel = firstchar otherchar*
|
|
otherlabel = otherchar+
|
|
|
|
should have been
|
|
|
|
hostname = label ( "." label )+
|
|
firstchar = [a-zA-Z0-9]
|
|
otherchar = [a-zA-Z0-9_-]
|
|
label = firstchar otherchar*
|
|
|
|
i know of no example of a real host name that needs the looser rule i sent
|
|
earlier. since i'm only trying to bend the spec to fit actual known uses,
|
|
i should not have widened the rules as far as i did earlier.
|
|
****/
|
|
|
|
/*
|
|
* Note the conspicuous absence of ctype macros in these definitions. On
|
|
* non-ASCII hosts, we can't depend on string literals or ctype macros to
|
|
* tell us anything about network-format data. The rest of the BIND system
|
|
* is not careful about this, but for some reason, we're doing it right here.
|
|
*/
|
|
#define PERIOD 0x2e
|
|
#define hyphenchar(c) ((c) == 0x2d)
|
|
#define bslashchar(c) ((c) == 0x5c)
|
|
#define periodchar(c) ((c) == PERIOD)
|
|
#define asterchar(c) ((c) == 0x2a)
|
|
#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
|
|
|| ((c) >= 0x61 && (c) <= 0x7a))
|
|
#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
|
|
|
|
#define borderchar(c) (alphachar(c) || digitchar(c))
|
|
#define middlechar(c) (borderchar(c) || hyphenchar(c))
|
|
#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
|
|
|
|
int
|
|
res_hnok(dn)
|
|
const char *dn;
|
|
{
|
|
int ppch = '\0', pch = PERIOD, ch = *dn++;
|
|
|
|
while (ch != '\0') {
|
|
int nch = *dn++;
|
|
|
|
if (periodchar(ch)) {
|
|
NULL;
|
|
} else if (periodchar(pch)) {
|
|
if (!borderchar(ch))
|
|
return (0);
|
|
} else if (periodchar(nch) || nch == '\0') {
|
|
if (!borderchar(ch))
|
|
return (0);
|
|
} else {
|
|
if (!middlechar(ch))
|
|
return (0);
|
|
}
|
|
ppch = pch, pch = ch, ch = nch;
|
|
}
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* hostname-like (A, MX, WKS) owners can have "*" as their first label
|
|
* but must otherwise be as a host name.
|
|
*/
|
|
int
|
|
res_ownok(dn)
|
|
const char *dn;
|
|
{
|
|
if (asterchar(dn[0]) && periodchar(dn[1]))
|
|
dn += 2;
|
|
return (res_hnok(dn));
|
|
}
|
|
|
|
/*
|
|
* SOA RNAMEs and RP RNAMEs can have any printable character in their first
|
|
* label, but the rest of the name has to look like a host name.
|
|
*/
|
|
int
|
|
res_mailok(dn)
|
|
const char *dn;
|
|
{
|
|
int ch, pch;
|
|
|
|
pch = '\0';
|
|
while ((ch = *dn++) != '\0') {
|
|
if (!domainchar(ch))
|
|
return (0);
|
|
if (periodchar(ch) && !bslashchar(pch))
|
|
break;
|
|
pch = ch;
|
|
}
|
|
return (res_hnok(dn));
|
|
}
|
|
|
|
/*
|
|
* This function is quite liberal, since RFC 1034's character sets are only
|
|
* recommendations.
|
|
*/
|
|
int
|
|
res_dnok(dn)
|
|
const char *dn;
|
|
{
|
|
int ch;
|
|
|
|
while ((ch = *dn++) != '\0')
|
|
if (!domainchar(ch))
|
|
return (0);
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* Routines to insert/extract short/long's.
|
|
*/
|
|
|
|
u_int16_t
|
|
_getshort(msgp)
|
|
register const u_char *msgp;
|
|
{
|
|
register u_int16_t u;
|
|
|
|
GETSHORT(u, msgp);
|
|
return (u);
|
|
}
|
|
|
|
#ifdef NeXT
|
|
/*
|
|
* nExt machines have some funky library conventions, which we must maintain.
|
|
*/
|
|
u_int16_t
|
|
res_getshort(msgp)
|
|
register const u_char *msgp;
|
|
{
|
|
return (_getshort(msgp));
|
|
}
|
|
#endif
|
|
|
|
u_int32_t
|
|
_getlong(msgp)
|
|
register const u_char *msgp;
|
|
{
|
|
register u_int32_t u;
|
|
|
|
GETLONG(u, msgp);
|
|
return (u);
|
|
}
|
|
|
|
void
|
|
#if defined(__STDC__) || defined(__cplusplus)
|
|
__putshort(register u_int16_t s, register u_char *msgp) /* must match proto */
|
|
#else
|
|
__putshort(s, msgp)
|
|
register u_int16_t s;
|
|
register u_char *msgp;
|
|
#endif
|
|
{
|
|
PUTSHORT(s, msgp);
|
|
}
|
|
|
|
void
|
|
__putlong(l, msgp)
|
|
register u_int32_t l;
|
|
register u_char *msgp;
|
|
{
|
|
PUTLONG(l, msgp);
|
|
}
|
|
|
|
#ifdef ultrix
|
|
/* ultrix 4.0 had some icky packaging in its libc.a. alias for it here.
|
|
* there is more gunk of this kind over in res_debug.c.
|
|
*/
|
|
#undef putshort
|
|
void
|
|
#if defined(__STDC__) || defined(__cplusplus)
|
|
putshort(register u_short s, register u_char *msgp)
|
|
#else
|
|
putshort(s, msgp)
|
|
register u_short s;
|
|
register u_char *msgp;
|
|
#endif
|
|
{
|
|
__putshort(s, msgp);
|
|
}
|
|
#undef putlong
|
|
void
|
|
putlong(l, msgp)
|
|
register u_int32_t l;
|
|
register u_char *msgp;
|
|
{
|
|
__putlong(l, msgp);
|
|
}
|
|
|
|
#undef dn_skipname
|
|
dn_skipname(comp_dn, eom)
|
|
const u_char *comp_dn, *eom;
|
|
{
|
|
return (__dn_skipname(comp_dn, eom));
|
|
}
|
|
#endif /* Ultrix 4.0 hackery */
|