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

sys/arch/hp300/stand/libkern/Makefile

···
-#	$OpenBSD: Makefile,v 1.4 1997/07/15 07:52:21 downsj Exp $
+#	$OpenBSD: Makefile,v 1.5 2003/06/01 17:00:34 deraadt Exp $
 
 LIB=	kern
 
···
 	-I${.CURDIR}/../../../..  -I${.CURDIR}/../../../../lib/libkern
 
 # kern routines
-SRCS=	__main.c ashrdi3.c divdi3.c qdivrem.c strlen.S strcat.S strcmp.S \
-	strcpy.S strncmp.S umoddi3.c
+SRCS=	__main.c ashrdi3.c divdi3.c qdivrem.c strlen.S strcmp.S \
+	strncmp.S umoddi3.c
 
 ${OBJS}:	${.CURDIR}/../Makefile.inc
 

sys/arch/hp300/stand/libsa/Makefile

···
-#	$OpenBSD: Makefile,v 1.12 1999/08/16 09:43:09 downsj Exp $
+#	$OpenBSD: Makefile,v 1.13 2003/06/01 17:00:34 deraadt Exp $
 
 LIB=	sa
 
···
 
 # stand routines
 SRCS=	alloc.c devopen.c exit.c exec.c getfile.c gets.c globals.c \
-	memcmp.c memcpy.c memset.c printf.c strerror.c strncpy.c
+	memcmp.c memcpy.c memset.c printf.c snprintf.c strerror.c strncpy.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \

sys/arch/hp300/stand/libsaz/Makefile

···
-#	$OpenBSD: Makefile,v 1.1 1999/08/16 09:43:10 downsj Exp $
+#	$OpenBSD: Makefile,v 1.2 2003/06/01 17:00:34 deraadt Exp $
 
 LIB=	saz
 
···
 
 # stand routines
 SRCS=	alloc.c devopen.c exit.c exec.c getfile.c gets.c globals.c \
-	memcmp.c memcpy.c memset.c printf.c strerror.c strncpy.c
+	memcmp.c memcpy.c memset.c printf.c snprintf.c strerror.c strncpy.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \

sys/arch/hppa/stand/libsa/dev_hppa.c

···
-/*	$OpenBSD: dev_hppa.c,v 1.8 2003/04/16 07:20:50 mickey Exp $	*/
+/*	$OpenBSD: dev_hppa.c,v 1.9 2003/06/01 17:00:34 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
···
 ttyname(fd)
 	int fd;
 {
-	sprintf(ttyname_buf, "%s%d", cdevs[major(cn_tab->cn_dev)],
+	snprintf(ttyname_buf, sizeof ttyname_buf, "%s%d",
+	    cdevs[major(cn_tab->cn_dev)],
 	    minor(cn_tab->cn_dev));
 	return (ttyname_buf);
 }

sys/arch/i386/stand/libsa/Makefile

···
-#	$OpenBSD: Makefile,v 1.40 2003/04/17 03:43:18 drahn Exp $
+#	$OpenBSD: Makefile,v 1.41 2003/06/01 17:00:35 deraadt Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
···
 
 # stand routines
 SRCS+=	alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \
-	strncmp.c memcmp.c memcpy.c memset.c printf.c strerror.c strncpy.c \
-	strtol.c ctime.c
+	strncmp.c memcmp.c memcpy.c memset.c printf.c snprintf.c \
+	strerror.c strncpy.c strtol.c ctime.c strlcpy.c strlcat.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \

sys/arch/i386/stand/libsa/dev_i386.c

···
-/*	$OpenBSD: dev_i386.c,v 1.24 2001/09/11 06:06:15 fgsch Exp $	*/
+/*	$OpenBSD: dev_i386.c,v 1.25 2003/06/01 17:00:35 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
···
 ttyname(fd)
 	int fd;
 {
-	sprintf(ttyname_buf, "%s%d", cdevs[major(cn_tab->cn_dev)],
+	snprintf(ttyname_buf, sizeof ttyname_buf, "%s%d",
+	    cdevs[major(cn_tab->cn_dev)],
 	    minor(cn_tab->cn_dev));
 	return (ttyname_buf);
 }

sys/arch/macppc/stand/boot.c

···
-/*	$OpenBSD: boot.c,v 1.8 2002/09/15 09:01:59 deraadt Exp $	*/
+/*	$OpenBSD: boot.c,v 1.9 2003/06/01 17:00:36 deraadt Exp $	*/
 /*	$NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $	*/
 
 /*
···
 	/*
 	 * Get the boot arguments from Openfirmware
 	 */
