X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftraverse.c;h=2613b5ef5d68b54c1544bfd89ab29359942230ce;hp=116d4f3bbedfc84bff5232b8c6c1674766443301;hb=a028bdc88a9fca7a274fe9a2f3dc7d824aedd8bc;hpb=2f562f4e49eeaf0188ed8fc41c785e3dcd9e46a5 diff --git a/dump/traverse.c b/dump/traverse.c index 116d4f3..2613b5e 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.50 2002/08/18 20:52:05 stelian Exp $"; + "$Id: traverse.c,v 1.52 2002/12/09 10:53:59 stelian Exp $"; #endif /* not lint */ #include @@ -195,7 +195,7 @@ blockest(struct dinode const *dp) * dump blocks (sizeest vs. blkest in the indirect block * calculation). */ - blkest = howmany((u_quad_t)dp->di_blocks*fs->blocksize, TP_BSIZE); + blkest = howmany((u_quad_t)dp->di_blocks * 512, TP_BSIZE); i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32); sizeest = howmany(i_size, TP_BSIZE); if (blkest > sizeest) @@ -825,7 +825,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly) nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid; nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid; if (dp->di_file_acl) - warn("ACLs in inode #%ld won't be dumped", (long)ino); + msg("ACLs in inode #%ld won't be dumped\n", (long)ino); memmove(&spcl.c_dinode, &nbi, sizeof(nbi)); #else /* __linux__ */ spcl.c_dinode = *dp; @@ -1083,7 +1083,7 @@ dumpdirino(struct dinode *dp, dump_ino_t ino) nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid; nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid; if (dp->di_file_acl) - warn("ACLs in inode #%ld won't be dumped", (long)ino); + msg("ACLs in inode #%ld won't be dumped\n", (long)ino); memmove(&spcl.c_dinode, &nbi, sizeof(nbi)); #else /* __linux__ */ spcl.c_dinode = *dp;