Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bcopy->memcpy with memcpy->memmove -- not strictly needed, but...

Browse Source
This commit is contained in:
perry 1998-08-26 00:38:39 +00:00
parent 69d1215a28
commit 98b9f211ee
8 changed files with 48 additions and 48 deletions

10
lib/libc/gen/execvp.c

@ -1,4 +1,4 @@
/* $NetBSD: execvp.c,v 1.7 1998/08/10 02:43:09 perry Exp $ */
/* $NetBSD: execvp.c,v 1.8 1998/08/26 00:38:39 perry Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: execvp.c,v 1.7 1998/08/10 02:43:09 perry Exp $");
__RCSID("$NetBSD: execvp.c,v 1.8 1998/08/26 00:38:39 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -113,9 +113,9 @@ execvp(name, argv)
(void)write(STDERR_FILENO, ": path too long\n", 16);
continue;
}
memcpy(buf, p, lp);
memmove(buf, p, lp);
buf[lp] = '/';
memcpy(buf + lp + 1, name, ln);
memmove(buf + lp + 1, name, ln);
buf[lp + ln + 1] = '\0';
retry: (void)execve(bp, argv, environ);
@ -136,7 +136,7 @@ retry: (void)execve(bp, argv, environ);
}
memp[0] = "sh";
memp[1] = bp;
memcpy(memp + 2, argv + 1, cnt * sizeof(char *));
memmove(memp + 2, argv + 1, cnt * sizeof(char *));
(void)execve(_PATH_BSHELL, memp, environ);
goto done;
case ETXTBSY:

10
lib/libc/gen/getcap.c

@ -1,4 +1,4 @@
/* $NetBSD: getcap.c,v 1.22 1998/08/10 02:43:09 perry Exp $ */
/* $NetBSD: getcap.c,v 1.23 1998/08/26 00:38:40 perry Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
__RCSID("$NetBSD: getcap.c,v 1.22 1998/08/10 02:43:09 perry Exp $");
__RCSID("$NetBSD: getcap.c,v 1.23 1998/08/26 00:38:40 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -280,7 +280,7 @@ getent(cap, len, db_array, fd, name, depth, nfield)
/* save the data; close frees it */
clen = strlen(record);
cbuf = malloc(clen + 1);
memcpy(cbuf, record, clen + 1);
memmove(cbuf, record, clen + 1);
if (capdbp->close(capdbp) < 0) {
free(cbuf);
return (-2);
@ -552,8 +552,8 @@ tc_exp: {
* Insert tc'ed record into our record.
*/
s = tcstart + newilen;
memcpy(s, tcend, (size_t)(rp - tcend));
memcpy(tcstart, newicap, newilen);
memmove(s, tcend, (size_t)(rp - tcend));
memmove(tcstart, newicap, newilen);
rp += diff;
free(icap);

12
lib/libc/gen/getcwd.c

@ -1,4 +1,4 @@
/* $NetBSD: getcwd.c,v 1.13 1998/08/10 02:43:09 perry Exp $ */
/* $NetBSD: getcwd.c,v 1.14 1998/08/26 00:38:40 perry Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95";
#else
__RCSID("$NetBSD: getcwd.c,v 1.13 1998/08/10 02:43:09 perry Exp $");
__RCSID("$NetBSD: getcwd.c,v 1.14 1998/08/26 00:38:40 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -257,7 +257,7 @@ getcwd(pt, size)
* path to the beginning of the buffer, but it's always
* been that way and stuff would probably break.
*/
memcpy(pt, bpt, (size_t)(ept - bpt));
memmove(pt, bpt, (size_t)(ept - bpt));
free(up);
return (pt);
}
@ -303,7 +303,7 @@ getcwd(pt, size)
goto notfound;
if (ISDOT(dp))
continue;
memcpy(bup, dp->d_name,
memmove(bup, dp->d_name,
(size_t)(dp->d_namlen + 1));
/* Save the first error for later. */
@ -334,13 +334,13 @@ getcwd(pt, size)
goto err;
bpt = pt + off;
ept = pt + ptsize;
memcpy(ept - len, bpt, len);
memmove(ept - len, bpt, len);
bpt = ept - len;
}
if (!first)
*--bpt = '/';
bpt -= dp->d_namlen;
memcpy(bpt, dp->d_name, (size_t)dp->d_namlen);
memmove(bpt, dp->d_name, (size_t)dp->d_namlen);
(void)closedir(dir);
/* Truncate any file name. */

10
lib/libc/gen/getgrent.c

@ -1,4 +1,4 @@
/* $NetBSD: getgrent.c,v 1.25 1998/08/10 02:43:09 perry Exp $ */
/* $NetBSD: getgrent.c,v 1.26 1998/08/26 00:38:40 perry Exp $ */
/*
* Copyright (c) 1989, 1993
@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94";
#else
__RCSID("$NetBSD: getgrent.c,v 1.25 1998/08/10 02:43:09 perry Exp $");
__RCSID("$NetBSD: getgrent.c,v 1.26 1998/08/26 00:38:40 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -229,7 +229,7 @@ grscan(search, gid, name)
free(data);
continue;
}
memcpy(line, data, (size_t)datalen);
memmove(line, data, (size_t)datalen);
free(data);
break;
case YPMODE_NAME:
@ -246,7 +246,7 @@ grscan(search, gid, name)
free(data);
continue;
}
memcpy(line, data, (size_t)datalen);
memmove(line, data, (size_t)datalen);
free(data);
} else {
/* YP not available? */
@ -310,7 +310,7 @@ grscan(search, gid, name)
free(data);
continue;
}
memcpy(line, data, (size_t)datalen);
memmove(line, data, (size_t)datalen);
free(data);
line[datalen] = '\0';
bp = line;

