18 files changed, 125 insertions, 43 deletions

diff --git a/sys/lib/libkern/__main.c b/sys/lib/libkern/__main.c
index aa2be9a7509..02b525d8133 100644
--- a/sys/lib/libkern/__main.c
+++ b/sys/lib/libkern/__main.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: __main.c,v 1.3 1994/10/26 06:42:13 cgd Exp $	*/
+/*	$OpenBSD: __main.c,v 1.2 1996/04/19 16:09:17 niklas Exp $	*/
+/*	$NetBSD: __main.c,v 1.4 1996/03/14 18:52:03 christos Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -30,6 +31,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/types.h>
+
+void __main __P((void));
+
+void
 __main()
 {
 }
diff --git a/sys/lib/libkern/arch/i386/Makefile.inc b/sys/lib/libkern/arch/i386/Makefile.inc
index cbeec30a509..a39aac330eb 100644
--- a/sys/lib/libkern/arch/i386/Makefile.inc
+++ b/sys/lib/libkern/arch/i386/Makefile.inc
@@ -1,4 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.7 1995/10/07 09:52:48 mycroft Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1996/04/19 16:09:44 niklas Exp $
+#	$NetBSD: Makefile.inc,v 1.9 1996/03/11 05:32:00 scottr Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	bcmp.S ffs.S memset.S strcat.S strcmp.S strcpy.S strlen.S strncmp.c \
diff --git a/sys/lib/libkern/arch/sparc/memset.c b/sys/lib/libkern/arch/sparc/memset.c
index 8b208c7e970..af092288f49 100644
--- a/sys/lib/libkern/arch/sparc/memset.c
+++ b/sys/lib/libkern/arch/sparc/memset.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: memset.c,v 1.2 1994/10/26 06:40:00 cgd Exp $	*/
+/*	$OpenBSD: memset.c,v 1.2 1996/04/19 16:09:46 niklas Exp $	*/
+/*	$NetBSD: memset.c,v 1.4 1996/03/11 05:46:51 scottr Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +41,7 @@
 #ifdef notdef
 static char *sccsid = "@(#)memset.c	5.6 (Berkeley) 1/26/91";
 #endif
-static char *rcsid = "$NetBSD: memset.c,v 1.2 1994/10/26 06:40:00 cgd Exp $";
+static char *rcsid = "$NetBSD: memset.c,v 1.4 1996/03/11 05:46:51 scottr Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
diff --git a/sys/lib/libkern/bcmp.c b/sys/lib/libkern/bcmp.c
index e2341527631..feaa9655521 100644
--- a/sys/lib/libkern/bcmp.c
+++ b/sys/lib/libkern/bcmp.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bcmp.c,v 1.2 1996/04/19 16:09:19 niklas Exp $	*/
+
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
@@ -33,14 +35,16 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)bcmp.c	5.6 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: bcmp.c,v 1.1 1995/10/18 08:52:49 deraadt Exp $";
+static char *rcsid = "$OpenBSD: bcmp.c,v 1.2 1996/04/19 16:09:19 niklas Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
+#include <lib/libkern/libkern.h>
 
 /*
  * bcmp -- vax cmpc3 instruction
  */
+int
 bcmp(b1, b2, length)
 	const void *b1, *b2;
 	register size_t length;
