diff options
| author | peter <peter@FreeBSD.org> | 1997-03-11 12:09:50 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-03-11 12:09:50 +0000 |
| commit | 7f724bc019c31a8c4431544257687485e1f4e097 (patch) | |
| tree | c659cdd45beb794cde9ff44ac6c90d00a51602f2 /sbin/dump/traverse.c | |
| parent | 9d6aaa6325cf8be94ba275a08c832d48859ccf64 (diff) | |
| download | FreeBSD-src-7f724bc019c31a8c4431544257687485e1f4e097.zip FreeBSD-src-7f724bc019c31a8c4431544257687485e1f4e097.tar.gz | |
Merge Lite2 changes (rather bigish, the dump/restore folks should check)
Diffstat (limited to 'sbin/dump/traverse.c')
| -rw-r--r-- | sbin/dump/traverse.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 8b5a515..70c0414 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; +static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif /* not lint */ #include <sys/param.h> @@ -45,9 +45,9 @@ static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #include <ufs/fsdir.h> #include <ufs/inode.h> #else -#include <ufs/ffs/fs.h> #include <ufs/ufs/dir.h> #include <ufs/ufs/dinode.h> +#include <ufs/ffs/fs.h> #endif #include <protocols/dumprestore.h> @@ -362,8 +362,7 @@ dumpino(dp, ino) spcl.c_addr[0] = 1; spcl.c_count = 1; writeheader(ino); - bcopy((caddr_t)dp->di_shortlink, buf, - (u_long)dp->di_size); + memmove(buf, dp->di_shortlink, (u_long)dp->di_size); buf[dp->di_size] = '\0'; writerec(buf, 0); return; @@ -418,7 +417,7 @@ dmpindir(ino, blk, ind_level, size) if (blk != 0) bread(fsbtodb(sblock, blk), (char *)idblk, (int) sblock->fs_bsize); else - bzero((char *)idblk, (int)sblock->fs_bsize); + memset(idblk, 0, (int)sblock->fs_bsize); if (ind_level <= 0) { if (*size < NINDIR(sblock) * sblock->fs_bsize) cnt = howmany(*size, sblock->fs_fsize); @@ -592,7 +591,7 @@ loop: /* * Zero buffer, then try to read each sector of buffer separately. */ - bzero(buf, size); + memset(buf, 0, size); for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) { if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) != ((off_t)blkno << dev_bshift)) |