-	if ((chosen = OF_finddevice("/chosen")) == -1
-	    || OF_getprop(chosen, "bootpath", bootdev, sizeof bootdev) < 0
-	    || OF_getprop(chosen, "bootargs", bootline, sizeof bootline) < 0) {
+	if ((chosen = OF_finddevice("/chosen")) == -1 ||
+	    OF_getprop(chosen, "bootpath", bootdev, sizeof bootdev) < 0 ||
+	    OF_getprop(chosen, "bootargs", bootline, sizeof bootline) < 0) {
 		printf("Invalid Openfirmware environment\n");
 		exit();
 	}
···
 	OF_setprop(chosen, "bootpath", opened_name, strlen(opened_name) + 1);
 	cp = bootline;
 #else
-	strcpy(bootline, opened_name);
+	strlcpy(bootline, opened_name, sizeof bootline);
 	cp = bootline + strlen(bootline);
 	*cp++ = ' ';
 #endif
···
 	ssym = (void *)marks[MARK_SYM];
 	esym = (void *)marks[MARK_END];
 
-	chain ((void *)entry, bootline, ssym, esym);
+	chain((void *)entry, bootline, ssym, esym);
 
 	_rtt();
 	return 0;

sys/arch/macppc/stand/hfs.c

···
-/*	$OpenBSD: hfs.c,v 1.1 2001/09/01 15:39:02 drahn Exp $	*/
+/*	$OpenBSD: hfs.c,v 1.2 2003/06/01 17:00:36 deraadt Exp $	*/
 /*	$NetBSD: hfs.c,v 1.1 2000/11/14 11:25:35 tsubai Exp $	*/
 
 /*-
···
 	int chosen;
 	char bootpath[128], *cp;
 
-
 	if ((chosen = OF_finddevice("/chosen")) == -1)
 		return ENXIO;
 	bzero(bootpath, sizeof bootpath);
···
 	cp = strrchr(bootpath, ',');
 #else
 	cp = bootpath;
-	cp += strlen (bootpath);
+	cp += strlen(bootpath);
 	for (; *cp != ','; cp--) {
 		if (cp == bootpath) {
 			cp = NULL;
···
 	if (cp == NULL)
 		return ENXIO;
 
-	strcpy(cp + 1, path);
+	strlcpy(cp + 1, path, bootpath + sizeof bootpath - (cp + 1));
 	OF_fd = OF_open(bootpath);
 	if (OF_fd == -1)
 		return ENOENT;
-
 	return 0;
 }
 

sys/arch/mvme68k/stand/installboot/installboot.c

···
-/*	$OpenBSD: installboot.c,v 1.7 2002/03/14 03:15:56 millert Exp $ */
+/*	$OpenBSD: installboot.c,v 1.8 2003/06/01 17:00:36 deraadt Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
···
 	boot = argv[optind];
 	proto = argv[optind + 1];
 	dev = argv[optind + 2];
-	strcpy(cdev, dev);
+	strlcpy(cdev, dev, sizeof cdev);
 	cdev[strlen(cdev)-1] = 'c';
 	
 	if (verbose) {

sys/arch/mvme68k/stand/wrtvid/wrtvid.c

···
-/*	$OpenBSD: wrtvid.c,v 1.3 1996/04/28 10:49:49 deraadt Exp $ */
+/*	$OpenBSD: wrtvid.c,v 1.4 2003/06/01 17:00:37 deraadt Exp $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
···
 		perror(filename);
 		exit(2);
 	}
-	sprintf(fileext, "%c%cboot", filename[4], filename[5]);
+	snprintf(fileext, sizeof fileext, "%c%cboot", filename[4], filename[5]);
 	tape_vid = open(fileext, O_WRONLY|O_CREAT|O_TRUNC, 0644);
-	sprintf(fileext, "boot%c%c", filename[4], filename[5]);
+	snprintf(fileext, sizeof fileext, "boot%c%c", filename[4], filename[5]);
 	tape_exe = open(fileext, O_WRONLY|O_CREAT|O_TRUNC,0644);
 
 	pcpul = (struct cpu_disklabel *)malloc(sizeof(struct cpu_disklabel));
 	bzero(pcpul, sizeof(struct cpu_disklabel));
 
-	strcpy(pcpul->vid_id, "NBSD");
+	memcpy(pcpul->vid_id, "NBSD", sizeof pcpul->vid_id);
 
 	fstat(exe_file, &stat);
 	/* size in 256 byte blocks round up after a.out header removed */

sys/arch/mvme88k/stand/installboot/installboot.c

···
-/*	$OpenBSD: installboot.c,v 1.6 2002/03/14 03:15:57 millert Exp $ */
+/*	$OpenBSD: installboot.c,v 1.7 2003/06/01 17:00:37 deraadt Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
···
 	boot = argv[optind];
 	proto = argv[optind + 1];
 	dev = argv[optind + 2];
-	strcpy(cdev, dev);
+	strlcpy(cdev, dev, sizeof cdev);
 	cdev[strlen(cdev)-1] = 'c';
 	
 	if (verbose) {
···
 
 
 	pcpul->version = 1;
-	strcpy(pcpul->vid_id, "M88K");
+	memcpy(pcpul->vid_id, "M88K", sizeof pcpul->vid_id);
 
 	fstat(exe_file, &stat);
 

sys/arch/mvme88k/stand/wrtvid/wrtvid.c

···
-/*	$OpenBSD: wrtvid.c,v 1.3 1998/08/22 08:52:56 smurph Exp $ */
+/*	$OpenBSD: wrtvid.c,v 1.4 2003/06/01 17:00:37 deraadt Exp $ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
···
 		perror(filename);
 		exit(2);
 	}
-	sprintf(fileext, "%c%cboot", filename[4], filename[5]);
+	snprintf(fileext, sizeof fileext, "%c%cboot", filename[4], filename[5]);
 	tape_vid = open(fileext, O_WRONLY|O_CREAT|O_TRUNC, 0644);
-	sprintf(fileext, "boot%c%c", filename[4], filename[5]);
+	snprintf(fileext, sizeof fileext, "boot%c%c", filename[4], filename[5]);
 	tape_exe = open(fileext, O_WRONLY|O_CREAT|O_TRUNC,0644);
 
 	pcpul = (struct cpu_disklabel *)malloc(sizeof(struct cpu_disklabel));
 	bzero(pcpul, sizeof(struct cpu_disklabel));
 
 	pcpul->version = 1;
-	strcpy(pcpul->vid_id, "M88K");
+	memcpy(pcpul->vid_id, "M88K", sizeof pcpul->vid_id);
 
 	fstat(exe_file, &stat);
 	/* size in 256 byte blocks round up after a.out header removed */

sys/arch/mvmeppc/stand/installboot/installboot.c

···
-/*	$OpenBSD: installboot.c,v 1.4 2002/03/14 03:15:58 millert Exp $ */
+/*	$OpenBSD: installboot.c,v 1.5 2003/06/01 17:00:38 deraadt Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
···
 	boot = argv[optind];
 	proto = argv[optind + 1];
 	dev = argv[optind + 2];
-	strcpy(cdev, dev);
+	strlcpy(cdev, dev, sizeof cdev);
 	cdev[strlen(cdev)-1] = 'c';
 	
 	if (verbose) {
···
 
 
 	pcpul->version = 1;
-	strcpy(pcpul->vid_id, "M88K");
+	memcpy(pcpul->vid_id, "M88K", sizeof pcpul->vid_id);
 
 	fstat(exe_file, &stat);
 

sys/arch/mvmeppc/stand/libsa/Makefile

···
-#	$OpenBSD: Makefile,v 1.1 2001/06/26 21:58:06 smurph Exp $
+#	$OpenBSD: Makefile,v 1.2 2003/06/01 17:00:38 deraadt Exp $
 
 LIB=sa
 
···
 	lseek.c open.c nullfs.c read.c fstat.c \
 	ufs.c cread.c
 
-SRC_kern= ashrdi3.c bzero.c strcpy.c
+SRC_kern= ashrdi3.c bzero.c
 
 SRC_mvme= exec_mvme.c
 

sys/arch/mvmeppc/stand/libsa/bugdev.c

···
-/*	$OpenBSD: bugdev.c,v 1.1 2001/06/26 21:58:07 smurph Exp $ */
+/*	$OpenBSD: bugdev.c,v 1.2 2003/06/01 17:00:38 deraadt Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
···
 	printf(" IO @ %x\n", io);
 	printf("MEM @ %x\n", mem);
 
-#define PRINT_REG(regname, x) printf("%s = 0x%x\n", regname, md_swap_long(*(unsigned *)(io + x)))
+#define PRINT_REG(regname, x) printf("%s = 0x%x\n", regname, \
+	    md_swap_long(*(unsigned *)(io + x)))
 	
         PRINT_REG("CSR0", 0x00);
         PRINT_REG("CSR1", 0x08);
···
 	va_end(ap);
 
 #ifdef DEBUG
-	printf("net_open: using mvmebug ctrl %d dev %d, filename: %s\n", pp->clun, pp->dlun, filename);
+	printf("net_open: using mvmebug ctrl %d dev %d, filename: %s\n",
+	    pp->clun, pp->dlun, filename);
 #endif
 	nfo.clun = pp->clun;
 	nfo.dlun = pp->dlun;
 	nfo.status = 0;
-	strcpy(nfo.filename, filename);
+	strlcpy(nfo.filename, filename, sizeof filename);
 	/* .NETFOPN syscall */
 	mvmeprom_netfopen(&nfo);
 	
 #ifdef DEBUG
 	if (nfo.status) {
 		nfoerr = nfo.status;
-		printf("net_open: ci err = 0x%x, cd err = 0x%x\n", ((nfoerr >> 8) & 0x0F), (nfoerr & 0x0F));
+		printf("net_open: ci err = 0x%x, cd err = 0x%x\n",
+		    ((nfoerr >> 8) & 0x0F), (nfoerr & 0x0F));
 	}
 #endif
 	return (nfo.status);

sys/arch/mvmeppc/stand/libsa/tftpfs.c

···
-/*	$OpenBSD: tftpfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $	*/
+/*	$OpenBSD: tftpfs.c,v 1.3 2003/06/01 17:00:38 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2001 Steve Murphree, Jr.
···
 		 * and start again.
 		 */
 		char filename[64];
-		strcpy(filename, fp->filename);
+		strlcpy(filename, fp->filename, sizeof filename);
                 tftpfs_close(f);
                 tftpfs_open(filename, f);
 		for (i = 1; i <= file_block; i++) {
···
 	bzero(fp->f_buf, TFTP_BLOCK_SIZE);
 	fp->f_buf_size = 0;
 
-        strcpy(fp->filename, path);
+        strlcpy(fp->filename, path, sizeof fp->filename);
 	
 	if (f->f_dev->dv_open == NULL) {
 		panic("No device open()!");

sys/arch/sparc/stand/common/promdev.c

···
-/*	$OpenBSD: promdev.c,v 1.7 2002/08/15 15:41:35 millert Exp $	*/
+/*	$OpenBSD: promdev.c,v 1.8 2003/06/01 17:00:39 deraadt Exp $	*/
 /*	$NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */
 
 /*
···
 		(void)(*promvec->pv_enaddr)(fd, (char *)ea);
 	} else {
 		char buf[64];
-		sprintf(buf, "%x mac-address drop swap 6 cmove", ea);
+		snprintf(buf, sizeof buf, "%x mac-address drop swap 6 cmove", ea);
 		promvec->pv_fortheval.v2_eval(buf);
 	}
 }

sys/arch/sparc/stand/libkern/Makefile

···
-#	$OpenBSD: Makefile,v 1.2 1999/12/10 10:40:47 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2003/06/01 17:00:39 deraadt Exp $
 
 LIB=	kern
 
···
 	-I${.CURDIR}/../../../../lib/libkern/arch/sparc
 
 # kern routines
-SRCS=	__main.c ashrdi3.c bzero.S divdi3.c qdivrem.c strlen.S strcat.c \
-	strcmp.c strcpy.c strncmp.c umoddi3.c
+SRCS=	__main.c ashrdi3.c bzero.S divdi3.c qdivrem.c strlen.S \
+	strcmp.c strncmp.c umoddi3.c
 
 SRCS+=	umul.S mul.S rem.S sdiv.S udiv.S urem.S
 SRCS+=	saveregs.S

sys/arch/sparc/stand/libsa/Makefile

···
-#	$OpenBSD: Makefile,v 1.1 1997/09/17 10:46:23 downsj Exp $
+#	$OpenBSD: Makefile,v 1.2 2003/06/01 17:00:39 deraadt Exp $
 
 LIB=	sa
 
···
 
 # stand routines
 SRCS=	alloc.c exit.c exec.c getfile.c gets.c globals.c \
-	memcmp.c memcpy.c memset.c printf.c strerror.c strncpy.c
+	memcmp.c memcpy.c memset.c printf.c snprintf.c strerror.c strncpy.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \

sys/arch/sparc64/stand/libkern/Makefile

···
-#	$OpenBSD: Makefile,v 1.4 2003/04/09 10:35:04 sturm Exp $
+#	$OpenBSD: Makefile,v 1.5 2003/06/01 17:00:39 deraadt Exp $
 
 LIB=	kern
 
···
 	-I${.CURDIR}/../../../../lib/libkern/arch/sparc
 
 # kern routines
-SRCS=	__main.c ashrdi3.c bzero.S divdi3.c qdivrem.c strlen.S strcat.c \
-	strcmp.c strcpy.c strlcat.c strlcpy.c strncmp.c umoddi3.c
+SRCS=	__main.c ashrdi3.c bzero.S divdi3.c qdivrem.c strlen.S \
+	strcmp.c strlcat.c strlcpy.c strncmp.c umoddi3.c
 
 SRCS+=	umul.S mul.S rem.S sdiv.S udiv.S urem.S
 SRCS+=	saveregs.S

sys/arch/sparc64/stand/libsa/Makefile

···
-#	$OpenBSD: Makefile,v 1.4 2001/10/10 20:41:40 miod Exp $
+#	$OpenBSD: Makefile,v 1.5 2003/06/01 17:00:40 deraadt Exp $
 
 LIB=	sa
 
···
 
 # stand routines
 SRCS=	alloc.c exit.c exec.c getfile.c gets.c globals.c \
-	memcmp.c memcpy.c memset.c printf.c strerror.c strncpy.c
+	memcmp.c memcpy.c memset.c printf.c snprintf.c strerror.c strncpy.c
 
 # io routines
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \

sys/arch/sparc64/stand/ofwboot/boot.c

···
-/*	$OpenBSD: boot.c,v 1.7 2003/05/11 20:22:20 mdw Exp $	*/
+/*	$OpenBSD: boot.c,v 1.8 2003/06/01 17:00:40 deraadt Exp $	*/
 /*	$NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $	*/
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
···
 
 #ifdef DEBUG
 	printf("chain: calling OF_chain(%x, %x, %x, %x, %x)\n",
-	       (void *)RELOC, end - (char *)RELOC, entry, args, l);
+	    (void *)RELOC, end - (char *)RELOC, entry, args, l);
 #endif
 	/* if -D is set then pause in the PROM. */
 	if (debug > 1) OF_enter();
···
 			printf("read header: %s\n", strerror(errno));
 		else
 			printf("read header: short read (only %d of %d)\n",
-				rval, sizeof(hdr));
+			    rval, sizeof(hdr));
 		rval = 1;
 		goto err;
 	}
