#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.60 2004/03/10 16:26:30 stelian Exp $";
+ "$Id: traverse.c,v 1.65 2005/01/25 13:33:44 stelian Exp $";
#endif /* not lint */
#include <config.h>
*/
SETINO(ino, usedinomap);
+ if (NODUMP_FLAG(dp))
+ do_exclude_ino(ino, "nodump attribute");
+
if (mode == IFDIR)
SETINO(ino, dumpdirmap);
if (WANTTODUMP(dp, ino)) {
return;
}
if (mode == IFDIR) {
- if ( NODUMP_FLAG(dp) || exclude_ino(ino) )
+ if (exclude_ino(ino))
CLRINO(ino, usedinomap);
*dirskipped = 1;
}
UNUSED(blk_t ref_block), UNUSED(int ref_offset), void * private)
{
struct block_context *p;
- int i;
+ e2_blkcnt_t i;
if (blockcnt < NDADDR)
return 0;
struct direct *dp;
int reclen;
+ /* do not save entries to excluded inodes */
+ if (exclude_ino(dirent->inode))
+ return 0;
+
p = (struct convert_dir_context *)private;
reclen = EXT2_DIR_REC_LEN((dirent->name_len & 0xFF) + 1);
* Collect up the data into tape record sized buffers and output them.
*/
void
-blksout(daddr_t *blkp, int frags, dump_ino_t ino)
+blksout(blk_t *blkp, int frags, dump_ino_t ino)
{
- daddr_t *bp;
+ blk_t *bp;
int i, j, count, blks, tbperdb;
blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
spcl.c_type = type;
spcl.c_count = howmany(mapsize * sizeof(char), TP_BSIZE);
+ spcl.c_dinode.di_size = mapsize;
writeheader(ino);
for (i = 0, cp = map; i < spcl.c_count; i++, cp += TP_BSIZE)
writerec(cp, 0);
int breaderrors = 0;
void
-bread(daddr_t blkno, char *buf, int size)
+bread(ext2_loff_t blkno, char *buf, int size)
{
int cnt, i;
loop:
#ifdef __linux__
- if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
- (((ext2_loff_t)blkno) << dev_bshift))
+ if (ext2fs_llseek(diskfd, (blkno << dev_bshift), 0) !=
+ (blkno << dev_bshift))
#else
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
((off_t)blkno << dev_bshift))
memset(buf, 0, size);
for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
#ifdef __linux__
- if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
- (((ext2_loff_t)blkno) << dev_bshift))
+ if (ext2fs_llseek(diskfd, (blkno << dev_bshift), 0) !=
+ (blkno << dev_bshift))
#else
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
((off_t)blkno << dev_bshift))