diff --git a/sys/lib/libkern/imax.c b/sys/lib/libkern/imax.c
index 243f82deb66..7c61784e4d5 100644
--- a/sys/lib/libkern/imax.c
+++ b/sys/lib/libkern/imax.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: imax.c,v 1.2 1994/10/26 06:42:24 cgd Exp $	*/
+/*	$OpenBSD: imax.c,v 1.2 1996/04/19 16:09:20 niklas Exp $	*/
+/*	$NetBSD: imax.c,v 1.3 1996/03/14 18:52:06 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 int
 imax(a, b)
 	int a, b;
diff --git a/sys/lib/libkern/imin.c b/sys/lib/libkern/imin.c
index 9ac2402c6ba..5eef0b07818 100644
--- a/sys/lib/libkern/imin.c
+++ b/sys/lib/libkern/imin.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: imin.c,v 1.2 1994/10/26 06:42:25 cgd Exp $	*/
+/*	$OpenBSD: imin.c,v 1.2 1996/04/19 16:09:22 niklas Exp $	*/
+/*	$NetBSD: imin.c,v 1.3 1996/03/14 18:52:07 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 int
 imin(a, b)
 	int a, b;
diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h
index e292a3ca8b1..53a8600cd77 100644
--- a/sys/lib/libkern/libkern.h
+++ b/sys/lib/libkern/libkern.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: libkern.h,v 1.2 1996/02/29 13:27:49 niklas Exp $	*/
-/*	$NetBSD: libkern.h,v 1.6 1996/02/13 23:48:26 christos Exp $	*/
+/*	$OpenBSD: libkern.h,v 1.3 1996/04/19 16:09:23 niklas Exp $	*/
+/*	$NetBSD: libkern.h,v 1.7 1996/03/14 18:52:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,71 +38,79 @@
 
 #include <sys/types.h>
 
-static __inline int imax __P((int, int));
-static __inline int imin __P((int, int));
-static __inline u_int max __P((u_int, u_int));
-static __inline u_int min __P((u_int, u_int));
-static __inline long lmax __P((long, long));
-static __inline long lmin __P((long, long));
-static __inline u_long ulmax __P((u_long, u_long));
-static __inline u_long ulmin __P((u_long, u_long));
-static __inline int abs __P((int));
+#ifndef LIBKERN_INLINE
+#define LIBKERN_INLINE	static __inline
+#define LIBKERN_BODY
+#endif
 
-static __inline int
+
+LIBKERN_INLINE int imax __P((int, int));
+LIBKERN_INLINE int imin __P((int, int));
+LIBKERN_INLINE u_int max __P((u_int, u_int));
+LIBKERN_INLINE u_int min __P((u_int, u_int));
+LIBKERN_INLINE long lmax __P((long, long));
+LIBKERN_INLINE long lmin __P((long, long));
+LIBKERN_INLINE u_long ulmax __P((u_long, u_long));
+LIBKERN_INLINE u_long ulmin __P((u_long, u_long));
+LIBKERN_INLINE int abs __P((int));
+
+#ifdef LIBKERN_BODY
+LIBKERN_INLINE int
 imax(a, b)
 	int a, b;
 {
 	return (a > b ? a : b);
 }
-static __inline int
+LIBKERN_INLINE int
 imin(a, b)
 	int a, b;
 {
 	return (a < b ? a : b);
 }
-static __inline long
+LIBKERN_INLINE long
 lmax(a, b)
 	long a, b;
 {
 	return (a > b ? a : b);
 }
-static __inline long
+LIBKERN_INLINE long
 lmin(a, b)
 	long a, b;
 {
 	return (a < b ? a : b);
 }
-static __inline u_int
+LIBKERN_INLINE u_int
 max(a, b)
 	u_int a, b;
 {
 	return (a > b ? a : b);
 }
-static __inline u_int
+LIBKERN_INLINE u_int
 min(a, b)
 	u_int a, b;
 {
 	return (a < b ? a : b);
 }
-static __inline u_long
+LIBKERN_INLINE u_long
 ulmax(a, b)
 	u_long a, b;
 {
 	return (a > b ? a : b);
 }
-static __inline u_long
+LIBKERN_INLINE u_long
 ulmin(a, b)
 	u_long a, b;
 {
 	return (a < b ? a : b);
 }
 
-static __inline int
+LIBKERN_INLINE int
 abs(j)
 	int j;
 {
 	return(j < 0 ? -j : j);
 }
+#endif
 
 /* Prototypes for non-quad routines. */
 int	 bcmp __P((const void *, const void *, size_t));
@@ -111,7 +119,7 @@ int	 locc __P((int, char *, u_int));
 u_long	 random __P((void));
 char	*rindex __P((const char *, int));
 int	 scanc __P((u_int, u_char *, u_char *, int));
-int	 skpc __P((int, int, char *));
+int	 skpc __P((int, size_t, u_char *));
 size_t	 strlen __P((const char *));
 char	*strcat __P((char *, const char *));
 char	*strcpy __P((char *, const char *));
