Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/ttyname.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- src/lib/libc/gen/ttyname.c 1998/08/10 02:43:10 1.14 +++ src/lib/libc/gen/ttyname.c 1998/08/26 00:38:40 1.15 @@ -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)