34
lib/libc/gen/getpwent.c

@ -1,4 +1,4 @@
/* $NetBSD: getpwent.c,v 1.28 1998/08/10 02:43:09 perry Exp $ */
/* $NetBSD: getpwent.c,v 1.29 1998/08/26 00:38:40 perry Exp $ */
/*
* Copyright (c) 1988, 1993
@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95";
#else
__RCSID("$NetBSD: getpwent.c,v 1.28 1998/08/10 02:43:09 perry Exp $");
__RCSID("$NetBSD: getpwent.c,v 1.29 1998/08/26 00:38:40 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -181,7 +181,7 @@ __ypproto_set()
/* name */
if(pw->pw_name && (pw->pw_name)[0]) {
ptr = (char *)ALIGN(ptr);
memcpy(ptr, pw->pw_name, strlen(pw->pw_name) + 1);
memmove(ptr, pw->pw_name, strlen(pw->pw_name) + 1);
__ypproto->pw_name = ptr;
ptr += (strlen(pw->pw_name) + 1);
} else
@ -190,7 +190,7 @@ __ypproto_set()
/* password */
if(pw->pw_passwd && (pw->pw_passwd)[0]) {
ptr = (char *)ALIGN(ptr);
memcpy(ptr, pw->pw_passwd, strlen(pw->pw_passwd) + 1);
memmove(ptr, pw->pw_passwd, strlen(pw->pw_passwd) + 1);
__ypproto->pw_passwd = ptr;
ptr += (strlen(pw->pw_passwd) + 1);
} else
@ -211,7 +211,7 @@ __ypproto_set()
/* gecos */
if(pw->pw_gecos && (pw->pw_gecos)[0]) {
ptr = (char *)ALIGN(ptr);
memcpy(ptr, pw->pw_gecos, strlen(pw->pw_gecos) + 1);
memmove(ptr, pw->pw_gecos, strlen(pw->pw_gecos) + 1);
__ypproto->pw_gecos = ptr;
ptr += (strlen(pw->pw_gecos) + 1);
} else
@ -220,7 +220,7 @@ __ypproto_set()
/* dir */
if(pw->pw_dir && (pw->pw_dir)[0]) {
ptr = (char *)ALIGN(ptr);
memcpy(ptr, pw->pw_dir, strlen(pw->pw_dir) + 1);
memmove(ptr, pw->pw_dir, strlen(pw->pw_dir) + 1);
__ypproto->pw_dir = ptr;
ptr += (strlen(pw->pw_dir) + 1);
} else
@ -229,7 +229,7 @@ __ypproto_set()
/* shell */
if(pw->pw_shell && (pw->pw_shell)[0]) {
ptr = (char *)ALIGN(ptr);
memcpy(ptr, pw->pw_shell, strlen(pw->pw_shell) + 1);
memmove(ptr, pw->pw_shell, strlen(pw->pw_shell) + 1);
__ypproto->pw_shell = ptr;
ptr += (strlen(pw->pw_shell) + 1);
} else
@ -396,7 +396,7 @@ again:
data = NULL;
goto again;
}
memcpy(line, data, datalen);
memmove(line, data, datalen);
free(data);
data = NULL;
break;
@ -423,7 +423,7 @@ again:
free(data);
goto again;
}
memcpy(line, data, datalen);
memmove(line, data, datalen);
free(data);
data = NULL;
break;
@ -441,7 +441,7 @@ again:
free(data);
goto again;
}
memcpy(line, data, datalen);
memmove(line, data, datalen);
free(data);
data = (char *)NULL;
} else { /* XXX */
@ -463,7 +463,7 @@ again:
++_pw_keynum;
bf[0] = _PW_KEYBYNUM;
memcpy(bf + 1, (char *)&_pw_keynum, sizeof(_pw_keynum));
memmove(bf + 1, (char *)&_pw_keynum, sizeof(_pw_keynum));
key.data = (u_char *)bf;
key.size = sizeof(_pw_keynum) + 1;
if(__hashpw(&key)) {
@ -567,7 +567,7 @@ getpwnam(name)
for(_pw_keynum=1; _pw_keynum; _pw_keynum++) {
bf[0] = _PW_KEYBYNUM;
memcpy(bf + 1, (char *)&_pw_keynum, sizeof(_pw_keynum));
memmove(bf + 1, (char *)&_pw_keynum, sizeof(_pw_keynum));
key.data = (u_char *)bf;
key.size = sizeof(_pw_keynum) + 1;
if(__hashpw(&key) == 0)
@ -653,7 +653,7 @@ pwnam_netgrp:
}
break;
}
memcpy(line, __ypcurrent, __ypcurrentlen);
memmove(line, __ypcurrent, __ypcurrentlen);
line[__ypcurrentlen] = '\0';
if(__ypparse(&_pw_passwd, line)
|| __ypexclude_is(_pw_passwd.pw_name)) {
@ -715,7 +715,7 @@ pwnam_netgrp:
bf[0] = _PW_KEYBYNAME;
len = strlen(name);
len = MIN(len, MAXLOGNAME);
memcpy(bf + 1, name, len);
memmove(bf + 1, name, len);
key.data = (u_char *)bf;
key.size = len + 1;
rval = __hashpw(&key);
@ -753,7 +753,7 @@ getpwuid(uid)
snprintf(uidbuf, sizeof(uidbuf), "%u", uid);
for(_pw_keynum=1; _pw_keynum; _pw_keynum++) {
bf[0] = _PW_KEYBYNUM;
memcpy(bf + 1, (char *)&_pw_keynum, sizeof(_pw_keynum));
memmove(bf + 1, (char *)&_pw_keynum, sizeof(_pw_keynum));
key.data = (u_char *)bf;
key.size = sizeof(_pw_keynum) + 1;
if(__hashpw(&key) == 0)
@ -838,7 +838,7 @@ pwuid_netgrp:
}
break;
}
memcpy(line, __ypcurrent, __ypcurrentlen);
memmove(line, __ypcurrent, __ypcurrentlen);
line[__ypcurrentlen] = '\0';
if(__ypparse(&_pw_passwd, line)
|| __ypexclude_is(_pw_passwd.pw_name)) {
@ -899,7 +899,7 @@ pwuid_netgrp:
bf[0] = _PW_KEYBYUID;
keyuid = uid;
memcpy(bf + 1, &keyuid, sizeof(keyuid));
memmove(bf + 1, &keyuid, sizeof(keyuid));
key.data = (u_char *)bf;
key.size = sizeof(keyuid) + 1;
rval = __hashpw(&key);

6
lib/libc/gen/scandir.c

@ -1,4 +1,4 @@
/* $NetBSD: scandir.c,v 1.12 1998/08/10 02:43:10 perry Exp $ */
/* $NetBSD: scandir.c,v 1.13 1998/08/26 00:38:40 perry Exp $ */
/*
* Copyright (c) 1983, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)scandir.c 8.3 (Berkeley) 1/2/94";
#else
__RCSID("$NetBSD: scandir.c,v 1.12 1998/08/10 02:43:10 perry Exp $");
__RCSID("$NetBSD: scandir.c,v 1.13 1998/08/26 00:38:40 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -113,7 +113,7 @@ scandir(dirname, namelist, select, dcomp)
p->d_reclen = d->d_reclen;
p->d_type = d->d_type;
p->d_namlen = d->d_namlen;
memcpy(p->d_name, d->d_name, (size_t)(p->d_namlen + 1));
memmove(p->d_name, d->d_name, (size_t)(p->d_namlen + 1));
/*
* Check to make sure the array has space left and
* realloc the maximum size.

8
lib/libc/gen/ttyname.c

@ -1,4 +1,4 @@
/* $NetBSD: ttyname.c,v 1.14 1998/08/10 02:43:10 perry Exp $ */
/* $NetBSD: ttyname.c,v 1.15 1998/08/26 00:38:40 perry Exp $ */
/*
* Copyright (c) 1988, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94";
#else
__RCSID("$NetBSD: ttyname.c,v 1.14 1998/08/10 02:43:10 perry Exp $");
__RCSID("$NetBSD: ttyname.c,v 1.15 1998/08/26 00:38:40 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -87,7 +87,7 @@ ttyname(fd)
key.data = &bkey;
key.size = sizeof(bkey);
if (!(db->get)(db, &key, &data, 0)) {
memcpy(buf + sizeof(_PATH_DEV) - 1, data.data,
memmove(buf + sizeof(_PATH_DEV) - 1, data.data,
data.size);
(void)(db->close)(db);
return (buf);
@ -111,7 +111,7 @@ oldttyname(sb)
while ((dirp = readdir(dp)) != NULL) {
if (dirp->d_fileno != sb->st_ino)
continue;
memcpy(buf + sizeof(_PATH_DEV) - 1, dirp->d_name,
memmove(buf + sizeof(_PATH_DEV) - 1, dirp->d_name,
(size_t)(dirp->d_namlen + 1));
if (stat(buf, &dsb) || sb->st_dev != dsb.st_dev ||
sb->st_ino != dsb.st_ino)

6
libexec/rlogind/rlogind.c

@ -1,4 +1,4 @@
/* $NetBSD: rlogind.c,v 1.16 1998/08/25 19:11:11 ross Exp $ */
/* $NetBSD: rlogind.c,v 1.17 1998/08/26 00:46:23 perry Exp $ */
/*-
* Copyright (c) 1983, 1988, 1989, 1993
@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)rlogind.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: rlogind.c,v 1.16 1998/08/25 19:11:11 ross Exp $");
__RCSID("$NetBSD: rlogind.c,v 1.17 1998/08/26 00:46:23 perry Exp $");
#endif
#endif /* not lint */
@ -434,7 +434,7 @@ protocol(f, p)
if (n) {
left -= n;
if (left > 0)
memcpy(cp,
memmove(cp,
cp+n,
left);
fcc -= n;