diff --git a/sys/lib/libkern/lmax.c b/sys/lib/libkern/lmax.c
index 723300807d7..357a821d41f 100644
--- a/sys/lib/libkern/lmax.c
+++ b/sys/lib/libkern/lmax.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: lmax.c,v 1.2 1994/10/26 06:42:27 cgd Exp $	*/
+/*	$OpenBSD: lmax.c,v 1.2 1996/04/19 16:09:25 niklas Exp $	*/
+/*	$NetBSD: lmax.c,v 1.3 1996/03/14 18:52:09 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 long
 lmax(a, b)
 	long a, b;
diff --git a/sys/lib/libkern/lmin.c b/sys/lib/libkern/lmin.c
index 2bfe05aba70..21cb58eec0d 100644
--- a/sys/lib/libkern/lmin.c
+++ b/sys/lib/libkern/lmin.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: lmin.c,v 1.2 1994/10/26 06:42:28 cgd Exp $	*/
+/*	$OpenBSD: lmin.c,v 1.2 1996/04/19 16:09:27 niklas Exp $	*/
+/*	$NetBSD: lmin.c,v 1.3 1996/03/14 18:52:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 long
 lmin(a, b)
 	long a, b;
diff --git a/sys/lib/libkern/max.c b/sys/lib/libkern/max.c
index 825fb57fd3b..e0505d9ad2b 100644
--- a/sys/lib/libkern/max.c
+++ b/sys/lib/libkern/max.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: max.c,v 1.2 1994/10/26 06:42:31 cgd Exp $	*/
+/*	$OpenBSD: max.c,v 1.2 1996/04/19 16:09:28 niklas Exp $	*/
+/*	$NetBSD: max.c,v 1.3 1996/03/14 18:52:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 unsigned int
 max(a, b)
 	unsigned int a, b;
diff --git a/sys/lib/libkern/min.c b/sys/lib/libkern/min.c
index 07d26426902..9d9b9072a50 100644
--- a/sys/lib/libkern/min.c
+++ b/sys/lib/libkern/min.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: min.c,v 1.2 1994/10/26 06:42:33 cgd Exp $	*/
+/*	$OpenBSD: min.c,v 1.2 1996/04/19 16:09:29 niklas Exp $	*/
+/*	$NetBSD: min.c,v 1.3 1996/03/14 18:52:13 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 unsigned int
 min(a, b)
 	unsigned int a, b;
diff --git a/sys/lib/libkern/quad.h b/sys/lib/libkern/quad.h
index f7eea7a31ec..b1b57eea1d0 100644
--- a/sys/lib/libkern/quad.h
+++ b/sys/lib/libkern/quad.h
@@ -1,4 +1,5 @@
-/*	$NetBSD: quad.h,v 1.5 1995/10/12 15:13:58 jtc Exp $	*/
+/*	$OpenBSD: quad.h,v 1.3 1996/04/19 16:09:31 niklas Exp $	*/
+/*	$NetBSD: quad.h,v 1.6 1996/03/14 18:52:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -110,3 +111,24 @@ typedef unsigned int	qshift_t;
 #else
 typedef u_quad_t	qshift_t;
 #endif
+
+__BEGIN_DECLS
+quad_t	__adddi3	__P((quad_t, quad_t));
+quad_t	__anddi3	__P((quad_t, quad_t));
+quad_t	__ashldi3	__P((quad_t, qshift_t));
+quad_t	__ashrdi3	__P((quad_t, qshift_t));
+int	__cmpdi2	__P((quad_t, quad_t));
+quad_t	__divdi3	__P((quad_t, quad_t));
+quad_t	__iordi3	__P((quad_t, quad_t));
+quad_t	__lshldi3	__P((quad_t, qshift_t));
+quad_t	__lshrdi3	__P((quad_t, qshift_t));
+quad_t	__moddi3	__P((quad_t, quad_t));
+quad_t	__muldi3	__P((quad_t, quad_t));
+quad_t	__negdi2	__P((quad_t));
+quad_t	__one_cmpldi2	__P((quad_t));
+quad_t	__subdi3	__P((quad_t, quad_t));
+int	__ucmpdi2	__P((u_quad_t, u_quad_t));
+u_quad_t __udivdi3	__P((u_quad_t, u_quad_t));
+u_quad_t __umoddi3	__P((u_quad_t, u_quad_t));
+quad_t	__xordi3	__P((quad_t, quad_t));
+__END_DECLS
diff --git a/sys/lib/libkern/scanc.c b/sys/lib/libkern/scanc.c
index c28e47841b9..66686604672 100644
--- a/sys/lib/libkern/scanc.c
+++ b/sys/lib/libkern/scanc.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: scanc.c,v 1.2 1994/10/26 06:42:42 cgd Exp $	*/
+/*	$OpenBSD: scanc.c,v 1.2 1996/04/19 16:09:33 niklas Exp $	*/
+/*	$NetBSD: scanc.c,v 1.3 1996/03/14 18:52:16 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -36,6 +37,7 @@
  */
 
 #include <sys/types.h>
