X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftraverse.c;h=fe5af09c2a839a74abcf76c5fdc3a065c91c42e4;hp=41047999c7d921c07237655e50db09f3840136b3;hb=979da669432983d6fedecbd004d6dd20f46486dc;hpb=e1e4be20b0192a2988eab70a31fb1428c4c81eec

diff --git a/dump/traverse.c b/dump/traverse.c
index 4104799..fe5af09 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.61 2004/07/01 09:14:49 stelian Exp $";
+	"$Id: traverse.c,v 1.65 2005/01/25 13:33:44 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -283,6 +283,9 @@ mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskip
 	 */
 	SETINO(ino, usedinomap);
 
+	if (NODUMP_FLAG(dp))
+		do_exclude_ino(ino, "nodump attribute");
+
 	if (mode == IFDIR)
 		SETINO(ino, dumpdirmap);
 	if (WANTTODUMP(dp, ino)) {
@@ -296,7 +299,7 @@ mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskip
 		return;
 	}
 	if (mode == IFDIR) {
-		if ( NODUMP_FLAG(dp) || exclude_ino(ino) )
+		if (exclude_ino(ino))
 			CLRINO(ino, usedinomap);
 		*dirskipped = 1;
 	}
@@ -985,6 +988,10 @@ convert_dir(struct ext2_dir_entry *dirent, UNUSED(int offset),
 	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);
@@ -1241,6 +1248,7 @@ dumpmap(char *map, int type, dump_ino_t ino)
 
 	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);