strcpy/strcat/sprintf removal in all bootblocks. various testing by

various people.  outside of some messy things in src/gnu, only one
thing in the main tree now violates this rule: bind

11 files changed, 23 insertions, 21 deletions

diff --git a/sys/lib/libkern/arch/alpha/Makefile.inc b/sys/lib/libkern/arch/alpha/Makefile.inc
index b984665e3a5..2cef95cd260 100644
--- a/sys/lib/libkern/arch/alpha/Makefile.inc
+++ b/sys/lib/libkern/arch/alpha/Makefile.inc
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.12 2002/04/28 20:55:14 pvalchev Exp $
+#	$OpenBSD: Makefile.inc,v 1.13 2003/06/01 17:00:30 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.9 1996/08/27 00:44:24 cgd Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.c memset.c \
-	bcmp.c bzero.S ffs.S softfloat.c strcat.c strcmp.c strcpy.c \
+	bcmp.c bzero.S ffs.S softfloat.c strcmp.c \
 	strlcat.c strlcpy.c strlen.c strncmp.c \
 	strncpy.c scanc.c skpc.c htonl.S htons.S ntohl.S ntohs.S \
 	random.c strncasecmp.c
diff --git a/sys/lib/libkern/arch/hppa/Makefile.inc b/sys/lib/libkern/arch/hppa/Makefile.inc
index abef9b9e0d0..47bd03f41f1 100644
--- a/sys/lib/libkern/arch/hppa/Makefile.inc
+++ b/sys/lib/libkern/arch/hppa/Makefile.inc
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.16 2003/01/28 22:55:53 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.17 2003/06/01 17:00:30 deraadt Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	random.c ashrdi3.c divdi3.c strncpy.c strncmp.c strcmp.c memchr.c \
-	memcmp.c memset.c strlen.c strcpy.c strlcpy.c strlcat.c \
-	strcat.c skpc.c strncasecmp.c \
+	memcmp.c memset.c strlen.c strlcpy.c strlcat.c \
+	skpc.c strncasecmp.c \
 	bcmp.c scanc.c ffs.c
 
 SRCS+=	milli.S
diff --git a/sys/lib/libkern/arch/i386/Makefile.inc b/sys/lib/libkern/arch/i386/Makefile.inc
index 00928bb3c2c..eacb3cc5bbb 100644
--- a/sys/lib/libkern/arch/i386/Makefile.inc
+++ b/sys/lib/libkern/arch/i386/Makefile.inc
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2000/12/18 18:40:46 provos Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2003/06/01 17:00:30 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.10 1996/04/13 01:17:41 cgd Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.S memcmp.S \
-	bcmp.S ffs.S memset.S strcat.S strcmp.S strcpy.S strlcat.c strlcpy.c \
+	bcmp.S ffs.S memset.S strcmp.S strlcat.c strlcpy.c \
 	strlen.S strncmp.c \
 	strncpy.c scanc.S skpc.S locc.S htonl.S htons.S ntohl.S ntohs.S \
 	strncasecmp.c
diff --git a/sys/lib/libkern/arch/m68k/Makefile.inc b/sys/lib/libkern/arch/m68k/Makefile.inc
index 41329201e3e..fd44dc81ac6 100644
--- a/sys/lib/libkern/arch/m68k/Makefile.inc
+++ b/sys/lib/libkern/arch/m68k/Makefile.inc
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2000/12/18 18:40:46 provos Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2003/06/01 17:00:30 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.7 1996/04/18 01:53:04 cgd Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.S memset.S \
-	bcmp.S bzero.S ffs.S strcat.S strcmp.S strcpy.S strlcat.c strlcpy.c \
+	bcmp.S bzero.S ffs.S strcmp.S strlcat.c strlcpy.c \
 	strlen.S strncmp.S \
 	strncpy.S htonl.S htons.S ntohl.S ntohs.S scanc.S skpc.S locc.S \
 	strncasecmp.c
diff --git a/sys/lib/libkern/arch/m88k/Makefile.inc b/sys/lib/libkern/arch/m88k/Makefile.inc
index e5c2cb3055d..981b6ce386d 100644
--- a/sys/lib/libkern/arch/m88k/Makefile.inc
+++ b/sys/lib/libkern/arch/m88k/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2001/02/01 03:25:42 smurph Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2003/06/01 17:00:30 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.2 1996/04/13 01:17:58 cgd Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.c memset.c bcmp.c random.c \
-	strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c strlen.c strncmp.c \
+	strcmp.c strlcat.c strlcpy.c strlen.c strncmp.c \
 	strncpy.c scanc.c skpc.c strncasecmp.c ffs.c
