bzero->memset, bcopy->memcpy, bcmp->memcmp trunk
authorperry <perry@NetBSD.org>
Sun, 09 Aug 1998 20:51:08 +0000
branchtrunk
changeset 41975 b3df5fdc439e
parent 41974 82d7a3268097
child 41976 832fd5b93380
bzero->memset, bcopy->memcpy, bcmp->memcmp
sys/miscfs/fdesc/fdesc_vfsops.c
sys/miscfs/fdesc/fdesc_vnops.c
sys/miscfs/kernfs/kernfs_vfsops.c
sys/miscfs/kernfs/kernfs_vnops.c
sys/miscfs/nullfs/null_vfsops.c
sys/miscfs/portal/portal_vfsops.c
sys/miscfs/portal/portal_vnops.c
sys/miscfs/procfs/procfs.h
sys/miscfs/procfs/procfs_status.c
sys/miscfs/procfs/procfs_subr.c
sys/miscfs/procfs/procfs_vfsops.c
sys/miscfs/procfs/procfs_vnops.c
sys/miscfs/umapfs/umap_vfsops.c
sys/miscfs/union/union_subr.c
sys/miscfs/union/union_vfsops.c
sys/msdosfs/denode.h
sys/msdosfs/msdosfs_denode.c
sys/msdosfs/msdosfs_fat.c
sys/msdosfs/msdosfs_lookup.c
sys/msdosfs/msdosfs_vfsops.c
sys/msdosfs/msdosfs_vnops.c
sys/nfs/krpc_subr.c
sys/nfs/nfs.h
sys/nfs/nfs_bio.c
sys/nfs/nfs_boot.c
sys/nfs/nfs_bootdhcp.c
sys/nfs/nfs_bootparam.c
sys/nfs/nfs_node.c
sys/nfs/nfs_nqlease.c
sys/nfs/nfs_serv.c
sys/nfs/nfs_socket.c
sys/nfs/nfs_srvcache.c
sys/nfs/nfs_subs.c
sys/nfs/nfs_syscalls.c
sys/nfs/nfs_vfsops.c
sys/nfs/nfs_vnops.c
sys/nfs/nfsm_subs.h
sys/sys/buf.h
sys/sys/types.h
--- a/sys/miscfs/fdesc/fdesc_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdesc_vfsops.c,v 1.25 1998/07/05 08:49:45 jonathan Exp $	*/
+/*	$NetBSD: fdesc_vfsops.c,v 1.26 1998/08/09 20:51:08 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -113,9 +113,9 @@
 	vfs_getnewfsid(mp, MOUNT_FDESC);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-	bzero(mp->mnt_stat.f_mntfromname, MNAMELEN);
-	bcopy("fdesc", mp->mnt_stat.f_mntfromname, sizeof("fdesc"));
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN);
+	memcpy(mp->mnt_stat.f_mntfromname, "fdesc", sizeof("fdesc"));
 	return (0);
 }
 
@@ -243,9 +243,9 @@
 	sbp->f_type = 0;
 #endif
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/miscfs/fdesc/fdesc_vnops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/fdesc/fdesc_vnops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdesc_vnops.c,v 1.45 1998/08/03 14:19:59 kleink Exp $	*/
+/*	$NetBSD: fdesc_vnops.c,v 1.46 1998/08/09 20:51:08 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -292,7 +292,7 @@
 		goto bad;
 
 	case Froot:
-		if (cnp->cn_namelen == 2 && bcmp(pname, "fd", 2) == 0) {
+		if (cnp->cn_namelen == 2 && memcmp(pname, "fd", 2) == 0) {
 			error = fdesc_allocvp(Fdevfd, FD_DEVFD, dvp->v_mount, &fvp);
 			if (error)
 				goto bad;
@@ -302,7 +302,7 @@
 			return (0);
 		}
 
-		if (cnp->cn_namelen == 3 && bcmp(pname, "tty", 3) == 0) {
+		if (cnp->cn_namelen == 3 && memcmp(pname, "tty", 3) == 0) {
 			struct vnode *ttyvp = cttyvp(p);
 			if (ttyvp == NULL) {
 				error = ENXIO;
@@ -320,17 +320,17 @@
 		ln = 0;
 		switch (cnp->cn_namelen) {
 		case 5:
-			if (bcmp(pname, "stdin", 5) == 0) {
+			if (memcmp(pname, "stdin", 5) == 0) {
 				ln = "fd/0";
 				fd = FD_STDIN;
 			}
 			break;
 		case 6:
-			if (bcmp(pname, "stdout", 6) == 0) {
+			if (memcmp(pname, "stdout", 6) == 0) {
 				ln = "fd/1";
 				fd = FD_STDOUT;
 			} else
-			if (bcmp(pname, "stderr", 6) == 0) {
+			if (memcmp(pname, "stderr", 6) == 0) {
 				ln = "fd/2";
 				fd = FD_STDERR;
 			}
@@ -354,7 +354,7 @@
 		/* FALL THROUGH */
 
 	case Fdevfd:
-		if (cnp->cn_namelen == 2 && bcmp(pname, "..", 2) == 0) {
+		if (cnp->cn_namelen == 2 && memcmp(pname, "..", 2) == 0) {
 			error = fdesc_root(dvp->v_mount, vpp);
 			if (error)
 				goto bad;
@@ -681,7 +681,7 @@
 
 	error = 0;
 	i = uio->uio_offset;
-	bzero((caddr_t)&d, UIO_MX);
+	memset((caddr_t)&d, 0, UIO_MX);
 	d.d_reclen = UIO_MX;
 	if (ap->a_ncookies)
 		ncookies = (uio->uio_resid / UIO_MX);
@@ -717,7 +717,7 @@
 
 			d.d_fileno = ft->ft_fileno;
 			d.d_namlen = ft->ft_namlen;
-			bcopy(ft->ft_name, d.d_name, ft->ft_namlen + 1);
+			memcpy(d.d_name, ft->ft_name, ft->ft_namlen + 1);
 			d.d_type = ft->ft_type;
 
 			if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
@@ -739,7 +739,7 @@
 			case 1:
 				d.d_fileno = FD_ROOT;		/* XXX */
 				d.d_namlen = i + 1;
-				bcopy("..", d.d_name, d.d_namlen);
+				memcpy(d.d_name, "..", d.d_namlen);
 				d.d_name[i + 1] = '\0';
 				d.d_type = DT_DIR;
 				break;
--- a/sys/miscfs/kernfs/kernfs_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernfs_vfsops.c,v 1.33 1998/07/05 08:49:45 jonathan Exp $	*/
+/*	$NetBSD: kernfs_vfsops.c,v 1.34 1998/08/09 20:51:08 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -150,9 +150,9 @@
 	vfs_getnewfsid(mp, MOUNT_KERNFS);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-	bzero(mp->mnt_stat.f_mntfromname, MNAMELEN);
-	bcopy("kernfs", mp->mnt_stat.f_mntfromname, sizeof("kernfs"));
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN);
+	memcpy(mp->mnt_stat.f_mntfromname, "kernfs", sizeof("kernfs"));
 #ifdef KERNFS_DIAGNOSTIC
 	printf("kernfs_mount: at %s\n", mp->mnt_stat.f_mntonname);
 #endif
@@ -274,9 +274,9 @@
 	sbp->f_type = 0;
 #endif
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/miscfs/kernfs/kernfs_vnops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/kernfs/kernfs_vnops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernfs_vnops.c,v 1.59 1998/08/03 14:19:59 kleink Exp $	*/
+/*	$NetBSD: kernfs_vnops.c,v 1.60 1998/08/09 20:51:08 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -270,7 +270,7 @@
 		if (xlen >= (len-2))
 			return (EINVAL);
 
-		bcopy(cp, *bufp, xlen);
+		memcpy(*bufp, cp, xlen);
 		(*bufp)[xlen] = '\n';
 		(*bufp)[xlen+1] = '\0';
 		break;
@@ -305,7 +305,7 @@
 	case KTT_HOSTNAME:
 		if (buf[len-1] == '\n')
 			--len;
-		bcopy(buf, hostname, len);
+		memcpy(hostname, buf, len);
 		hostname[len] = '\0';
 		hostnamelen = len;
 		return (0);
@@ -357,7 +357,7 @@
 	}
 
 #if 0
-	if (cnp->cn_namelen == 4 && bcmp(pname, "root", 4) == 0) {
+	if (cnp->cn_namelen == 4 && memcmp(pname, "root", 4) == 0) {
 		*vpp = rootdir;
 		VREF(rootdir);
 		vn_lock(rootdir, LK_SHARED | LK_RETRY);
@@ -367,7 +367,7 @@
 
 	for (kt = kern_targets, i = 0; i < nkern_targets; kt++, i++) {
 		if (cnp->cn_namelen == kt->kt_namlen &&
-		    bcmp(kt->kt_name, pname, cnp->cn_namelen) == 0)
+		    memcmp(kt->kt_name, pname, cnp->cn_namelen) == 0)
 			goto found;
 	}
 
@@ -454,7 +454,7 @@
 	int error = 0;
 	char strbuf[KSTRING], *buf;
 
-	bzero((caddr_t) vap, sizeof(*vap));
+	memset((caddr_t) vap, 0, sizeof(*vap));
 	vattr_null(vap);
 	vap->va_uid = 0;
 	vap->va_gid = 0;
@@ -622,7 +622,7 @@
 
 	error = 0;
 	i = uio->uio_offset;
-	bzero((caddr_t)&d, UIO_MX);
+	memset((caddr_t)&d, 0, UIO_MX);
 	d.d_reclen = UIO_MX;
 
 	if (ap->a_ncookies) {
@@ -649,7 +649,7 @@
 
 		d.d_fileno = i + 3;
 		d.d_namlen = kt->kt_namlen;
-		bcopy(kt->kt_name, d.d_name, kt->kt_namlen + 1);
+		memcpy(d.d_name, kt->kt_name, kt->kt_namlen + 1);
 		d.d_type = kt->kt_type;
 
 		if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
--- a/sys/miscfs/nullfs/null_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/nullfs/null_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: null_vfsops.c,v 1.19 1998/03/01 02:21:43 fvdl Exp $	*/
+/*	$NetBSD: null_vfsops.c,v 1.20 1998/08/09 20:51:09 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -163,10 +163,10 @@
 	vfs_getnewfsid(mp, MOUNT_NULL);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
 	(void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
 	    &size);
-	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname + size, 0, MNAMELEN - size);
 #ifdef NULLFS_DIAGNOSTIC
 	printf("nullfs_mount: lower %s, alias at %s\n",
 	    mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname);
@@ -294,7 +294,7 @@
 	    NULLVPTOLOWERVP(MOUNTTONULLMOUNT(mp)->nullm_rootvp));
 #endif
 
-	bzero(&mstat, sizeof(mstat));
+	memset(&mstat, 0, sizeof(mstat));
 
 	error = VFS_STATFS(MOUNTTONULLMOUNT(mp)->nullm_vfs, &mstat, p);
 	if (error)
@@ -311,9 +311,9 @@
 	sbp->f_files = mstat.f_files;
 	sbp->f_ffree = mstat.f_ffree;
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/miscfs/portal/portal_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/portal/portal_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: portal_vfsops.c,v 1.19 1998/07/18 05:04:38 lukem Exp $	*/
+/*	$NetBSD: portal_vfsops.c,v 1.20 1998/08/09 20:51:09 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -144,10 +144,10 @@
 	vfs_getnewfsid(mp, MOUNT_PORTAL);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
 	(void) copyinstr(args.pa_config, mp->mnt_stat.f_mntfromname,
 	    MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname + size, 0, MNAMELEN - size);
 	return (0);
 }
 
@@ -264,9 +264,9 @@
 	sbp->f_type = 0;
 #endif
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/miscfs/portal/portal_vnops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/portal/portal_vnops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: portal_vnops.c,v 1.30 1998/08/03 14:20:00 kleink Exp $	*/
+/*	$NetBSD: portal_vnops.c,v 1.31 1998/08/09 20:51:09 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -238,7 +238,7 @@
 
 	pt->pt_arg = malloc(size+1, M_TEMP, M_WAITOK);
 	pt->pt_size = size+1;
-	bcopy(pname, pt->pt_arg, pt->pt_size);
+	memcpy(pt->pt_arg, pname, pt->pt_size);
 	pt->pt_fileid = portal_fileid++;
 
 	*vpp = fvp;
@@ -276,7 +276,7 @@
 	if (unp2->unp_addr) {
 		unp3->unp_addr = malloc(unp2->unp_addrlen,
 		    M_SONAME, M_WAITOK);
-		bcopy(unp2->unp_addr, unp3->unp_addr,
+		memcpy(unp3->unp_addr, unp2->unp_addr,
 		    unp2->unp_addrlen);
 		unp3->unp_addrlen = unp2->unp_addrlen;
 	}
@@ -397,7 +397,7 @@
 	pcred.pcr_uid = ap->a_cred->cr_uid;
 	pcred.pcr_gid = ap->a_cred->cr_gid;
 	pcred.pcr_ngroups = ap->a_cred->cr_ngroups;
-	bcopy(ap->a_cred->cr_groups, pcred.pcr_groups, NGROUPS * sizeof(gid_t));
+	memcpy(pcred.pcr_groups, ap->a_cred->cr_groups, NGROUPS * sizeof(gid_t));
 	aiov[0].iov_base = (caddr_t) &pcred;
 	aiov[0].iov_len = sizeof(pcred);
 	aiov[1].iov_base = pt->pt_arg;
@@ -536,7 +536,7 @@
 	struct vattr *vap = ap->a_vap;
 	struct timeval tv;
 
-	bzero(vap, sizeof(*vap));
+	memset(vap, 0, sizeof(*vap));
 	vattr_null(vap);
 	vap->va_uid = 0;
 	vap->va_gid = 0;
--- a/sys/miscfs/procfs/procfs.h	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/procfs/procfs.h	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs.h,v 1.21 1998/03/01 02:21:16 fvdl Exp $	*/
+/*	$NetBSD: procfs.h,v 1.22 1998/08/09 20:51:09 perry Exp $	*/
 
 /*
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -78,7 +78,7 @@
 #ifdef _KERNEL
 #define CNEQ(cnp, s, len) \
 	 ((cnp)->cn_namelen == (len) && \
-	  (bcmp((s), (cnp)->cn_nameptr, (len)) == 0))
+	  (memcmp((s), (cnp)->cn_nameptr, (len)) == 0))
 
 #define UIO_MX 32
 
--- a/sys/miscfs/procfs/procfs_status.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/procfs/procfs_status.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_status.c,v 1.14 1998/02/14 00:37:35 thorpej Exp $	*/
+/*	$NetBSD: procfs_status.c,v 1.15 1998/08/09 20:51:10 perry Exp $	*/
 
 /*
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -81,7 +81,7 @@
 /* comm pid ppid pgid sid maj,min ctty,sldr start ut st wmsg uid gid groups ... */
 
 	ps = psbuf;
-	bcopy(p->p_comm, ps, MAXCOMLEN);
+	memcpy(ps, p->p_comm, MAXCOMLEN);
 	ps[MAXCOMLEN] = '\0';
 	ps += strlen(ps);
 	ps += sprintf(ps, " %d %d %d %d ", pid, ppid, pgid, sid);
--- a/sys/miscfs/procfs/procfs_subr.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/procfs/procfs_subr.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_subr.c,v 1.23 1998/03/01 02:21:16 fvdl Exp $	*/
+/*	$NetBSD: procfs_subr.c,v 1.24 1998/08/09 20:51:10 perry Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou.  All rights reserved.
@@ -320,7 +320,7 @@
 {
 
 	for (; nm->nm_name; nm++)
-		if (bcmp(buf, nm->nm_name, buflen+1) == 0)
+		if (memcmp(buf, nm->nm_name, buflen+1) == 0)
 			return (nm);
 
 	return (0);
--- a/sys/miscfs/procfs/procfs_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/procfs/procfs_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_vfsops.c,v 1.29 1998/07/05 08:49:46 jonathan Exp $	*/
+/*	$NetBSD: procfs_vfsops.c,v 1.30 1998/08/09 20:51:10 perry Exp $	*/
 
 /*
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -104,9 +104,9 @@
 	vfs_getnewfsid(mp, MOUNT_PROCFS);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-	bzero(mp->mnt_stat.f_mntfromname, MNAMELEN);
-	bcopy("procfs", mp->mnt_stat.f_mntfromname, sizeof("procfs"));
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN);
+	memcpy(mp->mnt_stat.f_mntfromname, "procfs", sizeof("procfs"));
 	return (0);
 }
 
@@ -174,9 +174,9 @@
 	sbp->f_type = 0;
 #endif
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/miscfs/procfs/procfs_vnops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/procfs/procfs_vnops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_vnops.c,v 1.55 1998/08/03 14:20:00 kleink Exp $	*/
+/*	$NetBSD: procfs_vnops.c,v 1.56 1998/08/09 20:51:10 perry Exp $	*/
 
 /*
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -730,7 +730,7 @@
 
 		for (pt = proc_targets, i = 0; i < nproc_targets; pt++, i++) {
 			if (cnp->cn_namelen == pt->pt_namlen &&
-			    bcmp(pt->pt_name, pname, cnp->cn_namelen) == 0 &&
+			    memcmp(pt->pt_name, pname, cnp->cn_namelen) == 0 &&
 			    (pt->pt_valid == NULL || (*pt->pt_valid)(p)))
 				goto found;
 		}
@@ -805,7 +805,7 @@
 
 	error = 0;
 	i = uio->uio_offset;
-	bzero((caddr_t)&d, UIO_MX);
+	memset((caddr_t)&d, 0, UIO_MX);
 	d.d_reclen = UIO_MX;
 	ncookies = uio->uio_resid / UIO_MX;
 
@@ -837,7 +837,7 @@
 			
 			d.d_fileno = PROCFS_FILENO(pfs->pfs_pid, pt->pt_pfstype);
 			d.d_namlen = pt->pt_namlen;
-			bcopy(pt->pt_name, d.d_name, pt->pt_namlen + 1);
+			memcpy(d.d_name, pt->pt_name, pt->pt_namlen + 1);
 			d.d_type = pt->pt_type;
 
 			if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
@@ -885,7 +885,7 @@
 			case 1:		/* `..' */
 				d.d_fileno = PROCFS_FILENO(0, Proot);
 				d.d_namlen = i + 1;
-				bcopy("..", d.d_name, d.d_namlen);
+				memcpy(d.d_name, "..", d.d_namlen);
 				d.d_name[i + 1] = '\0';
 				d.d_type = DT_DIR;
 				break;
@@ -893,7 +893,7 @@
 			case 2:
 				d.d_fileno = PROCFS_FILENO(0, Pcurproc);
 				d.d_namlen = 7;
-				bcopy("curproc", d.d_name, 8);
+				memcpy(d.d_name, "curproc", 8);
 				d.d_type = DT_LNK;
 				break;
 
--- a/sys/miscfs/umapfs/umap_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/umapfs/umap_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: umap_vfsops.c,v 1.18 1998/03/01 02:21:51 fvdl Exp $	*/
+/*	$NetBSD: umap_vfsops.c,v 1.19 1998/08/09 20:51:10 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -205,10 +205,10 @@
 	vfs_getnewfsid(mp, MOUNT_UMAP);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
 	(void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
 	    &size);
-	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname + size, 0, MNAMELEN - size);
 #ifdef UMAPFS_DIAGNOSTIC
 	printf("umapfs_mount: lower %s, alias at %s\n",
 		mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname);
@@ -336,7 +336,7 @@
 	    UMAPVPTOLOWERVP(MOUNTTOUMAPMOUNT(mp)->umapm_rootvp));
 #endif
 
-	bzero(&mstat, sizeof(mstat));
+	memset(&mstat, 0, sizeof(mstat));
 
 	error = VFS_STATFS(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, &mstat, p);
 	if (error)
@@ -353,9 +353,9 @@
 	sbp->f_files = mstat.f_files;
 	sbp->f_ffree = mstat.f_ffree;
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/miscfs/union/union_subr.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/union/union_subr.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_subr.c,v 1.26 1998/03/01 02:21:56 fvdl Exp $	*/
+/*	$NetBSD: union_subr.c,v 1.27 1998/08/09 20:51:11 perry Exp $	*/
 
 /*
  * Copyright (c) 1994 Jan-Simon Pendry
@@ -91,7 +91,7 @@
 
 	for (i = 0; i < NHASH; i++)
 		LIST_INIT(&unhead[i]);
-	bzero((caddr_t) unvplock, sizeof(unvplock));
+	memset((caddr_t) unvplock, 0, sizeof(unvplock));
 }
 
 static int
@@ -449,7 +449,7 @@
 				un->un_hash = cnp->cn_hash;
 				un->un_path = malloc(cnp->cn_namelen+1,
 						M_TEMP, M_WAITOK);
-				bcopy(cnp->cn_nameptr, un->un_path,
+				memcpy(un->un_path, cnp->cn_nameptr,
 						cnp->cn_namelen);
 				un->un_path[cnp->cn_namelen] = '\0';
 				VREF(dvp);
@@ -518,7 +518,7 @@
 	if (cnp && (lowervp != NULLVP)) {
 		un->un_hash = cnp->cn_hash;
 		un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, M_WAITOK);
-		bcopy(cnp->cn_nameptr, un->un_path, cnp->cn_namelen);
+		memcpy(un->un_path, cnp->cn_nameptr, cnp->cn_namelen);
 		un->un_path[cnp->cn_namelen] = '\0';
 		VREF(dvp);
 		un->un_dirvp = dvp;
@@ -739,7 +739,7 @@
 	 */
 	cn->cn_namelen = pathlen;
 	cn->cn_pnbuf = malloc(cn->cn_namelen+1, M_NAMEI, M_WAITOK);
-	bcopy(path, cn->cn_pnbuf, cn->cn_namelen);
+	memcpy(cn->cn_pnbuf, path, cn->cn_namelen);
 	cn->cn_pnbuf[cn->cn_namelen] = '\0';
 
 	cn->cn_nameiop = CREATE;
@@ -904,7 +904,7 @@
 	 */
 	cn.cn_namelen = strlen(un->un_path);
 	cn.cn_pnbuf = (caddr_t) malloc(cn.cn_namelen+1, M_NAMEI, M_WAITOK);
-	bcopy(un->un_path, cn.cn_pnbuf, cn.cn_namelen+1);
+	memcpy(cn.cn_pnbuf, un->un_path, cn.cn_namelen+1);
 	cn.cn_nameiop = CREATE;
 	cn.cn_flags = (LOCKPARENT|HASBUF|SAVENAME|SAVESTART|ISLASTCN);
 	cn.cn_proc = p;
--- a/sys/miscfs/union/union_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/miscfs/union/union_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_vfsops.c,v 1.19 1998/03/01 02:21:56 fvdl Exp $	*/
+/*	$NetBSD: union_vfsops.c,v 1.20 1998/08/09 20:51:11 perry Exp $	*/
 
 /*
  * Copyright (c) 1994 The Regents of the University of California.
@@ -218,7 +218,7 @@
 	vfs_getnewfsid(mp, MOUNT_UNION);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
 
 	switch (um->um_op) {
 	case UNMNT_ABOVE:
@@ -238,13 +238,13 @@
 		break;
 	}
 	len = strlen(cp);
-	bcopy(cp, mp->mnt_stat.f_mntfromname, len);
+	memcpy(mp->mnt_stat.f_mntfromname, cp, len);
 
 	cp = mp->mnt_stat.f_mntfromname + len;
 	len = MNAMELEN - len;
 
 	(void) copyinstr(args.target, cp, len - 1, &size);
-	bzero(cp + size, len - size);
+	memset(cp + size, 0, len - size);
 
 #ifdef UNION_DIAGNOSTIC
 	printf("union_mount: from %s, on %s\n",
@@ -437,7 +437,7 @@
 	    um->um_lowervp, um->um_uppervp);
 #endif
 
-	bzero(&mstat, sizeof(mstat));
+	memset(&mstat, 0, sizeof(mstat));
 
 	if (um->um_lowervp) {
 		error = VFS_STATFS(um->um_lowervp->v_mount, &mstat, p);
@@ -475,9 +475,9 @@
 	sbp->f_ffree = mstat.f_ffree;
 
 	if (sbp != &mp->mnt_stat) {
-		bcopy(&mp->mnt_stat.f_fsid, &sbp->f_fsid, sizeof(sbp->f_fsid));
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(&sbp->f_fsid, &mp->mnt_stat.f_fsid, sizeof(sbp->f_fsid));
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/msdosfs/denode.h	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/msdosfs/denode.h	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: denode.h,v 1.27 1998/06/25 22:21:54 thorpej Exp $	*/
+/*	$NetBSD: denode.h,v 1.28 1998/08/09 20:52:20 perry Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -184,7 +184,7 @@
 #define DE_INTERNALIZE32(dep, dp)			\
 	 ((dep)->de_StartCluster |= getushort((dp)->deHighClust) << 16)
 #define DE_INTERNALIZE(dep, dp)				\
-	(bcopy((dp)->deName, (dep)->de_Name, 11),	\
+	(memcpy((dep)->de_Name, (dp)->deName, 11),	\
 	 (dep)->de_Attributes = (dp)->deAttributes,	\
 	 (dep)->de_CHun = (dp)->deCHundredth,		\
 	 (dep)->de_CTime = getushort((dp)->deCTime),	\
@@ -199,7 +199,7 @@
 #define DE_EXTERNALIZE32(dp, dep)			\
 	 putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16)
 #define DE_EXTERNALIZE(dp, dep)				\
-	(bcopy((dep)->de_Name, (dp)->deName, 11),	\
+	(memcpy((dp)->deName, (dep)->de_Name, 11),	\
 	 (dp)->deAttributes = (dep)->de_Attributes,	\
 	 (dp)->deCHundredth = (dep)->de_CHun,		\
 	 putushort((dp)->deCTime, (dep)->de_CTime),	\
--- a/sys/msdosfs/msdosfs_denode.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/msdosfs/msdosfs_denode.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_denode.c,v 1.32 1998/05/20 01:45:15 thorpej Exp $	*/
+/*	$NetBSD: msdosfs_denode.c,v 1.33 1998/08/09 20:52:20 perry Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -224,7 +224,7 @@
 		return (error);
 	}
 	MALLOC(ldep, struct denode *, sizeof(struct denode), M_MSDOSFSNODE, M_WAITOK);
-	bzero((caddr_t)ldep, sizeof *ldep);
+	memset((caddr_t)ldep, 0, sizeof *ldep);
 	nvp->v_data = ldep;
 	ldep->de_vnode = nvp;
 	ldep->de_flag = 0;
@@ -436,7 +436,7 @@
 		/*
 		 * is this the right place for it?
 		 */
-		bzero(bp->b_data + boff, pmp->pm_bpcluster - boff);
+		memset(bp->b_data + boff, 0, pmp->pm_bpcluster - boff);
 		if (flags & IO_SYNC)
 			bwrite(bp);
 		else
--- a/sys/msdosfs/msdosfs_fat.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/msdosfs/msdosfs_fat.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_fat.c,v 1.29 1998/05/02 01:47:12 thorpej Exp $	*/
+/*	$NetBSD: msdosfs_fat.c,v 1.30 1998/08/09 20:52:20 perry Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -393,7 +393,7 @@
 			fatbn += pmp->pm_FATsecs;
 			/* getblk() never fails */
 			bpn = getblk(pmp->pm_devvp, fatbn, bp->b_bcount, 0, 0);
-			bcopy(bp->b_data, bpn->b_data, bp->b_bcount);
+			memcpy(bpn->b_data, bp->b_data, bp->b_bcount);
 			if (pmp->pm_flags & MSDOSFSMNT_WAITONFAT)
 				bwrite(bpn);
 			else
--- a/sys/msdosfs/msdosfs_lookup.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/msdosfs/msdosfs_lookup.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_lookup.c,v 1.38 1998/03/01 02:25:11 fvdl Exp $	*/
+/*	$NetBSD: msdosfs_lookup.c,v 1.39 1998/08/09 20:52:20 perry Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -333,7 +333,7 @@
 				 * Check for a checksum or name match
 				 */
 				if (chksum != winChksum(dep->deName)
-				    && (!olddos || bcmp(dosfilename, dep->deName, 11))) {
+				    && (!olddos || memcmp(dosfilename, dep->deName, 11))) {
 					chksum = -1;
 					continue;
 				}
@@ -777,8 +777,8 @@
 				 * Any names other than "." and ".." in a
 				 * directory mean it is not empty.
 				 */
-				if (bcmp(dentp->deName, ".          ", 11) &&
-				    bcmp(dentp->deName, "..         ", 11)) {
+				if (memcmp(dentp->deName, ".          ", 11) &&
+				    memcmp(dentp->deName, "..         ", 11)) {
 					brelse(bp);
 #ifdef MSDOSFS_DEBUG
 					printf("dosdirempty(): entry found %02x, %02x\n",
@@ -851,7 +851,7 @@
 
 		ep = (struct direntry *) bp->b_data + 1;
 		if ((ep->deAttributes & ATTR_DIRECTORY) == 0 ||
-		    bcmp(ep->deName, "..         ", 11) != 0) {
+		    memcmp(ep->deName, "..         ", 11) != 0) {
 			error = ENOTDIR;
 			break;
 		}
@@ -1066,7 +1066,7 @@
 				 */
 				if (dentp->deAttributes & ATTR_VOLUME)
 					continue;
-				if (!bcmp(dentp->deName, cp, 11)) {
+				if (!memcmp(dentp->deName, cp, 11)) {
 					error = EEXIST;
 					break;
 				}
--- a/sys/msdosfs/msdosfs_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/msdosfs/msdosfs_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vfsops.c,v 1.57 1998/07/05 08:49:47 jonathan Exp $	*/
+/*	$NetBSD: msdosfs_vfsops.c,v 1.58 1998/08/09 20:52:21 perry Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -342,10 +342,10 @@
 	}
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
-	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size);
 	(void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
 	    &size);
-	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
+	memset(mp->mnt_stat.f_mntfromname + size, 0, MNAMELEN - size);
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_mount(): mp %p, pmp %p, inusemap %p\n", mp, pmp, pmp->pm_inusemap);
 #endif
@@ -438,7 +438,7 @@
 	}
 
 	pmp = malloc(sizeof *pmp, M_MSDOSFSMNT, M_WAITOK);
-	bzero((caddr_t)pmp, sizeof *pmp);
+	memset((caddr_t)pmp, 0, sizeof *pmp);
 	pmp->pm_mountp = mp;
 
 	/*
@@ -634,10 +634,10 @@
 		if ((error = bread(devvp, pmp->pm_fsinfo, 1024, NOCRED, &bp)) != 0)
 			goto error_exit;
 		fp = (struct fsinfo *)bp->b_data;
-		if (!bcmp(fp->fsisig1, "RRaA", 4)
-		    && !bcmp(fp->fsisig2, "rrAa", 4)
-		    && !bcmp(fp->fsisig3, "\0\0\125\252", 4)
-		    && !bcmp(fp->fsisig4, "\0\0\125\252", 4))
+		if (!memcmp(fp->fsisig1, "RRaA", 4)
+		    && !memcmp(fp->fsisig2, "rrAa", 4)
+		    && !memcmp(fp->fsisig3, "\0\0\125\252", 4)
+		    && !memcmp(fp->fsisig4, "\0\0\125\252", 4))
 			pmp->pm_nxtfree = getulong(fp->fsinxtfree);
 		else
 			pmp->pm_fsinfo = 0;
@@ -835,8 +835,8 @@
 	sbp->f_files = pmp->pm_RootDirEnts;			/* XXX */
 	sbp->f_ffree = 0;	/* what to put in here? */
 	if (sbp != &mp->mnt_stat) {
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_op->vfs_name, MFSNAMELEN);
 	return (0);
--- a/sys/msdosfs/msdosfs_vnops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/msdosfs/msdosfs_vnops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vnops.c,v 1.73 1998/08/03 14:19:58 kleink Exp $	*/
+/*	$NetBSD: msdosfs_vnops.c,v 1.74 1998/08/09 20:52:21 perry Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -148,7 +148,7 @@
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("msdosfs_create: no name");
 #endif
-	bzero(&ndirent, sizeof(ndirent));
+	memset(&ndirent, 0, sizeof(ndirent));
 	if ((error = uniqdosname(pdep, cnp, ndirent.de_Name)) != 0)
 		goto bad;
 
@@ -1139,13 +1139,13 @@
 		 * we moved a directory, then update its .. entry to point
 		 * to the new parent directory.
 		 */
-		bcopy(ip->de_Name, oldname, 11);
-		bcopy(toname, ip->de_Name, 11);	/* update denode */
+		memcpy(oldname, ip->de_Name, 11);
+		memcpy(ip->de_Name, toname, 11);	/* update denode */
 		dp->de_fndoffset = to_diroffset;
 		dp->de_fndcnt = to_count;
 		error = createde(ip, dp, (struct denode **)0, tcnp);
 		if (error) {
-			bcopy(oldname, ip->de_Name, 11);
+			memcpy(ip->de_Name, oldname, 11);
 			if (newparent)
 				VOP_UNLOCK(fdvp, 0);
 			VOP_UNLOCK(fvp, 0);
@@ -1285,7 +1285,7 @@
 	if (error)
 		goto bad2;
 
-	bzero(&ndirent, sizeof(ndirent));
+	memset(&ndirent, 0, sizeof(ndirent));
 	ndirent.de_pmp = pmp;
 	ndirent.de_flag = DE_ACCESS | DE_CREATE | DE_UPDATE;
 	TIMEVAL_TO_TIMESPEC(&time, &ts);
@@ -1299,8 +1299,8 @@
 	bn = cntobn(pmp, newcluster);
 	/* always succeeds */
 	bp = getblk(pmp->pm_devvp, bn, pmp->pm_bpcluster, 0, 0);
-	bzero(bp->b_data, pmp->pm_bpcluster);
-	bcopy(&dosdirtemplate, bp->b_data, sizeof dosdirtemplate);
+	memset(bp->b_data, 0, pmp->pm_bpcluster);
+	memcpy(bp->b_data, &dosdirtemplate, sizeof dosdirtemplate);
 	denp = (struct direntry *)bp->b_data;
 	putushort(denp[0].deStartCluster, newcluster);
 	putushort(denp[0].deCDate, ndirent.de_CDate);
@@ -1499,7 +1499,7 @@
 	/*
 	 * To be safe, initialize dirbuf
 	 */
-	bzero(dirbuf.d_name, sizeof(dirbuf.d_name));
+	memset(dirbuf.d_name, 0, sizeof(dirbuf.d_name));
 
 	/*
 	 * If the user buffer is smaller than the size of one dos directory
--- a/sys/nfs/krpc_subr.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/krpc_subr.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: krpc_subr.c,v 1.22 1998/03/01 02:24:27 fvdl Exp $	*/
+/*	$NetBSD: krpc_subr.c,v 1.23 1998/08/09 21:19:49 perry Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -278,7 +278,7 @@
 	 */
 	nam = m_get(M_WAIT, MT_SONAME);
 	sin = mtod(nam, struct sockaddr_in *);
-	bcopy((caddr_t)sa, (caddr_t)sin,
+	memcpy((caddr_t)sin, (caddr_t)sa,
 		  (nam->m_len = sa->sin_len));
 
 	/*
@@ -288,7 +288,7 @@
 	mhead->m_next = *data;
 	call = mtod(mhead, struct rpc_call *);
 	mhead->m_len = sizeof(*call);
-	bzero((caddr_t)call, sizeof(*call));
+	memset((caddr_t)call, 0, sizeof(*call));
 	/* rpc_call part */
 	xid++;
 	call->rp_xid = txdr_unsigned(xid);
@@ -432,7 +432,7 @@
 	xs = mtod(m, struct xdr_string *);
 	m->m_len = mlen;
 	xs->len = txdr_unsigned(len);
-	bcopy(str, xs->data, len);
+	memcpy(xs->data, str, len);
 	return (m);
 }
 
--- a/sys/nfs/nfs.h	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs.h	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs.h,v 1.17 1997/10/19 01:46:15 fvdl Exp $	*/
+/*	$NetBSD: nfs.h,v 1.18 1998/08/09 21:19:49 perry Exp $	*/
 /*
  * Copyright (c) 1989, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
@@ -98,7 +98,7 @@
  */
 #define	NMOD(a)		((a) % nfs_asyncdaemons)
 #define NFS_CMPFH(n, f, s) \
-	((n)->n_fhsize == (s) && !bcmp((caddr_t)(n)->n_fhp, (caddr_t)(f), (s)))
+	((n)->n_fhsize == (s) && !memcmp((caddr_t)(n)->n_fhp,  (caddr_t)(f),  (s)))
 #define NFS_ISV3(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV3)
 #define NFS_SRVMAXDATA(n) \
 		(((n)->nd_flag & ND_NFSV3) ? (((n)->nd_nam2) ? \
@@ -485,11 +485,11 @@
  */
 #define NFSW_CONTIG(o, n) \
 		((o)->nd_eoff >= (n)->nd_off && \
-		 !bcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH))
+		 !memcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH))
 
 #define NFSW_SAMECRED(o, n) \
 	(((o)->nd_flag & ND_KERBAUTH) == ((n)->nd_flag & ND_KERBAUTH) && \
- 	 !bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
+ 	 !memcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
 		sizeof (struct ucred)))
 
 /*
--- a/sys/nfs/nfs_bio.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_bio.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bio.c,v 1.43 1998/06/21 22:18:16 fvdl Exp $	*/
+/*	$NetBSD: nfs_bio.c,v 1.44 1998/08/09 21:19:49 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -1031,7 +1031,7 @@
 				+ diff);
 			if (len > 0) {
 			    len = min(len, uiop->uio_resid);
-			    bzero((char *)bp->b_data + diff, len);
+			    memset((char *)bp->b_data + diff, 0, len);
 			    bp->b_validend = diff + len;
 			} else
 			    bp->b_validend = diff;
--- a/sys/nfs/nfs_boot.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_boot.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.47 1998/06/13 14:13:25 drochner Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.48 1998/08/09 21:19:50 perry Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -322,18 +322,18 @@
 	int error;
 
 	/* Destination: (default) */
-	bzero((caddr_t)&dst, sizeof(dst));
+	memset((caddr_t)&dst, 0, sizeof(dst));
 	dst.sa_len = sizeof(dst);
 	dst.sa_family = AF_INET;
 	/* Gateway: */
-	bzero((caddr_t)&gw, sizeof(gw));
+	memset((caddr_t)&gw, 0, sizeof(gw));
 	sin = (struct sockaddr_in *)&gw;
 	sin->sin_len = sizeof(*sin);
 	sin->sin_family = AF_INET;
 	sin->sin_addr.s_addr = gw_ip->s_addr;
 	/* Mask: (zero length) */
 	/* XXX - Just pass a null pointer? */
-	bzero(&mask, sizeof(mask));
+	memset(&mask, 0, sizeof(mask));
 
 	/* add, dest, gw, mask, flags, 0 */
 	error = rtrequest(RTM_ADD, &dst, &gw, &mask,
@@ -362,7 +362,7 @@
 	args = &ndm->ndm_args;
 
 	/* Initialize mount args. */
-	bzero((caddr_t) args, sizeof(*args));
+	memset((caddr_t) args, 0, sizeof(*args));
 	args->addr     = &ndm->ndm_saddr;
 	args->addrlen  = args->addr->sa_len;
 #ifdef NFS_BOOT_TCP
@@ -521,7 +521,7 @@
 
 	fh = (mntver == 3) ?
 		rdata->fh.v3fh.fh : rdata->fh.v2fh;
-	bcopy(fh, argp->fh, argp->fhsize);
+	memcpy(argp->fh, fh, argp->fhsize);
 
 	goto out;
 
--- a/sys/nfs/nfs_bootdhcp.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_bootdhcp.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootdhcp.c,v 1.7 1998/04/24 18:38:30 drochner Exp $	*/
+/*	$NetBSD: nfs_bootdhcp.c,v 1.8 1998/08/09 21:19:50 perry Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -261,8 +261,8 @@
 	 * Do enough of ifconfig(8) so that the chosen interface
 	 * can talk to the servers.  Use address zero for now.
 	 */
-	bzero(&iareq, sizeof(iareq));
-	bcopy(ifp->if_xname, iareq.ifra_name, IFNAMSIZ);
+	memset(&iareq, 0, sizeof(iareq));
+	memcpy(iareq.ifra_name, ifp->if_xname, IFNAMSIZ);
 	/* Set the I/F address */
 	sin = (struct sockaddr_in *)&iareq.ifra_addr;
 	sin->sin_len = sizeof(*sin);
@@ -394,7 +394,7 @@
 		DPRINT("bad hwa_len");
 		return (-1);
 	}
-	if (bcmp(bootp->bp_chaddr, bpc->haddr, bpc->halen)) {
+	if (memcmp(bootp->bp_chaddr, bpc->haddr, bpc->halen)) {
 		DPRINT("wrong hwaddr");
 		return (-1);
 	}
@@ -428,7 +428,7 @@
 	/*
 	 * Check the vendor data.
 	 */
-	if (bcmp(bootp->bp_vend, vm_rfc1048, 4)) {
+	if (memcmp(bootp->bp_vend, vm_rfc1048, 4)) {
 		printf("nfs_boot: reply missing options");
 		goto warn;
 	}
@@ -453,7 +453,7 @@
 			bpc->dhcp_ok = 1;
 			break;
 		    case TAG_SERVERID:
-			bcopy(p, &bpc->dhcp_serverip.s_addr,
+			memcpy(&bpc->dhcp_serverip.s_addr, p,
 			      sizeof(bpc->dhcp_serverip.s_addr));
 			break;
 #endif
@@ -571,14 +571,14 @@
 	 * Build the BOOTP reqest message.
 	 * Note: xid is host order! (opaque to server)
 	 */
-	bzero((caddr_t)bootp, BOOTP_SIZE_MAX);
+	memset((caddr_t)bootp, 0, BOOTP_SIZE_MAX);
 	bootp->bp_op    = BOOTREQUEST;
 	bootp->bp_htype = hafmt;
 	bootp->bp_hlen  = halen;	/* Hardware address length */
 	bootp->bp_xid = ++xid;
-	bcopy(haddr, bootp->bp_chaddr, halen);
+	memcpy(bootp->bp_chaddr, haddr, halen);
 	/* Fill-in the vendor data. */
-	bcopy(vm_rfc1048, bootp->bp_vend, 4);
+	memcpy(bootp->bp_vend, vm_rfc1048, 4);
 #ifdef NFS_BOOT_DHCP
 	bootp->bp_vend[4] = TAG_DHCP_MSGTYPE;
 	bootp->bp_vend[5] = 1;
@@ -610,14 +610,14 @@
 		bootp->bp_vend[6] = DHCPREQUEST;
 		bootp->bp_vend[7] = TAG_REQ_ADDR;
 		bootp->bp_vend[8] = 4;
-		bcopy(&bpc.replybuf->bp_yiaddr, &bootp->bp_vend[9], 4);
+		memcpy(&bootp->bp_vend[9], &bpc.replybuf->bp_yiaddr, 4);
 		bootp->bp_vend[13] = TAG_SERVERID;
 		bootp->bp_vend[14] = 4;
-		bcopy(&bpc.dhcp_serverip.s_addr, &bootp->bp_vend[15], 4);
+		memcpy(&bootp->bp_vend[15], &bpc.dhcp_serverip.s_addr, 4);
 		bootp->bp_vend[19] = TAG_LEASETIME;
 		bootp->bp_vend[20] = 4;
 		leasetime = htonl(300);
-		bcopy(&leasetime, &bootp->bp_vend[21], 4);
+		memcpy(&bootp->bp_vend[21], &leasetime, 4);
 		bootp->bp_vend[25] = TAG_END;
 
 		bpc.expected_dhcpmsgtype = DHCPACK;
@@ -697,11 +697,11 @@
 #endif
 		switch (tag) {
 		    case TAG_SUBNET_MASK:
-			bcopy(p, &netmask, 4);
+			memcpy(&netmask, p, 4);
 			break;
 		    case TAG_GATEWAY:
 			/* Routers */
-			bcopy(p, &gateway, 4);
+			memcpy(&gateway, p, 4);
 			break;
 		    case TAG_HOST_NAME:
 			if (len >= sizeof(hostname)) {
@@ -733,7 +733,7 @@
 			break;
 		    case TAG_SWAP_SERVER:
 			/* override NFS server address */
-			bcopy(p, &rootserver, 4);
+			memcpy(&rootserver, p, 4);
 			break;
 		    default:
 			break;
@@ -775,12 +775,12 @@
 
 		/* Server IP address. */
 		sin = (struct sockaddr_in *) &ndm->ndm_saddr;
-		bzero((caddr_t)sin, sizeof(*sin));
+		memset((caddr_t)sin, 0, sizeof(*sin));
 		sin->sin_len = sizeof(*sin);
 		sin->sin_family = AF_INET;
 		sin->sin_addr = rootserver;
 		/* Server name. */
-		if (!bcmp(&rootserver, &bootp->bp_siaddr,
+		if (!memcmp(&rootserver, &bootp->bp_siaddr,
 			  sizeof(struct in_addr))) {
 			/* standard root server, we have the name */
 			strncpy(ndm->ndm_host, bootp->bp_sname, BP_SNAME_LEN-1);
--- a/sys/nfs/nfs_bootparam.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_bootparam.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootparam.c,v 1.8 1998/06/13 04:33:40 tv Exp $	*/
+/*	$NetBSD: nfs_bootparam.c,v 1.9 1998/08/09 21:19:50 perry Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -125,8 +125,8 @@
 	int error;
 
 	gw_ndm = 0;
-	bzero(&ireq, sizeof(ireq));
-	bcopy(ifp->if_xname, ireq.ifr_name, IFNAMSIZ);
+	memset(&ireq, 0, sizeof(ireq));
+	memcpy(ireq.ifr_name, ifp->if_xname, IFNAMSIZ);
 
 	/*
 	 * Get a socket to use for various things in here.
@@ -196,7 +196,7 @@
 	 * is used for all subsequent booptaram RPCs.
 	 */
 	sin = &bp_sin;
-	bzero((caddr_t)sin, sizeof(*sin));
+	memset((caddr_t)sin, 0, sizeof(*sin));
 	sin->sin_len = sizeof(*sin);
 	sin->sin_family = AF_INET;
 	sin->sin_addr.s_addr = INADDR_BROADCAST;
@@ -248,7 +248,7 @@
 #endif
 #if 0	/* XXX - not yet */
 	gw_ndm = malloc(sizeof(*gw_ndm), M_NFSMNT, M_WAITOK);
-	bzero((caddr_t)gw_ndm, sizeof(*gw_ndm));
+	memset((caddr_t)gw_ndm, 0, sizeof(*gw_ndm));
 	error = bp_getfile(sin, "gateway", gw_ndm);
 	if (error) {
 		/* Ignore the error.  No gateway supplied. */
@@ -474,7 +474,7 @@
 	 * The strings become "server:pathname"
 	 */
 	sin = (struct sockaddr_in *) &ndm->ndm_saddr;
-	bzero((caddr_t)sin, sizeof(*sin));
+	memset((caddr_t)sin, 0, sizeof(*sin));
 	sin->sin_len = sizeof(*sin);
 	sin->sin_family = AF_INET;
 	sin->sin_addr = inaddr;
@@ -484,7 +484,7 @@
 		goto out;
 	}
 	ndm->ndm_host[sn_len] = ':';
-	bcopy(pathname, ndm->ndm_host + sn_len + 1, path_len + 1);
+	memcpy(ndm->ndm_host + sn_len + 1, pathname, path_len + 1);
 
 	/* success */
 	goto out;
--- a/sys/nfs/nfs_node.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_node.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_node.c,v 1.26 1998/03/01 02:24:27 fvdl Exp $	*/
+/*	$NetBSD: nfs_node.c,v 1.27 1998/08/09 21:19:50 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -119,7 +119,7 @@
 loop:
 	for (np = nhpp->lh_first; np != 0; np = np->n_hash.le_next) {
 		if (mntp != NFSTOV(np)->v_mount || np->n_fhsize != fhsize ||
-		    bcmp((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize))
+		    memcmp((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize))
 			continue;
 		vp = NFSTOV(np);
 		if (vget(vp, LK_EXCLUSIVE))
@@ -137,7 +137,7 @@
 	}
 	vp = nvp;
 	MALLOC(np, struct nfsnode *, sizeof *np, M_NFSNODE, M_WAITOK);
-	bzero((caddr_t)np, sizeof *np);
+	memset((caddr_t)np, 0, sizeof *np);
 	vp->v_data = np;
 	np->n_vnode = vp;
 	/*
@@ -148,11 +148,11 @@
 		MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK);
 	} else
 		np->n_fhp = &np->n_fh;
-	bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize);
+	memcpy((caddr_t)np->n_fhp, (caddr_t)fhp, fhsize);
 	np->n_fhsize = fhsize;
 	MALLOC(np->n_vattr, struct vattr *, sizeof (struct vattr),
 	    M_NFSNODE, M_WAITOK);
-	bzero(np->n_vattr, sizeof (struct vattr));
+	memset(np->n_vattr, 0, sizeof (struct vattr));
 	lockmgr(&nfs_hashlock, LK_RELEASE, 0);
 	*npp = np;
 	return (0);
--- a/sys/nfs/nfs_nqlease.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_nqlease.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nqlease.c,v 1.26 1998/06/25 22:15:28 thorpej Exp $	*/
+/*	$NetBSD: nfs_nqlease.c,v 1.27 1998/08/09 21:19:50 perry Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -200,7 +200,7 @@
 		for (lp = lpp->lh_first; lp != 0; lp = lp->lc_hash.le_next)
 			if (fh.fh_fsid.val[0] == lp->lc_fsid.val[0] &&
 			    fh.fh_fsid.val[1] == lp->lc_fsid.val[1] &&
-			    !bcmp(fh.fh_fid.fid_data, lp->lc_fiddata,
+			    !memcmp(fh.fh_fid.fid_data, lp->lc_fiddata,
 				  fh.fh_fid.fid_len - sizeof (int32_t))) {
 				/* Found it */
 				lp->lc_vp = vp;
@@ -247,7 +247,7 @@
 				*lphp = (struct nqm *)
 					malloc(sizeof (struct nqm),
 						M_NQMHOST, M_WAITOK);
-				bzero((caddr_t)*lphp, sizeof (struct nqm));
+				memset((caddr_t)*lphp, 0, sizeof (struct nqm));
 				lph = (*lphp)->lpm_hosts;
 			}
 			nqsrv_addhost(lph, slp, nam);
@@ -292,13 +292,13 @@
 		} while (nfsstats.srvnqnfs_leases > nqsrv_maxnumlease);
 	}
 	MALLOC(lp, struct nqlease *, sizeof (struct nqlease), M_NQLEASE, M_WAITOK);
-	bzero((caddr_t)lp, sizeof (struct nqlease));
+	memset((caddr_t)lp, 0, sizeof (struct nqlease));
 	if (flags & ND_WRITE)
 		lp->lc_flag |= (LC_WRITE | LC_WRITTEN);
 	nqsrv_addhost(&lp->lc_host, slp, nam);
 	lp->lc_vp = vp;
 	lp->lc_fsid = fh.fh_fsid;
-	bcopy(fh.fh_fid.fid_data, lp->lc_fiddata,
+	memcpy(lp->lc_fiddata, fh.fh_fid.fid_data,
 	    fh.fh_fid.fid_len - sizeof (int32_t));
 	if(!lpp)
 		panic("nfs_nqlease.c: Phoney lpp");
@@ -474,7 +474,7 @@
 			nfsm_reqhead((struct vnode *)0, NQNFSPROC_EVICTED,
 				NFSX_V3FH + NFSX_UNSIGNED);
 			fhp = &nfh.fh_generic;
-			bzero((caddr_t)fhp, sizeof(nfh));
+			memset((caddr_t)fhp, 0, sizeof(nfh));
 			fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
 			VFS_VPTOFH(vp, &fhp->fh_fid);
 			nfsm_srvfhtom(fhp, 1);
@@ -754,7 +754,7 @@
 	    lp = lp->lc_hash.le_next)
 		if (fhp->fh_fsid.val[0] == lp->lc_fsid.val[0] &&
 		    fhp->fh_fsid.val[1] == lp->lc_fsid.val[1] &&
-		    !bcmp(fhp->fh_fid.fid_data, lp->lc_fiddata,
+		    !memcmp(fhp->fh_fid.fid_data, lp->lc_fiddata,
 			  MAXFIDSZ)) {
 			/* Found it */
 			tlp = lp;
--- a/sys/nfs/nfs_serv.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_serv.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_serv.c,v 1.43 1998/06/05 19:53:01 kleink Exp $	*/
+/*	$NetBSD: nfs_serv.c,v 1.44 1998/08/09 21:19:51 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -444,7 +444,7 @@
 	vrele(ndp->ni_startdir);
 	FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
 	vp = ndp->ni_vp;
-	bzero((caddr_t)fhp, sizeof(nfh));
+	memset((caddr_t)fhp, 0, sizeof(nfh));
 	fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
 	error = VFS_VPTOFH(vp, &fhp->fh_fid);
 	if (!error)
@@ -1042,12 +1042,12 @@
 		owp = NULL;
 		wp = wpp->lh_first;
 		while (wp &&
-		    bcmp((caddr_t)&nfsd->nd_fh,(caddr_t)&wp->nd_fh,NFSX_V3FH)) {
+		    memcmp((caddr_t)&nfsd->nd_fh, (caddr_t)&wp->nd_fh, NFSX_V3FH)) {
 		    owp = wp;
 		    wp = wp->nd_hash.le_next;
 		}
 		while (wp && wp->nd_off < nfsd->nd_off &&
-		    !bcmp((caddr_t)&nfsd->nd_fh,(caddr_t)&wp->nd_fh,NFSX_V3FH)) {
+		    !memcmp((caddr_t)&nfsd->nd_fh, (caddr_t)&wp->nd_fh, NFSX_V3FH)) {
 		    owp = wp;
 		    wp = wp->nd_hash.le_next;
 		}
@@ -1356,7 +1356,7 @@
 			break;
 		case NFSV3CREATE_EXCLUSIVE:
 			nfsm_dissect(cp, caddr_t, NFSX_V3CREATEVERF);
-			bcopy(cp, cverf, NFSX_V3CREATEVERF);
+			memcpy(cverf, cp, NFSX_V3CREATEVERF);
 			exclusive_flag = 1;
 			if (nd.ni_vp == NULL)
 				va.va_mode = 0;
@@ -1400,7 +1400,7 @@
 				if (exclusive_flag) {
 					exclusive_flag = 0;
 					VATTR_NULL(&va);
-					bcopy(cverf, (caddr_t)&va.va_atime,
+					memcpy((caddr_t)&va.va_atime, cverf,
 						NFSX_V3CREATEVERF);
 					error = VOP_SETATTR(nd.ni_vp, &va, cred,
 						procp);
@@ -1476,7 +1476,7 @@
 		}
 	}
 	if (!error) {
-		bzero((caddr_t)fhp, sizeof(nfh));
+		memset((caddr_t)fhp, 0, sizeof(nfh));
 		fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
 		error = VFS_VPTOFH(vp, &fhp->fh_fid);
 		if (!error)
@@ -1485,7 +1485,7 @@
 	}
 	if (v3) {
 		if (exclusive_flag && !error &&
-			bcmp(cverf, (caddr_t)&va.va_atime, NFSX_V3CREATEVERF))
+			memcmp(cverf, (caddr_t)&va.va_atime, NFSX_V3CREATEVERF))
 			error = EEXIST;
 		diraft_ret = VOP_GETATTR(dirp, &diraft, cred, procp);
 		vrele(dirp);
@@ -1637,7 +1637,7 @@
 out:
 	vp = nd.ni_vp;
 	if (!error) {
-		bzero((caddr_t)fhp, sizeof(nfh));
+		memset((caddr_t)fhp, 0, sizeof(nfh));
 		fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
 		error = VFS_VPTOFH(vp, &fhp->fh_fid);
 		if (!error)
@@ -1900,7 +1900,7 @@
 	 */
 	if (fvp == tvp && fromnd.ni_dvp == tdvp &&
 	    fromnd.ni_cnd.cn_namelen == tond.ni_cnd.cn_namelen &&
-	    !bcmp(fromnd.ni_cnd.cn_nameptr, tond.ni_cnd.cn_nameptr,
+	    !memcmp(fromnd.ni_cnd.cn_nameptr, tond.ni_cnd.cn_nameptr,
 	      fromnd.ni_cnd.cn_namelen))
 		error = -1;
 out:
@@ -2163,7 +2163,7 @@
 		nd.ni_cnd.cn_cred = cred;
 		error = lookup(&nd);
 		if (!error) {
-			bzero((caddr_t)fhp, sizeof(nfh));
+			memset((caddr_t)fhp, 0, sizeof(nfh));
 			fhp->fh_fsid = nd.ni_vp->v_mount->mnt_stat.f_fsid;
 			error = VFS_VPTOFH(nd.ni_vp, &fhp->fh_fid);
 			if (!error)
@@ -2287,7 +2287,7 @@
 	error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &va);
 	if (!error) {
 		vp = nd.ni_vp;
-		bzero((caddr_t)fhp, sizeof(nfh));
+		memset((caddr_t)fhp, 0, sizeof(nfh));
 		fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
 		error = VFS_VPTOFH(vp, &fhp->fh_fid);
 		if (!error)
@@ -2676,7 +2676,7 @@
 					tsiz = be-bp;
 				else
 					tsiz = xfer;
-				bcopy(cp, bp, tsiz);
+				memcpy(bp, cp, tsiz);
 				bp += tsiz;
 				xfer -= tsiz;
 				if (xfer > 0)
@@ -2917,7 +2917,7 @@
 			 */
 			if (VFS_VGET(vp->v_mount, dp->d_fileno, &nvp))
 				goto invalid;
-			bzero((caddr_t)nfhp, NFSX_V3FH);
+			memset((caddr_t)nfhp, 0, NFSX_V3FH);
 			nfhp->fh_fsid =
 				nvp->v_mount->mnt_stat.f_fsid;
 			if (VFS_VPTOFH(nvp, &nfhp->fh_fid)) {
@@ -2977,7 +2977,7 @@
 					tsiz = be - bp;
 				else
 					tsiz = xfer;
-				bcopy(cp, bp, tsiz);
+				memcpy(bp, cp, tsiz);
 				bp += tsiz;
 				xfer -= tsiz;
 				if (xfer > 0)
@@ -2998,7 +2998,7 @@
 					tsiz = be - bp;
 				else
 					tsiz = xfer;
-				bcopy(cp, bp, tsiz);
+				memcpy(bp, cp, tsiz);
 				bp += tsiz;
 				xfer -= tsiz;
 				if (xfer > 0)
--- a/sys/nfs/nfs_socket.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_socket.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_socket.c,v 1.45 1998/07/20 16:41:05 fvdl Exp $	*/
+/*	$NetBSD: nfs_socket.c,v 1.46 1998/08/09 21:19:51 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -337,7 +337,7 @@
 {
 	struct nfsreq dummyreq;
 
-	bzero(&dummyreq, sizeof(dummyreq));
+	memset(&dummyreq, 0, sizeof(dummyreq));
 	dummyreq.r_nmp = nmp;
 	nfs_rcvlock(&dummyreq);
 	nfs_disconnect(nmp);
@@ -859,7 +859,7 @@
 		verf_str = nickv;
 		verf_len = sizeof (nickv);
 		auth_type = RPCAUTH_KERB4;
-		bzero((caddr_t)key, sizeof (key));
+		memset((caddr_t)key, 0, sizeof (key));
 		if (failed_auth || nfs_getnickauth(nmp, cred, &auth_str,
 			&auth_len, verf_str, verf_len)) {
 			error = nfs_getauth(nmp, rep, cred, &auth_str,
@@ -1598,7 +1598,7 @@
 		}
 		nfsm_adv(nfsm_rndup(len));
 		nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
-		bzero((caddr_t)&nd->nd_cr, sizeof (struct ucred));
+		memset((caddr_t)&nd->nd_cr, 0, sizeof (struct ucred));
 		nd->nd_cr.cr_ref = 1;
 		nd->nd_cr.cr_uid = fxdr_unsigned(uid_t, *tl++);
 		nd->nd_cr.cr_gid = fxdr_unsigned(gid_t, *tl++);
@@ -1658,7 +1658,7 @@
 				return (0);
 			}
 			cp += NFSX_UNSIGNED;
-			bcopy(cp, nfsd->nfsd_verfstr, 3 * NFSX_UNSIGNED);
+			memcpy(nfsd->nfsd_verfstr, cp, 3 * NFSX_UNSIGNED);
 			nfsd->nfsd_verflen = 3 * NFSX_UNSIGNED;
 			nd->nd_flag |= ND_KERBFULL;
 			nfsd->nfsd_flag |= NFSD_NEEDAUTH;
@@ -1935,7 +1935,7 @@
 		}
 		m = slp->ns_raw;
 		if (m->m_len >= NFSX_UNSIGNED) {
-			bcopy(mtod(m, caddr_t), (caddr_t)&recmark, NFSX_UNSIGNED);
+			memcpy((caddr_t)&recmark, mtod(m, caddr_t), NFSX_UNSIGNED);
 			m->m_data += NFSX_UNSIGNED;
 			m->m_len -= NFSX_UNSIGNED;
 		} else {
@@ -1992,7 +1992,7 @@
 						return (EWOULDBLOCK);
 					}
 				}
-				bcopy(mtod(m, caddr_t), mtod(m2, caddr_t),
+				memcpy(mtod(m2, caddr_t), mtod(m, caddr_t),
 				    left);
 				m2->m_len = left;
 				m->m_data += left;
--- a/sys/nfs/nfs_srvcache.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_srvcache.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_srvcache.c,v 1.14 1998/07/05 04:37:44 jonathan Exp $	*/
+/*	$NetBSD: nfs_srvcache.c,v 1.15 1998/08/09 21:19:51 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -229,7 +229,7 @@
 	if (numnfsrvcache < desirednfsrvcache) {
 		rp = (struct nfsrvcache *)malloc((u_long)sizeof *rp,
 		    M_NFSD, M_WAITOK);
-		bzero((char *)rp, sizeof *rp);
+		memset((char *)rp, 0, sizeof *rp);
 		numnfsrvcache++;
 		rp->rc_flag = RC_LOCKED;
 	} else {
--- a/sys/nfs/nfs_subs.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_subs.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_subs.c,v 1.62 1998/07/05 04:37:44 jonathan Exp $	*/
+/*	$NetBSD: nfs_subs.c,v 1.63 1998/08/09 21:19:52 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -708,7 +708,7 @@
 				bpos = mtod(mb, caddr_t);
 			}
 			i = min(siz, M_TRAILINGSPACE(mb));
-			bcopy(auth_str, bpos, i);
+			memcpy(bpos, auth_str, i);
 			mb->m_len += i;
 			auth_str += i;
 			bpos += i;
@@ -741,7 +741,7 @@
 				bpos = mtod(mb, caddr_t);
 			}
 			i = min(siz, M_TRAILINGSPACE(mb));
-			bcopy(verf_str, bpos, i);
+			memcpy(bpos, verf_str, i);
 			mb->m_len += i;
 			verf_str += i;
 			bpos += i;
@@ -808,7 +808,7 @@
 			else
 #endif
 			if (uiop->uio_segflg == UIO_SYSSPACE)
-				bcopy(mbufcp, uiocp, xfer);
+				memcpy(uiocp, mbufcp, xfer);
 			else
 				copyout(mbufcp, uiocp, xfer);
 			left -= xfer;
@@ -892,7 +892,7 @@
 			else
 #endif
 			if (uiop->uio_segflg == UIO_SYSSPACE)
-				bcopy(uiocp, mtod(mp, caddr_t)+mp->m_len, xfer);
+				memcpy(mtod(mp, caddr_t)+mp->m_len, uiocp, xfer);
 			else
 				copyin(uiocp, mtod(mp, caddr_t)+mp->m_len, xfer);
 			mp->m_len += xfer;
@@ -1008,7 +1008,7 @@
 		 * move the data to the front of the mbuf.
 		 */
 		if ((dst = m1->m_dat) != src)
-			ovbcopy(src, dst, left);
+			memmove(dst, src, left);
 		dst += left; 
 		m1->m_len = left;
 		m2 = m1->m_next;
@@ -1023,7 +1023,7 @@
 	 */
 	while ((len = (MLEN - m1->m_len)) != 0 && m2) {
 		if ((len = min(len, m2->m_len)) != 0)
-			bcopy(m2->m_data, dst, len);
+			memcpy(dst, m2->m_data, len);
 		m1->m_len += len;
 		dst += len;
 		m2->m_data += len;
@@ -1087,7 +1087,7 @@
 		left -= NFSX_UNSIGNED;
 		m2->m_len += NFSX_UNSIGNED;
 		if (left > 0) {
-			bcopy(cp, (caddr_t) tl, left);
+			memcpy((caddr_t) tl, cp, left);
 			siz -= left;
 			cp += left;
 			m2->m_len += left;
@@ -1118,7 +1118,7 @@
 		} else {
 			xfer = len = m1->m_len;
 		}
-		bcopy(cp, (caddr_t) tl, xfer);
+		memcpy((caddr_t) tl, cp, xfer);
 		m1->m_len = len+tlen;
 		siz -= xfer;
 		cp += xfer;
@@ -1193,7 +1193,7 @@
 		MALLOC(np->n_dirgens, unsigned *,
 		    NFS_DIRHASHSIZ * sizeof (unsigned), M_NFSDIROFF,
 		    M_WAITOK);
-		bzero((caddr_t)np->n_dirgens,
+		memset((caddr_t)np->n_dirgens, 0,
 		    NFS_DIRHASHSIZ * sizeof (unsigned));
 	}
 }
@@ -1652,7 +1652,7 @@
 	}
 	np->n_attrstamp = time.tv_sec;
 	if (vaper != NULL) {
-		bcopy((caddr_t)vap, (caddr_t)vaper, sizeof(*vap));
+		memcpy((caddr_t)vaper, (caddr_t)vap, sizeof(*vap));
 		if (np->n_flag & NCHG) {
 			if (np->n_flag & NACC)
 				vaper->va_atime = np->n_atim;
@@ -1699,7 +1699,7 @@
 		} else
 			np->n_size = vap->va_size;
 	}
-	bcopy((caddr_t)vap, (caddr_t)vaper, sizeof(struct vattr));
+	memcpy((caddr_t)vaper, (caddr_t)vap, sizeof(struct vattr));
 	if (np->n_flag & NCHG) {
 		if (np->n_flag & NACC)
 			vaper->va_atime = np->n_atim;
@@ -1994,7 +1994,7 @@
 			goto badlink;
 		}
 		if (ndp->ni_pathlen > 1) {
-			bcopy(ndp->ni_next, cp + linklen, ndp->ni_pathlen);
+			memcpy(cp + linklen, ndp->ni_next, ndp->ni_pathlen);
 			FREE(cnp->cn_pnbuf, M_NAMEI);
 			cnp->cn_pnbuf = cp;
 		} else
@@ -2401,7 +2401,7 @@
 }
 
 /*
- * copy credentials making sure that the result can be compared with bcmp().
+ * copy credentials making sure that the result can be compared with memcmp().
  */
 void
 nfsrv_setcred(incred, outcred)
@@ -2409,7 +2409,7 @@
 {
 	register int i;
 
-	bzero((caddr_t)outcred, sizeof (struct ucred));
+	memset((caddr_t)outcred, 0, sizeof (struct ucred));
 	outcred->cr_ref = 1;
 	outcred->cr_uid = incred->cr_uid;
 	outcred->cr_gid = incred->cr_gid;
--- a/sys/nfs/nfs_syscalls.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_syscalls.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_syscalls.c,v 1.31 1998/07/05 04:37:44 jonathan Exp $	*/
+/*	$NetBSD: nfs_syscalls.c,v 1.32 1998/08/09 21:19:52 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -150,7 +150,7 @@
 	if (error)
 		return (error);
 	vp = nd.ni_vp;
-	bzero((caddr_t)&fh, sizeof(fh));
+	memset((caddr_t)&fh, 0, sizeof(fh));
 	fh.fh_fsid = vp->v_mount->mnt_stat.f_fsid;
 	error = VFS_VPTOFH(vp, &fh.fh_fid);
 	vput(vp);
@@ -318,8 +318,8 @@
 				/*
 				 * and save the session key in nu_key.
 				 */
-				bcopy(nsd->nsd_key, nuidp->nu_key,
-				    sizeof (nsd->nsd_key));
+				memcpy(nuidp->nu_key, nsd->nsd_key,
+				    sizeof(nsd->nsd_key));
 				if (nfsd->nfsd_nd->nd_nam2) {
 				    struct sockaddr_in *saddr;
 
@@ -434,7 +434,7 @@
 	else {
 		slp = (struct nfssvc_sock *)
 			malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK);
-		bzero((caddr_t)slp, sizeof (struct nfssvc_sock));
+		memset((caddr_t)slp, 0, sizeof (struct nfssvc_sock));
 		TAILQ_INIT(&slp->ns_uidlruhead);
 		TAILQ_INSERT_TAIL(&nfssvc_sockhead, slp, ns_chain);
 	}
@@ -481,7 +481,7 @@
 	if (nfsd == (struct nfsd *)0) {
 		nsd->nsd_nfsd = nfsd = (struct nfsd *)
 			malloc(sizeof (struct nfsd), M_NFSD, M_WAITOK);
-		bzero((caddr_t)nfsd, sizeof (struct nfsd));
+		memset((caddr_t)nfsd, 0, sizeof (struct nfsd));
 		nfsd->nfsd_procp = p;
 		TAILQ_INSERT_TAIL(&nfsd_head, nfsd, nfsd_chain);
 		nfs_numnfsd++;
@@ -838,13 +838,13 @@
 
 	nfs_udpsock = (struct nfssvc_sock *)
 	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK);
-	bzero((caddr_t)nfs_udpsock, sizeof (struct nfssvc_sock));
+	memset((caddr_t)nfs_udpsock, 0, sizeof (struct nfssvc_sock));
 	TAILQ_INIT(&nfs_udpsock->ns_uidlruhead);
 	TAILQ_INSERT_HEAD(&nfssvc_sockhead, nfs_udpsock, ns_chain);
 
 	nfs_cltpsock = (struct nfssvc_sock *)
 	    malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK);
-	bzero((caddr_t)nfs_cltpsock, sizeof (struct nfssvc_sock));
+	memset((caddr_t)nfs_cltpsock, 0, sizeof (struct nfssvc_sock));
 	TAILQ_INIT(&nfs_cltpsock->ns_uidlruhead);
 	TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_cltpsock, ns_chain);
 }
@@ -1015,7 +1015,7 @@
 	else {
 		*auth_len = nmp->nm_authlen;
 		*verf_len = nmp->nm_verflen;
-		bcopy((caddr_t)nmp->nm_key, (caddr_t)key, sizeof (key));
+		memcpy((caddr_t)key, (caddr_t)nmp->nm_key, sizeof (key));
 	}
 	nmp->nm_iflag &= ~NFSMNT_HASAUTH;
 	nmp->nm_iflag |= NFSMNT_WAITAUTH;
@@ -1153,7 +1153,7 @@
 			nuidp->nu_expire = time.tv_sec + NFS_KERBTTL;
 			nuidp->nu_timestamp = ktvout;
 			nuidp->nu_nickname = nick;
-			bcopy(key, nuidp->nu_key, sizeof (key));
+			memcpy(nuidp->nu_key, key, sizeof (key));
 			TAILQ_INSERT_TAIL(&nmp->nm_uidlruhead, nuidp,
 				nu_lru);
 			LIST_INSERT_HEAD(NMUIDHASH(nmp, cred->cr_uid),
--- a/sys/nfs/nfs_vfsops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_vfsops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vfsops.c,v 1.76 1998/07/05 08:49:48 jonathan Exp $	*/
+/*	$NetBSD: nfs_vfsops.c,v 1.77 1998/08/09 21:19:52 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -194,8 +194,8 @@
 		sbp->f_ffree = 0;
 	}
 	if (sbp != &mp->mnt_stat) {
-		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
-		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
+		memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
+		memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
 	}
 	strncpy(&sbp->f_fstypename[0], mp->mnt_op->vfs_name, MFSNAMELEN);
 	nfsm_reqdone;
@@ -305,7 +305,7 @@
 	 * Side effect:  Finds and configures a network interface.
 	 */
 	nd = malloc(sizeof(*nd), M_NFSMNT, M_WAITOK);
-	bzero((caddr_t)nd, sizeof(*nd));
+	memset((caddr_t)nd, 0, sizeof(*nd));
 	error = nfs_boot_init(nd, procp);
 	if (error)
 		goto out;
@@ -440,7 +440,7 @@
 	m = m_get(M_WAIT, MT_SONAME);
 	if (m == NULL)
 		panic("nfs_mountroot: mget soname for %s", mntname);
-	bcopy((caddr_t)ndmntp->ndm_args.addr, mtod(m, caddr_t),
+	memcpy(mtod(m, caddr_t), (caddr_t)ndmntp->ndm_args.addr,
 	      (m->m_len = ndmntp->ndm_args.addr->sa_len));
 
 	error = mountnfs(&ndmntp->ndm_args, mp, m, mntname,
@@ -592,7 +592,7 @@
  *
  * mount system call
  * It seems a bit dumb to copyinstr() the host and path here and then
- * bcopy() them in mountnfs(), but I wanted to detect errors before
+ * memcpy() them in mountnfs(), but I wanted to detect errors before
  * doing the sockargs() call because sockargs() allocates an mbuf and
  * an error after that means that I have to release the mbuf.
  */
@@ -640,11 +640,11 @@
 	error = copyinstr(path, pth, MNAMELEN-1, &len);
 	if (error)
 		return (error);
-	bzero(&pth[len], MNAMELEN - len);
+	memset(&pth[len], 0, MNAMELEN - len);
 	error = copyinstr(args.hostname, hst, MNAMELEN-1, &len);
 	if (error)
 		return (error);
-	bzero(&hst[len], MNAMELEN - len);
+	memset(&hst[len], 0, MNAMELEN - len);
 	/* sockargs() call must be after above copyin() calls */
 	error = sockargs(&nam, (caddr_t)args.addr, args.addrlen, MT_SONAME);
 	if (error)
@@ -680,7 +680,7 @@
 	} else {
 		MALLOC(nmp, struct nfsmount *, sizeof (struct nfsmount),
 		    M_NFSMNT, M_WAITOK);
-		bzero((caddr_t)nmp, sizeof (struct nfsmount));
+		memset((caddr_t)nmp, 0, sizeof (struct nfsmount));
 		mp->mnt_data = (qaddr_t)nmp;
 		TAILQ_INIT(&nmp->nm_uidlruhead);
 		TAILQ_INIT(&nmp->nm_bufq);
@@ -716,7 +716,7 @@
 	CIRCLEQ_INIT(&nmp->nm_timerhead);
 	nmp->nm_inprog = NULLVP;
 	nmp->nm_fhsize = argp->fhsize;
-	bcopy((caddr_t)argp->fh, (caddr_t)nmp->nm_fh, argp->fhsize);
+	memcpy((caddr_t)nmp->nm_fh, (caddr_t)argp->fh, argp->fhsize);
 #ifdef COMPAT_09
 	mp->mnt_stat.f_type = 2;
 #else
@@ -724,8 +724,8 @@
 #endif
 	strncpy(&mp->mnt_stat.f_fstypename[0], mp->mnt_op->vfs_name,
 	    MFSNAMELEN);
-	bcopy(hst, mp->mnt_stat.f_mntfromname, MNAMELEN);
-	bcopy(pth, mp->mnt_stat.f_mntonname, MNAMELEN);
+	memcpy(mp->mnt_stat.f_mntfromname, hst, MNAMELEN);
+	memcpy(mp->mnt_stat.f_mntonname, pth, MNAMELEN);
 	nmp->nm_nam = nam;
 
 	/* Set up the sockets and per-host congestion */
--- a/sys/nfs/nfs_vnops.c	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfs_vnops.c	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vnops.c,v 1.96 1998/08/08 11:39:20 kleink Exp $	*/
+/*	$NetBSD: nfs_vnops.c,v 1.97 1998/08/09 21:19:52 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -1188,13 +1188,13 @@
 					commit == NFSV3WRITE_UNSTABLE)
 					committed = commit;
 				if ((nmp->nm_iflag & NFSMNT_HASWRITEVERF) == 0){
-				    bcopy((caddr_t)tl, (caddr_t)nmp->nm_verf,
+				    memcpy((caddr_t)nmp->nm_verf, (caddr_t)tl,
 					NFSX_V3WRITEVERF);
 				    nmp->nm_iflag |= NFSMNT_HASWRITEVERF;
-				} else if (bcmp((caddr_t)tl,
+				} else if (memcmp((caddr_t)tl,
 				    (caddr_t)nmp->nm_verf, NFSX_V3WRITEVERF)) {
 				    *must_commit = 1;
-				    bcopy((caddr_t)tl, (caddr_t)nmp->nm_verf,
+				    memcpy((caddr_t)nmp->nm_verf, (caddr_t)tl,
 					NFSX_V3WRITEVERF);
 				}
 			}
@@ -2399,7 +2399,7 @@
 			attrflag = fxdr_unsigned(int, *tl);
 			if (attrflag) {
 			    nfsm_dissect(fp, struct nfs_fattr *, NFSX_V3FATTR);
-			    bcopy(fp, &fattr, NFSX_V3FATTR);
+			    memcpy(&fattr, fp, NFSX_V3FATTR);
 			    nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 			    doit = fxdr_unsigned(int, *tl);
 			    if (doit) {
@@ -2508,7 +2508,7 @@
 
 	/* Fudge together a funny name */
 	pid = cnp->cn_proc->p_pid;
-	bcopy(".nfsAxxxx4.4", sp->s_name, 13);
+	memcpy(sp->s_name, ".nfsAxxxx4.4", 13);
 	sp->s_namlen = 12;
 	sp->s_name[8] = hextoasc[pid & 0xf];
 	sp->s_name[7] = hextoasc[(pid >> 4) & 0xf];
@@ -2581,7 +2581,7 @@
 			np->n_fhp = &np->n_fh;
 		    } else if (np->n_fhsize <= NFS_SMALLFH && fhlen>NFS_SMALLFH)
 			np->n_fhp =(nfsfh_t *)malloc(fhlen,M_NFSBIGFH,M_WAITOK);
-		    bcopy((caddr_t)nfhp, (caddr_t)np->n_fhp, fhlen);
+		    memcpy((caddr_t)np->n_fhp, (caddr_t)nfhp, fhlen);
 		    np->n_fhsize = fhlen;
 		    newvp = NFSTOV(np);
 		} else if (NFS_CMPFH(dnp, nfhp, fhlen)) {
@@ -2648,9 +2648,9 @@
 	nfsm_wcc_data(vp, wccflag);
 	if (!error) {
 		nfsm_dissect(tl, u_int32_t *, NFSX_V3WRITEVERF);
-		if (bcmp((caddr_t)nmp->nm_verf, (caddr_t)tl,
+		if (memcmp((caddr_t)nmp->nm_verf, (caddr_t)tl,
 			NFSX_V3WRITEVERF)) {
-			bcopy((caddr_t)tl, (caddr_t)nmp->nm_verf,
+			memcpy((caddr_t)nmp->nm_verf, (caddr_t)tl,
 				NFSX_V3WRITEVERF);
 			error = NFSERR_STALEWRITEVERF;
 		}
@@ -2665,7 +2665,7 @@
  * - do nfs_strategy() by doing I/O with nfs_readrpc/nfs_writerpc
  *   (Maybe I could use the process's page mapping, but I was concerned that
  *    Kernel Write might not be enabled and also figured copyout() would do
- *    a lot more work than bcopy() and also it currently happens in the
+ *    a lot more work than memcpy() and also it currently happens in the
  *    context of the swapper process (2).
  */
 int
--- a/sys/nfs/nfsm_subs.h	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/nfs/nfsm_subs.h	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsm_subs.h,v 1.17 1997/07/14 20:46:24 fvdl Exp $	*/
+/*	$NetBSD: nfsm_subs.h,v 1.18 1998/08/09 21:19:53 perry Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -114,7 +114,7 @@
 				nfsm_build(tl, u_int32_t *, t2); \
 				*tl++ = txdr_unsigned(VTONFS(v)->n_fhsize); \
 				*(tl + ((t2>>2) - 2)) = 0; \
-				bcopy((caddr_t)VTONFS(v)->n_fhp,(caddr_t)tl, \
+				memcpy((caddr_t)tl,(caddr_t)VTONFS(v)->n_fhp, \
 					VTONFS(v)->n_fhsize); \
 			} else if ((t2 = nfsm_strtmbuf(&mb, &bpos, \
 				(caddr_t)VTONFS(v)->n_fhp, \
@@ -125,24 +125,24 @@
 			} \
 		} else { \
 			nfsm_build(cp, caddr_t, NFSX_V2FH); \
-			bcopy((caddr_t)VTONFS(v)->n_fhp, cp, NFSX_V2FH); \
+			memcpy(cp, (caddr_t)VTONFS(v)->n_fhp, NFSX_V2FH); \
 		} }
 
 #define nfsm_srvfhtom(f, v3) \
 		{ if (v3) { \
 			nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED + NFSX_V3FH); \
 			*tl++ = txdr_unsigned(NFSX_V3FH); \
-			bcopy((caddr_t)(f), (caddr_t)tl, NFSX_V3FH); \
+			memcpy((caddr_t)tl, (caddr_t)(f), NFSX_V3FH); \
 		} else { \
 			nfsm_build(cp, caddr_t, NFSX_V2FH); \
-			bcopy((caddr_t)(f), cp, NFSX_V2FH); \
+			memcpy(cp, (caddr_t)(f), NFSX_V2FH); \
 		} }
 
 #define nfsm_srvpostop_fh(f) \
 		{ nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED + NFSX_V3FH); \
 		*tl++ = nfs_true; \
 		*tl++ = txdr_unsigned(NFSX_V3FH); \
-		bcopy((caddr_t)(f), (caddr_t)tl, NFSX_V3FH); \
+		memcpy((caddr_t)tl, (caddr_t)(f), NFSX_V3FH); \
 		}
 
 #define nfsm_mtofh(d, v, v3, f) \
@@ -309,7 +309,7 @@
 			nfsm_build(tl,u_int32_t *,t2); \
 			*tl++ = txdr_unsigned(s); \
 			*(tl+((t2>>2)-2)) = 0; \
-			bcopy((const char *)(a), (caddr_t)tl, (s)); \
+			memcpy((caddr_t)tl, (const char *)(a), (s)); \
 		} else if ((t2 = nfsm_strtmbuf(&mb, &bpos, (a), (s))) != 0) { \
 			error = t2; \
 			m_freem(mreq); \
@@ -366,7 +366,7 @@
 			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			fhlen = fxdr_unsigned(int, *tl); \
 			if (fhlen == 0) { \
-				bzero((caddr_t)(f), NFSX_V3FH); \
+				memset((caddr_t)(f), 0, NFSX_V3FH); \
 			} else if (fhlen != NFSX_V3FH) { \
 				error = EBADRPC; \
 				nfsm_reply(0); \
@@ -374,7 +374,7 @@
 		} \
 		if (fhlen != 0) { \
 			nfsm_dissect(tl, u_int32_t *, NFSX_V3FH); \
-			bcopy((caddr_t)tl, (caddr_t)(f), NFSX_V3FH); \
+			memcpy( (caddr_t)(f), (caddr_t)tl, NFSX_V3FH); \
 			if ((nfsd->nd_flag & ND_NFSV3) == 0) \
 				nfsm_adv(NFSX_V2FH - NFSX_V3FH); \
 		} \
--- a/sys/sys/buf.h	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/sys/buf.h	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.h,v 1.30 1998/03/01 02:24:11 fvdl Exp $	*/
+/*	$NetBSD: buf.h,v 1.31 1998/08/09 20:58:14 perry Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -147,7 +147,7 @@
  * Zero out the buffer's data area.
  */
 #define	clrbuf(bp) {							\
-	bzero((bp)->b_data, (u_int)(bp)->b_bcount);			\
+	memset((bp)->b_data, 0, (u_int)(bp)->b_bcount);			\
 	(bp)->b_resid = 0;						\
 }
 
--- a/sys/sys/types.h	Sun Aug 09 20:36:58 1998 +0000
+++ b/sys/sys/types.h	Sun Aug 09 20:51:08 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.34 1998/03/01 02:24:15 fvdl Exp $	*/
+/*	$NetBSD: types.h,v 1.35 1998/08/09 20:58:14 perry Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993, 1994
@@ -176,13 +176,8 @@
 #define	FD_SET(n, p)	((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
 #define	FD_CLR(n, p)	((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
 #define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#ifdef _KERNEL
-#define	FD_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
-#define	FD_ZERO(p)	bzero(p, sizeof(*(p)))
-#else
-#define	FD_COPY(f, t)	(void)memcpy(t, f, sizeof(*(f)))
-#define	FD_ZERO(p)	(void)memset(p, 0, sizeof(*(p)))
-#endif
+#define	FD_COPY(f, t)	(void)memcpy((t), (f), sizeof(*(f)))
+#define	FD_ZERO(p)	(void)memset((p), 0, sizeof(*(p)))
 
 #if defined(__STDC__) && defined(_KERNEL)
 /*