+#include <lib/libkern/libkern.h>
 
 int
 scanc(size, cp, table, mask)
diff --git a/sys/lib/libkern/skpc.c b/sys/lib/libkern/skpc.c
index 298af88fcaf..e710ca639b0 100644
--- a/sys/lib/libkern/skpc.c
+++ b/sys/lib/libkern/skpc.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: skpc.c,v 1.2 1994/10/26 06:42:43 cgd Exp $	*/
+/*	$OpenBSD: skpc.c,v 1.2 1996/04/19 16:09:36 niklas Exp $	*/
+/*	$NetBSD: skpc.c,v 1.3 1996/03/14 18:52:18 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -36,16 +37,17 @@
  */
 
 #include <sys/types.h>
+#include <lib/libkern/libkern.h>
 
 int
 skpc(mask, size, cp)
 	register int mask;
-	u_int size;
+	size_t size;
 	register u_char *cp;
 {
 	register u_char *end = &cp[size];
 
-	while (cp < end && *cp == mask)
+	while (cp < end && *cp == (u_char) mask)
 		cp++;
 	return (end - cp);
 }
diff --git a/sys/lib/libkern/strcat.c b/sys/lib/libkern/strcat.c
index 986543d9c46..069bd1fa35b 100644
--- a/sys/lib/libkern/strcat.c
+++ b/sys/lib/libkern/strcat.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: strcat.c,v 1.2 1996/04/19 16:09:37 niklas Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,7 +35,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strcat.c	5.6 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: strcat.c,v 1.1 1995/10/18 08:52:50 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strcat.c,v 1.2 1996/04/19 16:09:37 niklas Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
@@ -46,6 +48,6 @@ strcat(s, append)
 	char *save = s;
 
 	for (; *s; ++s);
-	while (*s++ = *append++);
+	while ((*s++ = *append++) != '\0');
 	return(save);
 }
diff --git a/sys/lib/libkern/strcpy.c b/sys/lib/libkern/strcpy.c
index 7c42dcf5801..d08b319e67b 100644
--- a/sys/lib/libkern/strcpy.c
+++ b/sys/lib/libkern/strcpy.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: strcpy.c,v 1.2 1996/04/19 16:09:39 niklas Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,7 +35,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)strcpy.c	5.7 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: strcpy.c,v 1.1 1995/10/18 08:52:50 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strcpy.c,v 1.2 1996/04/19 16:09:39 niklas Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
@@ -45,6 +47,6 @@ strcpy(to, from)
 {
 	char *save = to;
 
-	for (; *to = *from; ++from, ++to);
+	for (; (*to = *from) != '\0'; ++from, ++to);
 	return(save);
 }
diff --git a/sys/lib/libkern/ulmax.c b/sys/lib/libkern/ulmax.c
index 0beadeacb7e..e0b7817c43d 100644
--- a/sys/lib/libkern/ulmax.c
+++ b/sys/lib/libkern/ulmax.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: ulmax.c,v 1.2 1994/10/26 06:42:52 cgd Exp $	*/
+/*	$OpenBSD: ulmax.c,v 1.2 1996/04/19 16:09:40 niklas Exp $	*/
+/*	$NetBSD: ulmax.c,v 1.3 1996/03/14 18:52:23 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 unsigned long
 ulmax(a, b)
 	unsigned long a, b;
diff --git a/sys/lib/libkern/ulmin.c b/sys/lib/libkern/ulmin.c
index 68631c14506..d96e947a9ba 100644
--- a/sys/lib/libkern/ulmin.c
+++ b/sys/lib/libkern/ulmin.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: ulmin.c,v 1.2 1994/10/26 06:42:53 cgd Exp $	*/
+/*	$OpenBSD: ulmin.c,v 1.2 1996/04/19 16:09:41 niklas Exp $	*/
+/*	$NetBSD: ulmin.c,v 1.3 1996/03/14 18:52:25 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991 Regents of the University of California.
@@ -35,6 +36,9 @@
  *	@(#)subr_xxx.c	7.10 (Berkeley) 4/20/91
  */
 
+#define LIBKERN_INLINE
+#include <lib/libkern/libkern.h>
+
 unsigned long
 ulmin(a, b)
 	unsigned long a, b;