···
 	if (bcmp(hdr.elf32.e_ident, ELFMAG, SELFMAG) == 0 &&
 	    hdr.elf32.e_ident[EI_CLASS] == ELFCLASS32) {
 		rval = elf32_exec(fd, &hdr.elf32, &entry, &ssym, &esym);
-	} else
-	if (bcmp(hdr.elf64.e_ident, ELFMAG, SELFMAG) == 0 &&
+	} else if (bcmp(hdr.elf64.e_ident, ELFMAG, SELFMAG) == 0 &&
 	    hdr.elf64.e_ident[EI_CLASS] == ELFCLASS64) {
 		rval = elf64_exec(fd, &hdr.elf64, &entry, &ssym, &esym);
 	} else
···
 	for (i = 0; i < elf->e_shnum; i++, shp++) {
 		if (shp->sh_type == SHT_NULL)
 			continue;
-		if (shp->sh_type != SHT_SYMTAB
-		    && shp->sh_type != SHT_STRTAB) {
+		if (shp->sh_type != SHT_SYMTAB &&
+		    shp->sh_type != SHT_STRTAB) {
 			shp->sh_offset = 0; 
 			shp->sh_type = SHT_NOBITS;
 			continue;
···
 	addr += sizeof(Elf32_Ehdr) + (elf->e_shnum * sizeof(Elf32_Shdr));
 	off = sizeof(Elf32_Ehdr) + (elf->e_shnum * sizeof(Elf32_Shdr));
 	for (first = 1, i = 0; i < elf->e_shnum; i++, shp++) {
-		if (shp->sh_type == SHT_SYMTAB
-		    || shp->sh_type == SHT_STRTAB) {
+		if (shp->sh_type == SHT_SYMTAB ||
+		    shp->sh_type == SHT_STRTAB) {
 			if (first)
 				printf("symbols @ 0x%lx ", (u_long)addr);
 			printf("%s%d", first ? "" : "+", shp->sh_size);
···
 	/*
 	 * Get the boot arguments from Openfirmware
 	 */
-	if ((chosen = OF_finddevice("/chosen")) == -1
-	    || OF_getprop(chosen, "bootpath", bootdev, sizeof bootdev) < 0
-	    || OF_getprop(chosen, "bootargs", bootline, sizeof bootline) < 0) {
+	if ((chosen = OF_finddevice("/chosen")) == -1 ||
+	    OF_getprop(chosen, "bootpath", bootdev, sizeof bootdev) < 0 ||
+	    OF_getprop(chosen, "bootargs", bootline, sizeof bootline) < 0) {
 		printf("Invalid Openfirmware environment\n");
 		exit();
 	}
···
 	 */
 
 	bootlp = kernels;
-	if (parseargs(bootline, &boothowto) == -1
-			|| (boothowto & RB_ASKNAME)) {
+	if (parseargs(bootline, &boothowto) == -1 ||
+	    (boothowto & RB_ASKNAME)) {
 		bootlp = 0;
 	} else if (*bootline) {
 		just_bootline[0] = bootline;
···
 				kernels[0] = 0;	/* no more iteration */
 			} else if (cp != bootline) {
 				printf(": trying %s...\n", cp);
-				strcpy(bootline, cp);
+				strlcpy(bootline, cp, sizeof bootline);
 			}
 		}
 		if (!bootlp) {
···
 				bootlp = kernels;
 				continue;
 			}
-			if (strcmp(bootline, "exit") == 0
-					|| strcmp(bootline, "halt") == 0) {
+			if (strcmp(bootline, "exit") == 0 ||
+			    strcmp(bootline, "halt") == 0) {
 				_rtt();
 			}
 		}
···
 		OF_setprop(chosen, "bootpath", opened_name, strlen(opened_name) + 1);
 		cp = bootline;
 #else
-		strcpy(bootline, opened_name);
+		strlcpy(bootline, opened_name, sizeof bootline);
 		cp = bootline + strlen(bootline);
 		*cp++ = ' ';
 #endif

sys/lib/libkern/arch/alpha/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/hppa/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/i386/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/m68k/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/m88k/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/mips/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/powerpc/Makefile.inc

···
-#	$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
···
 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

sys/lib/libkern/arch/sparc/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/sparc64/Makefile.inc

···
-#	$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

sys/lib/libkern/arch/vax/Makefile.inc

···
-#	$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

sys/lib/libkern/funcs.h

···
+size_t strlcpy(char *, const char *, int);
+size_t strlcat(char *, const char *, int);

sys/lib/libsa/Makefile

···
-#	$OpenBSD: Makefile,v 1.20 2001/06/23 01:47:39 drahn Exp $
+#	$OpenBSD: Makefile,v 1.21 2003/06/01 17:00:32 deraadt Exp $
 #	$NetBSD: Makefile,v 1.13 1996/10/02 16:19:51 ws Exp $
 
 LIB=	sa
···
 .endif
 
 # stand routines
-SRCS+=	alloc.c memcpy.c exit.c exec.c getfile.c gets.c globals.c printf.c \
-	strerror.c strcmp.c memset.c memcmp.c strncpy.c strncmp.c strchr.c
+SRCS+=	alloc.c memcpy.c exit.c exec.c getfile.c gets.c globals.c \
+	printf.c snprintf.c strerror.c strcmp.c memset.c memcmp.c \
+	strncpy.c strncmp.c strchr.c
 
 # math from libkern
 SRCS+=	divdi3.c qdivrem.c

sys/lib/libsa/Makefile.inc

···
-#	$OpenBSD: Makefile.inc,v 1.11 2002/04/29 01:02:28 hugh Exp $
+#	$OpenBSD: Makefile.inc,v 1.12 2003/06/01 17:00:32 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.5 1996/09/30 16:01:18 ws Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
···
 	@echo making sure the stand-alone library is up to date...
 	@${SAMAKE} libsa.a
 
-clean::	 		.NOTMAIN __always_make_salib
+clean::			.NOTMAIN __always_make_salib
 	@echo cleaning the stand-alone library objects
 	@${SAMAKE} clean
 	-rmdir -p ${SADST}

sys/lib/libsa/alloc.c

···
-/*	$OpenBSD: alloc.c,v 1.6 2002/03/14 03:16:09 millert Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.7 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: alloc.c,v 1.6 1997/02/04 18:36:33 thorpej Exp $	*/
 
 /*
···
  * SUCH DAMAGE.
  *
  *	@(#)alloc.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/arp.c

···
-/*	$OpenBSD: arp.c,v 1.9 2002/03/14 03:16:09 millert Exp $	*/
+/*	$OpenBSD: arp.c,v 1.10 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: arp.c,v 1.15 1996/10/13 02:28:58 christos Exp $	*/
 
 /*
···
 		struct ether_header eh;
 		struct {
 			struct ether_arp arp;
-			u_char pad[18]; 	/* 60 - sizeof(...) */
+			u_char pad[18];		/* 60 - sizeof(...) */
 		} data;
 	} wbuf;
 	struct {
 		struct ether_header eh;
 		struct {
 			struct ether_arp arp;
-			u_char pad[24]; 	/* extra space */
+			u_char pad[24];		/* extra space */
 		} data;
 	} rbuf;
 
···
 	}
 
 #ifdef ARP_DEBUG
- 	if (debug)
- 	    printf("arpwhohas: send request for %s\n", inet_ntoa(addr));
+	if (debug)
+	    printf("arpwhohas: send request for %s\n", inet_ntoa(addr));
 #endif
 
 	bzero((char *)&wbuf.data, sizeof(wbuf.data));
···
 	/* Store ethernet address in cache */
 	ah = &rbuf.data.arp;
 #ifdef ARP_DEBUG
- 	if (debug) {
+	if (debug) {
 		printf("arp: response from %s\n",
 		    ether_sprintf(rbuf.eh.ether_shost));
 		printf("arp: cacheing %s --> %s\n",
···
 {
 
 #ifdef ARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("arpsend: called\n");
 #endif
 
···
 	u_int16_t etype;	/* host order */
 
 #ifdef ARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("arprecv: ");
 #endif
 
···
 
 	/* We have our answer. */
 #ifdef ARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("got it\n");
 #endif
 	return (n);

sys/lib/libsa/bootp.c

···
-/*	$OpenBSD: bootp.c,v 1.9 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: bootp.c,v 1.10 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: bootp.c,v 1.10 1996/10/13 02:28:59 christos Exp $	*/
 
 /*
···
 	} rbuf;
 
 #ifdef BOOTP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("bootp: socket=%d\n", sock);
 #endif
 	if (!bot)
 		bot = getsecs();
-	
+
 	if (!(d = socktodesc(sock))) {
 		printf("bootp: bad socket. %d\n", sock);
 		return;
 	}
 #ifdef BOOTP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("bootp: d=%x\n", (u_int)d);
 #endif
 

sys/lib/libsa/cd9660.c

···
-/*	$OpenBSD: cd9660.c,v 1.8 2003/04/15 18:41:19 mickey Exp $	*/
+/*	$OpenBSD: cd9660.c,v 1.9 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: cd9660.c,v 1.1 1996/09/30 16:01:19 ws Exp $	*/
 
 /*
···
 {
 	char *cp;
 	int i;
-	
+
 	cp = pp->name;
 	for (i = isonum_711(pp->namlen); --i >= 0; path++, cp++) {
 		if (toupper(*path) == *cp)
···
 	struct ptable_ent *pp;
 	struct iso_directory_record *dp;
 	int rc;
-	
+
 	/* First find the volume descriptor */
 	buf = alloc(buf_size = ISO_DEFAULT_BLOCK_SIZE);
 	dp = (struct iso_directory_record *)buf;
···
 	}
 	if (isonum_723(vd->logical_block_size) != ISO_DEFAULT_BLOCK_SIZE)
 		goto out;
-	
+
 	/* Now get the path table and lookup the directory of the file */
 	bno = isonum_732(vd->type_m_path_table);
 	psize = isonum_733(vd->path_table_size);
-	
+
 	if (psize > ISO_DEFAULT_BLOCK_SIZE) {
 		free(buf, ISO_DEFAULT_BLOCK_SIZE);
 		buf = alloc(buf_size = roundup(psize, ISO_DEFAULT_BLOCK_SIZE));
···
 		rc = EIO;
 		goto out;
 	}
-	
+
 	parent = 1;
 	pp = (struct ptable_ent *)buf;
 	ent = 1;
 	bno = isonum_732(pp->block) + isonum_711(pp->extlen);
-	
+
 	rc = ENOENT;
 	/*
 	 * Remove extra separators
···
 		rc = ENOENT;
 		goto out;
 	}
-	
+
 	/* allocate file system specific data structure */
 	fp = alloc(sizeof(struct file));
 	bzero(fp, sizeof(struct file));
···
 	fp->bno = isonum_733(dp->extent);
 	fp->size = isonum_733(dp->size);
 	free(buf, buf_size);
-	
+
 	return 0;
-	
+
 out:
 	if (fp)
 		free(fp, sizeof(struct file));
 	free(buf, buf_size);
-	
+
 	return rc;
 }
 
···
 	struct open_file *f;
 {
 	struct file *fp = (struct file *)f->f_fsdata;
-	
+
 	f->f_fsdata = 0;
 	free(fp, sizeof *fp);
-	
+
 	return 0;
 }
 
···
 	char buf[ISO_DEFAULT_BLOCK_SIZE];
 	char *dp;
 	size_t read, off;
-	
+
 	while (size) {
 		if (fp->off < 0 || fp->off >= fp->size)
 			break;
···
 			dp = buf;
 		else
 			dp = start;
-		twiddle();	
+		twiddle();
 		rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno),
 					   ISO_DEFAULT_BLOCK_SIZE, dp, &read);
 		if (rc)
···
 	int where;
 {
 	struct file *fp = (struct file *)f->f_fsdata;
-	
+
 	switch (where) {
 	case SEEK_SET:
 		fp->off = offset;
···
 	struct stat *sb;
 {
 	struct file *fp = (struct file *)f->f_fsdata;
-	
+
 	/* only importatn stuff */
 	sb->st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH;
 	sb->st_uid = sb->st_gid = 0;

sys/lib/libsa/close.c

···
-/*	$OpenBSD: close.c,v 1.5 1997/02/06 02:56:44 downsj Exp $	*/
+/*	$OpenBSD: close.c,v 1.6 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: close.c,v 1.5 1995/09/06 19:53:29 pk Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)close.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/closeall.c

···
-/*	$OpenBSD: closeall.c,v 1.2 1996/09/23 14:18:50 mickey Exp $	*/
+/*	$OpenBSD: closeall.c,v 1.3 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: close.c,v 1.5 1995/09/06 19:53:29 pk Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)close.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/ctime.c

···
-/*	$OpenBSD: ctime.c,v 1.2 1998/06/11 01:34:10 mickey Exp $	*/
+/*	$OpenBSD: ctime.c,v 1.3 2003/06/01 17:00:32 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
···
 		tt--;
 
 	/* no field widths in printf() */
-	sprintf(buf, "%s %s %d %d:%d:%d %d\n",
+	snprintf(buf, sizeof buf, "%s %s %d %d:%d:%d %d\n",
 		((wday  < 0 || wday  >=  7)? "???": wdays[wday]),
 		((month < 0 || month >= 12)? "???": months[month]),
 		(int)tt, hh, mm, ss, year);

sys/lib/libsa/ether.c

···
-/*	$OpenBSD: ether.c,v 1.5 1998/02/23 20:32:23 niklas Exp $	*/
+/*	$OpenBSD: ether.c,v 1.6 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: ether.c,v 1.8 1996/10/13 02:29:00 christos Exp $	*/
 
 /*
···
 	register struct ether_header *eh;
 
 #ifdef ETHER_DEBUG
- 	if (debug)
+	if (debug)
 		printf("sendether: called\n");
 #endif
 
···
 	register struct ether_header *eh;
 
 #ifdef ETHER_DEBUG
- 	if (debug)
+	if (debug)
 		printf("readether: called\n");
 #endif
 

sys/lib/libsa/exec.c

···
-/*	$OpenBSD: exec.c,v 1.22 1998/07/14 14:26:18 mickey Exp $	*/
+/*	$OpenBSD: exec.c,v 1.23 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: exec.c,v 1.15 1996/10/13 02:29:01 christos Exp $	*/
 
 /*-
···
 			sz = i - sizeof(int);
 			addr += sizeof(int);
 			if (read(io, addr, sz) != sz)
-                	goto shread;
+				goto shread;
 			addr += sz;
 		}
 
···
 
 #ifdef EXEC_DEBUG
         printf("loadaddr=%p etxt=%p daddr=%p ssym=%p esym=%p\n",
-	    	loadaddr, etxt, daddr, ssym, esym);
+	    loadaddr, etxt, daddr, ssym, esym);
         printf("\n\nReturn to boot...\n");
         getchar();
 #endif

sys/lib/libsa/exit.c

···
-/*	$OpenBSD: exit.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
+/*	$OpenBSD: exit.c,v 1.7 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: exit.c,v 1.11 1996/12/01 20:22:19 pk Exp $	*/
 
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
- * 
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
···
  *     documentation and/or other materials provided with the distribution.
  *  3. 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
···
 __dead void
 panic(const char *fmt, ...)
 {
-    extern void closeall(void);
-    va_list ap;
-    static int paniced;
-    
-    if (!paniced) {
-        paniced = 1;
-        closeall();
-    }
+	extern void closeall(void);
+	va_list ap;
+	static int paniced;
 
-    va_start(ap, fmt);
-    vprintf(fmt, ap);
-    printf("\n");
-    va_end(ap);
-    _rtt();
-    /*NOTREACHED*/
+	if (!paniced) {
+		paniced = 1;
+		closeall();
+	}
+
+	va_start(ap, fmt);
+	vprintf(fmt, ap);
+	printf("\n");
+	va_end(ap);
+	_rtt();
+	/*NOTREACHED*/
 }
 
 void
 exit()
 {
-    panic("exit");
-    /*NOTREACHED*/
+	panic("exit");
+	/*NOTREACHED*/
 }

sys/lib/libsa/ioctl.c

···
-/*	$OpenBSD: ioctl.c,v 1.2 1996/09/23 14:18:55 mickey Exp $	*/
+/*	$OpenBSD: ioctl.c,v 1.3 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: ioctl.c,v 1.4 1994/10/30 21:48:24 cgd Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/iodesc.h

···
-/*	$OpenBSD: iodesc.h,v 1.2 1996/09/23 14:18:56 mickey Exp $	*/
+/*	$OpenBSD: iodesc.h,v 1.3 2003/06/01 17:00:32 deraadt Exp $	*/
 /*	$NetBSD: iodesc.h,v 1.4 1995/09/23 03:31:50 gwr Exp $	*/
 
 /*
- * Copyright (c) 1993 Adam Glass 
+ * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1992 Regents of the University of California.
  * All rights reserved.
  *

sys/lib/libsa/loadfile.c

···
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile.c,v 1.4 2003/05/07 18:11:37 mickey Exp $ */
+/* $OpenBSD: loadfile.c,v 1.5 2003/06/01 17:00:32 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
···
 #ifdef BOOT_AOUT
 		struct exec aout;
 #endif
-		
+
 	} hdr;
 	ssize_t nr;
 	int fd, rval;
···
 		sub = 0;
 	else
 		sub = sizeof(*x);
-	
+
 	minp = maxp = ALIGNENTRY(entry);
 
 	if (lseek(fd, sizeof(*x), SEEK_SET) == -1)  {

sys/lib/libsa/lseek.c

···
-/*	$OpenBSD: lseek.c,v 1.4 1997/02/06 02:56:45 downsj Exp $	*/
+/*	$OpenBSD: lseek.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: lseek.c,v 1.3 1996/06/21 20:09:03 pk Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)lseek.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/net.c

···
-/*	$OpenBSD: net.c,v 1.11 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: net.c,v 1.12 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $	*/
 
 /*
···
 	struct ip tip;
 
 #ifdef NET_DEBUG
- 	if (debug) {
+	if (debug) {
 		printf("sendudp: d=%x called.\n", (u_int)d);
 		if (d) {
 			printf("saddr: %s:%d",

sys/lib/libsa/net.h

···
-/*	$OpenBSD: net.h,v 1.5 2002/03/14 03:16:10 millert Exp $	*/
+/*	$OpenBSD: net.h,v 1.6 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: net.h,v 1.10 1995/10/20 00:46:30 cgd Exp $	*/
 
 /*
- * Copyright (c) 1993 Adam Glass 
+ * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1992 Regents of the University of California.
  * All rights reserved.
  *

sys/lib/libsa/netif.c

···
-/*	$OpenBSD: netif.c,v 1.6 1999/01/11 05:12:26 millert Exp $	*/
+/*	$OpenBSD: netif.c,v 1.7 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: netif.c,v 1.7 1996/10/13 02:29:03 christos Exp $	*/
 
 /*
···
 {
 	struct netif_driver *drv;
 	int d, i;
-    
+
 #ifdef NETIF_DEBUG
 	if (netif_debug)
 		printf("netif_init: called\n");
···
 		for (u = 0; u < drv->netif_nifs; u++) {
 			cur_if.nif_unit = u;
 			unit_done = 0;
-		
+
 #ifdef NETIF_DEBUG
 			if (netif_debug)
 				printf("\t%s%d:", drv->netif_bname,
···
 	if (netif_debug)
 		printf("%s%d: netif_attach\n", drv->netif_bname, nif->nif_unit);
 #endif
-	desc->io_netif = nif; 
+	desc->io_netif = nif;
 #ifdef PARANOID
 	if (drv->netif_init == NULL)
 		panic("%s%d: no netif_init support", drv->netif_bname,
 		    nif->nif_unit);
 #endif
 	drv->netif_init(desc, machdep_hint);
-	bzero(drv->netif_ifs[nif->nif_unit].dif_stats, 
+	bzero(drv->netif_ifs[nif->nif_unit].dif_stats,
 	    sizeof(struct netif_stats));
 }
 
···
 	int fd;
 	register struct iodesc *s;
 	struct netif *nif;
-	
+
 	/* find a free socket */
 	for (fd = 0, s = sockets; fd < SOPEN_MAX; fd++, s++)
 		if (s->io_netif == (struct netif *)0)
···
 	bzero(s, sizeof(*s));
 	netif_init();
 	nif = netif_select(machdep_hint);
-	if (!nif) 
+	if (!nif)
 		panic("netboot: no interfaces left untried");
 	if (netif_probe(nif, machdep_hint)) {
 		printf("netboot: couldn't probe %s%d\n",

sys/lib/libsa/netif.h

···
-/*	$OpenBSD: netif.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: netif.h,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: netif.h,v 1.4 1995/09/14 23:45:30 pk Exp $	*/
 
 #ifndef __SYS_LIBNETBOOT_NETIF_H
···
 int		netif_close(int);
 
 struct iodesc	*socktodesc(int);
-	
+
 #endif /* __SYS_LIBNETBOOT_NETIF_H */

sys/lib/libsa/nfs.c

···
-/*	$OpenBSD: nfs.c,v 1.8 1997/03/25 20:30:43 niklas Exp $	*/
+/*	$OpenBSD: nfs.c,v 1.9 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: nfs.c,v 1.19 1996/10/13 02:29:04 christos Exp $	*/
 
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
- * 
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
···
  *     documentation and/or other materials provided with the distribution.
  *  3. 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
···
 		struct repl d;
 	} rdata;
 	size_t cc;
-	
+
 #ifdef NFS_DEBUG
 	if (debug)
 		printf("nfs_getrootfh: %s\n", path);
···
 		struct repl d;
 	} rdata;
 	ssize_t cc;
-	
+
 #ifdef NFS_DEBUG
 	if (debug)
 		printf("lookupfh: called\n");
···
 
 	if (cc < 4)
 		return (EIO);
-	
+
 	if (rdata.d.errno)
 		return (ntohl(rdata.d.errno));
 
···
 	int error = 0;
 
 #ifdef NFS_DEBUG
- 	if (debug)
- 	    printf("nfs_open: %s\n", path);
+	if (debug)
+		printf("nfs_open: %s\n", path);
 #endif
 	if (nfs_root_node.iodesc == NULL) {
 		printf("nfs_open: must mount first.\n");
···
 
 	currfd = &nfs_root_node;
 	newfd = 0;
-	
+
 	cp = path;
 	while (*cp) {
 		/*
···
 			error = ENOTDIR;
 			goto out;
 		}
-		
+
 		/* allocate file system specific data structure */
 		newfd = alloc(sizeof(*newfd));
 		newfd->iodesc = currfd->iodesc;
 		newfd->off = 0;
-	
+
 		/*
 		 * Get next component of path name.
 		 */
 		{
 			register int len = 0;
-			
+
 			ncp = cp;
 			while ((c = *cp) != '\0' && c != '/') {
 				if (++len > NFS_MAXNAMLEN) {
···
 			}
 			*cp = '\0';
 		}
-		
+
 		/* lookup a file handle */
 		error = nfs_lookupfh(currfd, ncp, newfd);
 		*cp = c;
 		if (error)
 			goto out;
-		
+
 		/*
 		 * Check for symbolic link
 		 */
 		if (newfd->fa.fa_type == htonl(NFLNK)) {
 			int link_len, len;
-			
+
 			error = nfs_readlink(newfd, linkbuf);
 			if (error)
 				goto out;
···
 
 			bcopy(cp, &namebuf[link_len], len + 1);
 			bcopy(linkbuf, namebuf, link_len);
-			
+
 			/*
 			 * If absolute pathname, restart at root.
 			 * If relative pathname, restart at parent directory.
···
 
 			free(newfd, sizeof(*newfd));
 			newfd = 0;
-			
+
 			continue;
 		}
-		
+
 		if (currfd != &nfs_root_node)
 			free(currfd, sizeof(*currfd));
 		currfd = newfd;
···
 		f->f_fsdata = (void *)currfd;
 		return (0);
 	}
-		
+
 #ifdef NFS_DEBUG
 	if (debug)
 		printf("nfs_open: %s lookupfh failed: %s\n",
···
 	if (fp)
 		free(fp, sizeof(struct nfs_iodesc));
 	f->f_fsdata = (void *)0;
-	
+
 	return (0);
 }
 
···
 	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
 	register ssize_t cc;
 	register char *addr = buf;
-	
+
 #ifdef NFS_DEBUG
 	if (debug)
 		printf("nfs_read: size=%d off=%d\n", size, (int)fp->off);

sys/lib/libsa/nullfs.c

···
-/*	$OpenBSD: nullfs.c,v 1.4 1997/05/04 22:41:24 millert Exp $	*/
+/*	$OpenBSD: nullfs.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: open.c,v 1.9 1995/09/19 09:16:52 thorpej Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)open.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/open.c

···
-/*	$OpenBSD: open.c,v 1.7 1998/09/11 01:41:18 millert Exp $	*/
+/*	$OpenBSD: open.c,v 1.8 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: open.c,v 1.12 1996/09/30 16:01:21 ws Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)open.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/printf.c

···
-/*	$OpenBSD: printf.c,v 1.18 2003/05/20 19:23:01 jason Exp $	*/
+/*	$OpenBSD: printf.c,v 1.19 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $	*/
 
 /*-
···
 
 #include "stand.h"
 
-static void kprintn(void (*)(int), u_long, int);
-static void kdoprnt(void (*)(int), const char *, va_list);
-
-#ifndef	STRIPPED
-static void sputchar(int);
-static char *sbuf;
-
-static void
-sputchar(c)
-	int c;
-{
-	*sbuf++ = c;
-}
-
-void
-sprintf(char *buf, const char *fmt, ...)
-{
-	va_list ap;
-
-	sbuf = buf;
-	va_start(ap, fmt);
-	kdoprnt(sputchar, fmt, ap);
-	va_end(ap);
-	*sbuf = '\0';
-}
-#endif	/* NO_SPRINTF */
+void kprintn(void (*)(int), u_long, int);
+void kdoprnt(void (*)(int), const char *, va_list);
 
 void
 printf(const char *fmt, ...)
···
 	kdoprnt(putchar, fmt, ap);
 }
 
-static void
+void
 kdoprnt(put, fmt, ap)
 	void (*put)(int);
 	const char *fmt;
···
 	va_end(ap);
 }
 
-static void
+void
 kprintn(put, ul, base)
 	void (*put)(int);
 	unsigned long ul;

sys/lib/libsa/rarp.c

···
-/*	$OpenBSD: rarp.c,v 1.8 2002/03/14 03:16:10 millert Exp $	*/
+/*	$OpenBSD: rarp.c,v 1.9 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: rarp.c,v 1.13 1996/10/13 02:29:05 christos Exp $	*/
 
 /*
···
 		u_char header[ETHER_SIZE];
 		struct {
 			struct ether_arp arp;
-			u_char pad[18]; 	/* 60 - sizeof(arp) */
+			u_char pad[18];		/* 60 - sizeof(arp) */
 		} data;
 	} wbuf;
 	struct {
 		u_char header[ETHER_SIZE];
 		struct {
 			struct ether_arp arp;
-			u_char pad[24]; 	/* extra space */
+			u_char pad[24];		/* extra space */
 		} data;
 	} rbuf;
 
 #ifdef RARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("rarp: socket=%d\n", sock);
 #endif
 	if (!(d = socktodesc(sock))) {
···
 		return (-1);
 	}
 #ifdef RARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("rarp: d=%x\n", (u_int)d);
 #endif
 
···
 {
 
 #ifdef RARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("rarpsend: called\n");
 #endif
 
···
 	u_int16_t etype;	/* host order */
 
 #ifdef RARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("rarprecv: ");
 #endif
 
···
 
 	/* We have our answer. */
 #ifdef RARP_DEBUG
- 	if (debug)
+	if (debug)
 		printf("got it\n");
 #endif
 	return (n);

sys/lib/libsa/read.c

···
-/*	$OpenBSD: read.c,v 1.4 1997/02/06 02:56:46 downsj Exp $	*/
+/*	$OpenBSD: read.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: read.c,v 1.7 1996/06/21 20:29:28 pk Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)read.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */

sys/lib/libsa/readdir.c

···
-/*	$OpenBSD: readdir.c,v 1.4 1997/07/21 15:43:54 mickey Exp $	*/
+/*	$OpenBSD: readdir.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
···
 
 	return fd;
 }
-	
+
 int
 readdir(fd, dest)
 	int fd;

sys/lib/libsa/rpc.c

···
-/*	$OpenBSD: rpc.c,v 1.11 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: rpc.c,v 1.12 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: rpc.c,v 1.16 1996/10/13 02:29:06 christos Exp $	*/
 
 /*
···
 #include "rpc.h"
 
 struct auth_info {
-	int32_t 	authtype;	/* auth type */
+	int32_t		authtype;	/* auth type */
 	u_int32_t	authlen;	/* auth length */
 };
 
···
 
 struct rpc_call {
 	u_int32_t	rp_xid;		/* request transaction id */
-	int32_t 	rp_direction;	/* call direction (0) */
+	int32_t		rp_direction;	/* call direction (0) */
 	u_int32_t	rp_rpcvers;	/* rpc version (2) */
 	u_int32_t	rp_prog;	/* program */
 	u_int32_t	rp_vers;	/* version */
···
 
 struct rpc_reply {
 	u_int32_t	rp_xid;		/* request transaction id */
-	int32_t 	rp_direction;	/* call direction (1) */
-	int32_t 	rp_astatus;	/* accept status (0: accepted) */
+	int32_t		rp_direction;	/* call direction (1) */
+	int32_t		rp_astatus;	/* accept status (0: accepted) */
 	union {
 		u_int32_t	rpu_errno;
 		struct {
···
 	struct in_addr	addr;	/* server, net order */
 	u_int	prog;		/* host order */
 	u_int	vers;		/* host order */
-	int 	port;		/* host order */
+	int	port;		/* host order */
 } rpc_pmap_list[PMAP_NUM];
 
 /* return port number in host order, or -1 */
···
 	struct in_addr	addr;	/* server, net order */
 	u_int		prog;	/* host order */
 	u_int		vers;	/* host order */
-	int 		port;	/* host order */
+	int		port;	/* host order */
 {
 	struct pmap_list *pl;
 

sys/lib/libsa/snprintf.c

···
+/*	$OpenBSD: snprintf.c,v 1.1 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $	*/
+
+/*-
+ * Copyright (c) 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.
+ *
+ *	@(#)printf.c	8.1 (Berkeley) 6/11/93
+ */
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <machine/stdarg.h>
+
+#include "stand.h"
+
+extern void kprintn(void (*)(int), u_long, int);
+extern void kdoprnt(void (*)(int), const char *, va_list);
+
+#ifndef	STRIPPED
+static void sputchar(int);
+
+static char *sbuf, *sbuf_end;
+static size_t sbuf_len;
+
+void
+sputchar(c)
+	int c;
+{
+	if (sbuf < sbuf_end)
+		*sbuf = c;
+	sbuf++;
+}
+
+int
+snprintf(char *buf, size_t len, const char *fmt, ...)
+{
+	va_list ap;
+
+	sbuf = buf;
+	sbuf_len = len;
+	sbuf_end = sbuf + len;
+	va_start(ap, fmt);
+	kdoprnt(sputchar, fmt, ap);
+	va_end(ap);
+
+	if (sbuf < sbuf_end)
+		*sbuf = '\0';
+	else if (len > 0)
+		*(sbuf_end - 1) = '\0';
+
+	return sbuf - buf;
+}
+
+#endif	/* STRIPPED */

sys/lib/libsa/stand.h

···
-/*	$OpenBSD: stand.h,v 1.39 2002/03/15 18:19:52 millert Exp $	*/
+/*	$OpenBSD: stand.h,v 1.40 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
···
 u_int	dkcksum(struct disklabel *);
 
 void	printf(const char *, ...);
-void	sprintf(char *, const char *, ...);
+int	snprintf(char *, size_t, const char *, ...);
 void	vprintf(const char *, _BSD_VA_LIST_);
 void	twiddle(void);
 void	gets(char *);
···
 void	usleep(u_int);
 char *ctime(const time_t *);
 
-void	putchar(int);    
+void	putchar(int);
 int	getchar(void);
 
 #ifdef __INTERNAL_LIBSA_CREAD

sys/lib/libsa/strcmp.c

···
-/*	$OpenBSD: strcmp.c,v 1.2 1996/10/16 11:32:07 mickey Exp $ */
+/*	$OpenBSD: strcmp.c,v 1.3 2003/06/01 17:00:33 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1996 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

sys/lib/libsa/strerror.c

···
-/*	$OpenBSD: strerror.c,v 1.5 1997/06/10 16:39:16 millert Exp $	*/
+/*	$OpenBSD: strerror.c,v 1.6 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: strerror.c,v 1.11 1996/10/13 02:29:08 christos Exp $	*/
 
 /*-
···
 strerror(err)
 	int err;
 {
-static	char ebuf[64];
+	static	char ebuf[64];
 
 	switch (err) {
 	case EADAPT:
···
 		return "Invalid argument";
 
 	default:
-		sprintf(ebuf, "Unknown error: code %d", err);
+		snprintf(ebuf, sizeof ebuf, "Unknown error: code %d", err);
 		return ebuf;
 	}
 }

sys/lib/libsa/strncmp.c

···
-/*	$OpenBSD: strncmp.c,v 1.1 1997/02/06 06:47:00 mickey Exp $ */
+/*	$OpenBSD: strncmp.c,v 1.2 2003/06/01 17:00:33 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1996 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

sys/lib/libsa/strncpy.c

···
-/*	$OpenBSD: strncpy.c,v 1.1 1996/10/16 11:32:07 mickey Exp $ */
+/*	$OpenBSD: strncpy.c,v 1.2 2003/06/01 17:00:33 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1996 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

sys/lib/libsa/ufs.c

···
-/*	$OpenBSD: ufs.c,v 1.13 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: ufs.c,v 1.14 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $	*/
 
 /*-
···
  * 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.
- *  
+ *
  *
  * Copyright (c) 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: David Golub
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
···
 	buf = alloc(fs->fs_bsize);
 	twiddle();
 	rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ,
-		fsbtodb(fs, ino_to_fsba(fs, inumber)), fs->fs_bsize,
-		buf, &rsize);
+	    fsbtodb(fs, ino_to_fsba(fs, inumber)), fs->fs_bsize,
+	    buf, &rsize);
 	if (rc)
 		goto out;
 	if (rsize != (size_t)fs->fs_bsize) {
···
 	}
 out:
 	free(buf, fs->fs_bsize);
-	return (rc);	 
+	return (rc);
 }
 
 /*
···
 		if (fp->f_blkno[level] != ind_block_num) {
 			if (fp->f_blk[level] == (char *)0)
 				fp->f_blk[level] =
-					alloc(fs->fs_bsize);
+				    alloc(fs->fs_bsize);
 			twiddle();
 			rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ,
-				fsbtodb(fp->f_fs, ind_block_num),
-				fs->fs_bsize,
-				fp->f_blk[level],
-				&fp->f_blksize[level]);
+			    fsbtodb(fp->f_fs, ind_block_num), fs->fs_bsize,
+			    fp->f_blk[level], &fp->f_blksize[level]);
 			if (rc)
 				return (rc);
 			if (fp->f_blksize[level] != (size_t)fs->fs_bsize)
···
 		} else {
 			twiddle();
 			rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ,
-				fsbtodb(fs, disk_block),
-				block_size, fp->f_buf, &fp->f_buf_size);
+			    fsbtodb(fs, disk_block),
+			    block_size, fp->f_buf, &fp->f_buf_size);
 			if (rc)
 				return (rc);
 		}
···
 	fp->f_fs = fs;
 	twiddle();
 	rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ,
-		SBLOCK, SBSIZE, (char *)fs, &buf_size);
+	    SBLOCK, SBSIZE, (char *)fs, &buf_size);
 	if (rc)
 		goto out;
 
···
 
 			if (link_len < fs->fs_maxsymlinklen) {
 				bcopy(fp->f_di.di_shortlink, namebuf,
-				      (unsigned) link_len);
+				    (unsigned) link_len);
 			} else {
 				/*
 				 * Read file for symbolic link
···
 				rc = block_map(f, (daddr_t)0, &disk_block);
 				if (rc)
 					goto out;
-				
+
 				twiddle();
 				rc = (f->f_dev->dv_strategy)(f->f_devdata,
-					F_READ, fsbtodb(fs, disk_block),
-					fs->fs_bsize, buf, &buf_size);
+				    F_READ, fsbtodb(fs, disk_block),
+				    fs->fs_bsize, buf, &buf_size);
 				if (rc)
 					goto out;
 
···
 			while (dp < edp && dp->d_ino == (ino_t)0)
 				dp = (struct direct *)((char *)dp + dp->d_reclen);
 			fp->f_seekp += buf_size -
-				((u_int8_t *)edp - (u_int8_t *)dp);
+			    ((u_int8_t *)edp - (u_int8_t *)dp);
 		} while (dp >= edp);
 
 #if BYTE_ORDER == LITTLE_ENDIAN

sys/lib/libsa/unixdev.c

···
-/*	$OpenBSD: unixdev.c,v 1.4 1998/05/25 18:37:30 mickey Exp $	*/
+/*	$OpenBSD: unixdev.c,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996-1998 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
···
 
 #ifdef	UNIX_DEBUG
 	printf("unixstrategy: %s %d bytes @ %d\n",
-		(rw==F_READ?"reading":"writing"), size, blk);
+	    (rw==F_READ?"reading":"writing"), size, blk);
 #endif
 	if ((rc = ulseek((int)devdata, blk * DEV_BSIZE, 0)) >= 0)
-		rc = rw==F_READ? uread((int)devdata, buf, size) :
-			uwrite((int)devdata, buf, size);
+		rc = (rw==F_READ) ? uread((int)devdata, buf, size) :
+		    uwrite((int)devdata, buf, size);
 
 	if (rc >= 0) {
 		*rsize = (size_t)rc;
···
 
 	if (strncmp("/dev/", *file, 5) == 0) {
 		/* p = strchr(p + 5, '/') */
-		for (p = *file + 5; *p != '\0' && *p != '/'; p++);
+		for (p = *file + 5; *p != '\0' && *p != '/'; p++)
+			;
 		if (*p == '/')
 			*p = '\0';
 	}
···
 	if (p != NULL)
 		*p = '/';
 
-	return fd<0? -1: 0;
+	return fd < 0 ? -1 : 0;
 }
 
 int
···
 			return 1;
 	} else {
 		char c;
+
 		return uread(0, &c, 1)<1? -1: c;
 	}
 }

sys/lib/libsa/unixdev.h

···
-/*	$OpenBSD: unixdev.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: unixdev.h,v 1.5 2003/06/01 17:00:33 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

sys/lib/libsa/write.c

···
-/*	$OpenBSD: write.c,v 1.3 1996/12/08 15:15:59 niklas Exp $	*/
+/*	$OpenBSD: write.c,v 1.4 2003/06/01 17:00:33 deraadt Exp $	*/
 /*	$NetBSD: write.c,v 1.7 1996/06/21 20:29:30 pk Exp $	*/
 
 /*-
···
  * SUCH DAMAGE.
  *
  *	@(#)write.c	8.1 (Berkeley) 6/11/93
- *  
+ *
  *
  * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University
  * All Rights Reserved.
  *
  * Author: Alessandro Forin
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  [e-mail]
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
···
 	if (f->f_flags & F_RAW) {
 		twiddle();
 		errno = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE,
-			btodb(f->f_offset), bcount, dest, &resid);
+		    btodb(f->f_offset), bcount, dest, &resid);
 		if (errno)
 			return (-1);
 		f->f_offset += resid;

sys/stand/boot/boot.c

···
-/*	$OpenBSD: boot.c,v 1.26 2003/05/19 08:18:25 mickey Exp $	*/
+/*	$OpenBSD: boot.c,v 1.27 2003/06/01 17:00:26 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Dale Rahn
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
···
 #include <sys/stat.h>
 #include <libsa.h>
 #include <lib/libsa/loadfile.h>
+#include <lib/libkern/funcs.h>
 
 #include "cmd.h"
-
 
 static const char *const kernels[] = {
 	"/bsd",
···
 	printf(">> OpenBSD/" MACHINE " BOOT %s\n", version);
 
 	devboot(bootdev, cmd.bootdev);
-	strncpy(cmd.image, bootfile, sizeof(cmd.image));
+	strlcpy(cmd.image, bootfile, sizeof(cmd.image));
 	cmd.boothowto = 0;
 	cmd.conf = "/etc/boot.conf";
 	cmd.addr = (void *)DEFAULT_KERNEL_ADDRESS;
···
 
 	st = read_conf();
 	if (!bootprompt)
-		sprintf(cmd.path, "%s:%s", cmd.bootdev, cmd.image);
+		snprintf(cmd.path, sizeof cmd.path, "%s:%s",
+		    cmd.bootdev, cmd.image);
 
 	while (1) {
 		/* no boot.conf, or no boot cmd in there */
···
 			bootfile = kernels[i=0];
 		} else
 			bootfile = kernels[i];
-		strncpy(cmd.image, bootfile, sizeof(cmd.image));
+		strlcpy(cmd.image, bootfile, sizeof(cmd.image));
 		printf(" failed(%d). will try %s\n", errno, bootfile);
 
 		if (try < 2)

sys/stand/boot/bootarg.c

···
-/*	$OpenBSD: bootarg.c,v 1.7 2002/03/14 03:16:12 millert Exp $	*/
+/*	$OpenBSD: bootarg.c,v 1.8 2003/06/01 17:00:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

sys/stand/boot/bootarg.h

···
-/*	$OpenBSD: bootarg.h,v 1.9 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: bootarg.h,v 1.10 2003/06/01 17:00:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
···
 
 #if defined(_KERNEL) || defined(_STANDALONE)
 extern void *bootargv;
-extern int bootargc;                                                     
+extern int bootargc;
 extern bootarg_t *bootargp;
 #endif
 

sys/stand/boot/cmd.c

···
-/*	$OpenBSD: cmd.c,v 1.48 2002/07/14 09:19:17 mdw Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.49 2003/06/01 17:00:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
···
 #include <sys/param.h>
 #include <libsa.h>
 #include <sys/reboot.h>
+#include <lib/libkern/funcs.h>
 #include "cmd.h"
 
 #define CTRL(c)	((c)&0x1f)
···
 
 		cmd.cmd = NULL;
 
-		do
+		do {
 			eof = read(fd, p, 1);
-		while (eof > 0 && *p++ != '\n');
+		} while (eof > 0 && *p++ != '\n');
 
 		if (eof < 0)
 			printf("%s: %s\n", cmd.path, strerror(errno));
···
 				break;
 
 		if (!cnischar()) {
-			strncpy(buf, "boot", 5);
+			strlcpy(buf, "boot", 5);
 			putchar('\n');
 			return strlen(buf);
 		}
 	} else
-		while (!cnischar()) ;
+		while (!cnischar())
+			;
 
 	while (1) {
 		switch ((ch = getchar())) {
···
 /*
  * Search for spaces/tabs after the current word. If found, \0 the
  * first one.  Then pass a pointer to the first character of the
- * next word, or NULL if there is no next word. 
+ * next word, or NULL if there is no next word.
  */
 char *
 nextword(p)
···
 		}
 
 		/* no strlen in lib !!! */
-		for (p = cmd.path; *p; p++);
+		for (p = cmd.path; *p; p++)
+			;
 		*p++ = '/';
 		*p = '\0';
 
···
 	lsrwx(sb->st_mode     , (sb->st_mode & S_ISTXT? "tT" : "x-"));
 
 	printf (" %u,%u\t%lu\t%s\n", sb->st_uid, sb->st_gid,
-		(u_long)sb->st_size, name);
+	    (u_long)sb->st_size, name);
 }
 #undef lsrwx
 
···
 	} else {
 		if (bootparse(1))
 			return 0;
-		sprintf(cmd.path, "%s:%s", cmd.bootdev, cmd.image);
+		snprintf(cmd.path, sizeof cmd.path, "%s:%s",
+		    cmd.bootdev, cmd.image);
 	}
 
 	return 1;
···
 		if (*p == ':')
 			break;
 	if (*p == ':')
-		strncpy(cmd.path, name, sizeof(cmd.path));
+		strlcpy(cmd.path, name, sizeof(cmd.path));
 	else
-		sprintf(cmd.path, "%s:%s", cmd.bootdev, name);
+		snprintf(cmd.path, sizeof cmd.path, "%s:%s",
+		    cmd.bootdev, name);
 	return cmd.path;
 }
 

sys/stand/boot/cmd.h

···
-/*	$OpenBSD: cmd.h,v 1.11 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.12 2003/06/01 17:00:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
···
  * 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 
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

sys/stand/boot/vars.c

···
-/*	$OpenBSD: vars.c,v 1.7 2002/03/14 01:27:13 millert Exp $	*/
+/*	$OpenBSD: vars.c,v 1.8 2003/06/01 17:00:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998-2000 Michael Shalayeff
···
 #include <sys/param.h>
 #include <libsa.h>
 #include <sys/reboot.h>
+#include <lib/libkern/funcs.h>
 #include "cmd.h"
 
 extern const char version[];
···
 const struct cmd_table cmd_set[] = {
 	{"addr",   CMDT_VAR, Xaddr},
 	{"howto",  CMDT_VAR, Xhowto},
-#ifdef DEBUG	
+#ifdef DEBUG
 	{"debug",  CMDT_VAR, Xdebug},
 #endif
 	{"device", CMDT_VAR, Xdevice},
···
 	if (cmd.argc != 2)
 		printf("%s\n", cmd.bootdev);
 	else
-		strncpy(cmd.bootdev, cmd.argv[1], sizeof(cmd.bootdev));
+		strlcpy(cmd.bootdev, cmd.argv[1], sizeof(cmd.bootdev));
 	return 0;
 }
 
···
 	if (cmd.argc != 2)
 		printf("%s\n", cmd.image);
 	else
-		strncpy(cmd.image, cmd.argv[1], sizeof(cmd.image));
+		strlcpy(cmd.image, cmd.argv[1], sizeof(cmd.image));
 	return 0;
 }
 
···
  * terminated by the usual '\0'
  */
 char *environ;
+
 int
 Xenv()
 {
···
 		int l;
 		for (p = environ; p && *p; p = q) {
 			l = strlen(cmd.argv[1]);
-			for (q = p; *q != '='; q++);
+			for (q = p; *q != '='; q++)
+				;
 			l = max(l, q - p) + 1;
-			for (q = p; *q != '\n'; q++);
+			for (q = p; *q != '\n'; q++)
+				;
 			if (*q)
 				q++;
 			if (!strncmp(p, cmd.argv[1], l)) {
-				while((*p++ = *q++));
+				while((*p++ = *q++))
+					;
 				p--;
 			}
 		}
 		if (!p)
 			p = environ = alloc(4096);
-		sprintf(p, "%s=%s\n",
-			cmd.argv[1], (cmd.argc==3?cmd.argv[2]:""));
+		snprintf(p, environ + 4096 - p, "%s=%s\n",
+		    cmd.argv[1], (cmd.argc==3?cmd.argv[2]:""));
 	}
 
 	return 0;