diff --git a/sys/lib/libkern/arch/mips/Makefile.inc b/sys/lib/libkern/arch/mips/Makefile.inc
index d3b951e07b5..420fb818fd4 100644
--- a/sys/lib/libkern/arch/mips/Makefile.inc
+++ b/sys/lib/libkern/arch/mips/Makefile.inc
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2000/12/18 18:40:46 provos Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2003/06/01 17:00:31 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.4 1996/04/13 01:17:46 cgd Exp $
 #
 #	There are likely more that we will notice when we go native
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.c memset.c strcmp.c \
-	bcmp.S bcopy.S bzero.S strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c \
+	bcmp.S bcopy.S bzero.S strcmp.c strlcat.c strlcpy.c \
 	ffs.S htonl.S \
 	htons.S strcmp.S strlen.S strncmp.c random.c scanc.c skpc.c strncpy.c \
 	strncasecmp.c
diff --git a/sys/lib/libkern/arch/powerpc/Makefile.inc b/sys/lib/libkern/arch/powerpc/Makefile.inc
index d4044794977..4063f90ed0b 100644
--- a/sys/lib/libkern/arch/powerpc/Makefile.inc
+++ b/sys/lib/libkern/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2002/11/11 16:32:48 drahn Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2003/06/01 17:00:31 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.6 1994/10/26 06:39:03 cgd Exp $
 
 CFLAGS	+= -D_KERNEL
@@ -6,7 +6,7 @@ CFLAGS	+= -D_KERNEL
 SRCS+=	__main.c __eabi.c \
 	imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.c memset.c \
-	bcmp.c ffs.c strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c \
+	bcmp.c ffs.c strcmp.c strlcat.c strlcpy.c \
 	strlen.c strncmp.c \
 	strncpy.c scanc.c skpc.c locc.c \
 	memcpy.c random.c strncasecmp.c
diff --git a/sys/lib/libkern/arch/sparc/Makefile.inc b/sys/lib/libkern/arch/sparc/Makefile.inc
index 2560b9391b9..b2c73360f51 100644
--- a/sys/lib/libkern/arch/sparc/Makefile.inc
+++ b/sys/lib/libkern/arch/sparc/Makefile.inc
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2002/08/11 12:21:33 art Exp $
+#	$OpenBSD: Makefile.inc,v 1.11 2003/06/01 17:00:31 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.12 1996/04/23 23:05:22 christos Exp $
 
 SRCS+=  __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.c memset.c \
-	bcmp.c bzero.S strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c \
+	bcmp.c bzero.S strcmp.c strlcat.c strlcpy.c \
 	strlen.S strncmp.c \
 	strncpy.c htonl.S htons.S ntohl.S ntohs.S scanc.c skpc.c \
 	strncasecmp.c
diff --git a/sys/lib/libkern/arch/sparc64/Makefile.inc b/sys/lib/libkern/arch/sparc64/Makefile.inc
index 52c05a7295d..60ec5985400 100644
--- a/sys/lib/libkern/arch/sparc64/Makefile.inc
+++ b/sys/lib/libkern/arch/sparc64/Makefile.inc
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2002/09/06 22:59:58 art Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2003/06/01 17:00:31 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.4 2000/11/01 19:37:20 thorpej Exp $
 
 SRCS+=  __main.c \
 	imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	bcmp.c ffs.S \
 	memchr.c memcmp.c \
-	strcat.c strcmp.c strcpy.c strlen.S strlcpy.c strlcat.c \
+	strcmp.c strlen.S strlcpy.c strlcat.c \
 	strncasecmp.c strncmp.c strncpy.c \
 	scanc.c skpc.c \
 	htonl.S htons.S ntohl.S ntohs.S
diff --git a/sys/lib/libkern/arch/vax/Makefile.inc b/sys/lib/libkern/arch/vax/Makefile.inc
index 6ac2e2c903c..2ca3980045d 100644
--- a/sys/lib/libkern/arch/vax/Makefile.inc
+++ b/sys/lib/libkern/arch/vax/Makefile.inc
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2000/12/18 18:40:47 provos Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2003/06/01 17:00:32 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.2 1996/04/13 01:17:58 cgd Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	memchr.c memcmp.c \
-	strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c strlen.c strncmp.c \
+	strcmp.c strlcat.c strlcpy.c strlen.c strncmp.c \
 	strncpy.c scanc.c skpc.c strncasecmp.c
diff --git a/sys/lib/libkern/funcs.h b/sys/lib/libkern/funcs.h
new file mode 100644
index 00000000000..9312dfb7d8a
--- /dev/null
+++ b/sys/lib/libkern/funcs.h
@@ -0,0 +1,2 @@
+size_t strlcpy(char *, const char *, int);
+size_t strlcat(char *, const char *, int);