diff options
| -rw-r--r-- | serverboot/ext2_file_io.c | 2 | ||||
| -rw-r--r-- | serverboot/ffs_file_io.c | 2 | ||||
| -rw-r--r-- | serverboot/strfcns.c | 37 |
3 files changed, 9 insertions, 32 deletions
diff --git a/serverboot/ext2_file_io.c b/serverboot/ext2_file_io.c index d25fd9db..d96ad576 100644 --- a/serverboot/ext2_file_io.c +++ b/serverboot/ext2_file_io.c @@ -651,7 +651,7 @@ ext2_open_file(master_device_port, path, fp) if (++nlinks > MAXSYMLINKS) RETURN (FS_SYMLINK_LOOP); - ovbcopy(cp, &namebuf[link_len], len); + memmove(&namebuf[link_len], cp, len); #ifdef IC_FASTLINK if (fp->i_ic.i_blocks == 0) { diff --git a/serverboot/ffs_file_io.c b/serverboot/ffs_file_io.c index ce67fdc8..0055c302 100644 --- a/serverboot/ffs_file_io.c +++ b/serverboot/ffs_file_io.c @@ -625,7 +625,7 @@ ffs_open_file(master_device_port, path, fp) if (++nlinks > MAXSYMLINKS) RETURN (FS_SYMLINK_LOOP); - ovbcopy(cp, &namebuf[link_len], len); + memmove (&namebuf[link_len], cp, len); #ifdef IC_FASTLINK if ((fp->i_flags & IC_FASTLINK) != 0) { diff --git a/serverboot/strfcns.c b/serverboot/strfcns.c index 53c097ba..85e5eb83 100644 --- a/serverboot/strfcns.c +++ b/serverboot/strfcns.c @@ -1,26 +1,26 @@ -/* +/* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University * All Rights Reserved. - * + * * 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 Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ /* @@ -74,28 +74,6 @@ strprefix(s1, s2) return (TRUE); } -/* - * ovbcopy - like bcopy, but recognizes overlapping ranges and handles - * them correctly. - */ -ovbcopy(from, to, bytes) - char *from, *to; - int bytes; /* num bytes to copy */ -{ - /* Assume that bcopy copies left-to-right (low addr first). */ - if (from + bytes <= to || to + bytes <= from || to == from) - bcopy(from, to, bytes); /* non-overlapping or no-op*/ - else if (from > to) - bcopy(from, to, bytes); /* overlapping but OK */ - else { - /* to > from: overlapping, and must copy right-to-left. */ - from += bytes - 1; - to += bytes - 1; - while (bytes-- > 0) - *to-- = *from--; - } -} - /* * Return a pointer to the first occurence of 'c' in * string s, or 0 if none. @@ -114,4 +92,3 @@ index(s, c) } return s; } - |