Backout my libsa changes.
This commit is contained in:
thorpej
parent
1e544cc5eb
commit
36ff5d93e8
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.buildboot,v 1.6 1999/11/11 20:27:42 thorpej Exp $
|
||||
# $NetBSD: Makefile.buildboot,v 1.7 1999/11/13 21:19:27 thorpej Exp $
|
||||
|
||||
S= ${.CURDIR}/../../../..
|
||||
|
||||
@ -21,6 +21,11 @@ ${PROG}: ${PROGAOUT} ${MKBOOT_PROG}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
### find out what to use for libkern
|
||||
KERN_AS= library
|
||||
.include "${S}/lib/libkern/Makefile.inc"
|
||||
LIBKERN= ${KERNLIB}
|
||||
|
||||
### find out what to use for libz
|
||||
Z_AS= library
|
||||
.include "${S}/lib/libz/Makefile.inc"
|
||||
@ -32,10 +37,10 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes
|
||||
.include "${S}/lib/libsa/Makefile.inc"
|
||||
LIBSA= ${SALIB}
|
||||
|
||||
${PROGAOUT}: ${OBJS} ${LIBSA} ${LIBZ}
|
||||
${PROGAOUT}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
|
||||
sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
|
||||
${COMPILE.c} vers.c
|
||||
${LD} -N -T ${RELOC} -e begin -o ${PROGAOUT} \
|
||||
${OBJS} vers.o ${LIBSA} ${LIBZ}
|
||||
${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
|
||||
@size ${PROGAOUT}
|
||||
@echo ${PROGAOUT} total size should not exceed 1044480 bytes
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netio.c,v 1.6 1999/11/11 20:28:04 thorpej Exp $ */
|
||||
/* $NetBSD: netio.c,v 1.7 1999/11/13 21:21:38 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
|
||||
@ -97,6 +97,8 @@
|
||||
#include <lib/libsa/bootparam.h>
|
||||
#include <lib/libsa/nfs.h>
|
||||
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
#include <hp300/stand/common/samachdep.h>
|
||||
|
||||
extern int nfs_root_node[]; /* XXX - get from nfs_mount() */
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
/* $NetBSD: __main.c,v 1.1 1999/11/11 20:36:52 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Christopher G. Demetriou
|
||||
* 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 Christopher G. Demetriou.
|
||||
* 4. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
void __main __P((void));
|
||||
|
||||
void
|
||||
__main()
|
||||
{
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: arp.c,v 1.19 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: arp.c,v 1.20 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -47,6 +47,12 @@
|
||||
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
#include "net.h"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bcmp.c,v 1.2 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: bcmp.c,v 1.3 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1987, 1993
|
||||
@ -33,7 +33,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "stand.h"
|
||||
#include <sys/types.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
#undef bcmp /* in case of LIBSA_USE_MEMCMP */
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bootp.c,v 1.17 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: bootp.c,v 1.18 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -43,6 +43,12 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
#include "net.h"
|
||||
#include "netif.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bootparam.c,v 1.12 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: bootparam.c,v 1.13 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Gordon W. Ross
|
||||
@ -42,6 +42,12 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "rpcv2.h"
|
||||
|
||||
#include "stand.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bzero.c,v 1.2 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: bzero.c,v 1.3 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
|
||||
@ -30,7 +30,8 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "stand.h"
|
||||
#include <sys/cdefs.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
#undef bzero /* in case of LIBSA_USE_MEMSET */
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cd9660.c,v 1.9 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: cd9660.c,v 1.10 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1996 Wolfgang Solfrank.
|
||||
@ -38,6 +38,11 @@
|
||||
* blocksizes other than 2048 bytes, multi-extent files, etc.
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
#include <isofs/cd9660/iso.h>
|
||||
|
||||
#include "stand.h"
|
||||
@ -68,9 +73,17 @@ struct ptable_ent {
|
||||
|
||||
#define cdb2devb(bno) ((bno) * ISO_DEFAULT_BLOCK_SIZE / DEV_BSIZE)
|
||||
|
||||
static int toupper __P((int));
|
||||
static int pnmatch __P((char *, struct ptable_ent *));
|
||||
static int dirmatch __P((char *, struct iso_directory_record *));
|
||||
|
||||
static int
|
||||
toupper(c)
|
||||
int c;
|
||||
{
|
||||
return c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c;
|
||||
}
|
||||
|
||||
static int
|
||||
pnmatch(path, pp)
|
||||
char *path;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: checkpasswd.c,v 1.2 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: checkpasswd.c,v 1.3 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993
|
||||
@ -28,6 +28,12 @@
|
||||
* @(#)gets.c 8.1 (Berkeley) 6/11/93
|
||||
*/
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
|
||||
char *
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cread.c,v 1.10 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: cread.c,v 1.11 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996
|
||||
@ -48,6 +48,7 @@
|
||||
|
||||
#include "stand.h"
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#include <lib/libz/zlib.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: dev_net.c,v 1.17 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: dev_net.c,v 1.18 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
@ -61,6 +61,8 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
#include "stand.h"
|
||||
#include "net.h"
|
||||
#include "netif.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ether.c,v 1.13 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: ether.c,v 1.14 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -41,6 +41,11 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_ether.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: exec.c,v 1.18 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: exec.c,v 1.19 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1990, 1993
|
||||
@ -39,6 +39,11 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
#include <sys/exec.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs.c,v 1.4 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: lfs.c,v 1.5 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993
|
||||
@ -77,6 +77,17 @@
|
||||
#include <ufs/ufs/dinode.h>
|
||||
#include <ufs/ufs/dir.h>
|
||||
#include <ufs/lfs/lfs.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
inline u_int
|
||||
max(a, b)
|
||||
u_int a, b;
|
||||
{
|
||||
return (a > b ? a : b);
|
||||
}
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
#include "lfs.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: loadfile.c,v 1.5 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: loadfile.c,v 1.6 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
@ -77,6 +77,7 @@
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libsa/stand.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: memcmp.c,v 1.5 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: memcmp.c,v 1.6 1999/11/13 21:17:56 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
|
||||
@ -37,6 +37,11 @@
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
#include "stand.h"
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: memset.c,v 1.2 1999/11/11 20:23:16 thorpej Exp $ */
|
||||
/* $NetBSD: memset.c,v 1.3 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
|
||||
@ -30,7 +30,8 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "stand.h"
|
||||
#include <sys/cdefs.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
void *
|
||||
memset(dstv, c, length)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: net.c,v 1.24 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: net.c,v 1.25 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -42,6 +42,12 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_ether.h>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netif.c,v 1.13 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: netif.c,v 1.14 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Adam Glass
|
||||
@ -35,6 +35,11 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/mount.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: nfs.c,v 1.26 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: nfs.c,v 1.27 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993 John Brezak
|
||||
@ -42,6 +42,11 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rarp.c,v 1.18 1999/11/12 13:12:09 lukem Exp $ */
|
||||
/* $NetBSD: rarp.c,v 1.19 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -46,6 +46,12 @@
|
||||
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
#include "net.h"
|
||||
#include "netif.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rpc.c,v 1.19 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: rpc.c,v 1.20 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -53,6 +53,12 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "rpcv2.h"
|
||||
|
||||
#include "stand.h"
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
/* $NetBSD: strcat.c,v 1.1 1999/11/11 21:23:27 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 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.
|
||||
*/
|
||||
|
||||
#include "stand.h"
|
||||
|
||||
char *
|
||||
strcat(s, append)
|
||||
char *s;
|
||||
const char *append;
|
||||
{
|
||||
char *t = s;
|
||||
|
||||
for (; *t; ++t)
|
||||
;
|
||||
while ((*t++ = *append++) != '\0')
|
||||
;
|
||||
return (s);
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
/* $NetBSD: strcpy.c,v 1.1 1999/11/11 21:23:27 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 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.
|
||||
*/
|
||||
|
||||
#include "stand.h"
|
||||
|
||||
char *
|
||||
strcpy(to, from)
|
||||
char *to;
|
||||
const char *from;
|
||||
{
|
||||
char *save = to;
|
||||
|
||||
for (; (*to = *from) != '\0'; ++from, ++to);
|
||||
return(save);
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tftp.c,v 1.8 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: tftp.c,v 1.9 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996
|
||||
@ -58,6 +58,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/udp.h>
|
||||
#include <netinet/in_systm.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
#ifdef _STANDALONE
|
||||
#include "/usr/include/arpa/tftp.h" /* XXX */
|
||||
#else
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ufs.c,v 1.28 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: ufs.c,v 1.29 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993
|
||||
@ -76,6 +76,17 @@
|
||||
#include <ufs/ufs/dinode.h>
|
||||
#include <ufs/ufs/dir.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
inline u_int
|
||||
max(a, b)
|
||||
u_int a, b;
|
||||
{
|
||||
return (a > b ? a : b);
|
||||
}
|
||||
#endif
|
||||
|
||||
#include "stand.h"
|
||||
#include "ufs.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ustarfs.c,v 1.13 1999/11/11 20:23:17 thorpej Exp $ */
|
||||
/* $NetBSD: ustarfs.c,v 1.14 1999/11/13 21:17:57 thorpej Exp $ */
|
||||
|
||||
/* [Notice revision 2.2]
|
||||
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
|
||||
@ -62,6 +62,11 @@
|
||||
* XXX LIBSA_FS_SINGLECOMPONENT
|
||||
*/
|
||||
|
||||
#ifdef _STANDALONE
|
||||
#include <lib/libkern/libkern.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
#include "stand.h"
|
||||
#include "ustarfs.h"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: zutil.h,v 1.8 1999/11/12 12:11:31 simonb Exp $ */
|
||||
/* $NetBSD: zutil.h,v 1.9 1999/11/13 21:24:20 thorpej Exp $ */
|
||||
|
||||
/* zutil.h -- internal interface and configuration of the compression library
|
||||
* Copyright (C) 1995-1998 Jean-loup Gailly.
|
||||
@ -19,7 +19,8 @@
|
||||
|
||||
#if defined(__NetBSD__) && (defined(_KERNEL) || defined(_STANDALONE))
|
||||
|
||||
# include <lib/libsa/stand.h>
|
||||
/* XXX doesn't seem to need anything at all, but this is for consistency. */
|
||||
# include <lib/libkern/libkern.h>
|
||||
|
||||
#else
|
||||
#ifdef STDC
|
||||
|
||||
Loading…
Reference in New Issue
Block a user