X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftraverse.c;h=ed52904ffe6dd150c35ac0e20a438fc4c367272d;hb=20c345aa6780d2b021ce6cdbd812e4f021273640;hp=a95a21e1be07da8a6d1244db0c89822cbfe2a896;hpb=7fbb9b02f47a159786b43d30d4f6901a742aafa6;p=dump.git

diff --git a/dump/traverse.c b/dump/traverse.c
index a95a21e..ed52904 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -2,7 +2,7 @@
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
  *	Remy Card <card@Linux.EU.Org>, 1994-1997
- *	Stelian Pop <pop@cybercable.fr>, 1999 
+ *	Stelian Pop <pop@cybercable.fr>, 1999-2000
  */
 
 /*-
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.11 1999/12/05 18:21:23 tiniou Exp $";
+	"$Id: traverse.c,v 1.15 2000/02/04 20:22:21 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -190,6 +190,9 @@ blockest(struct dinode *dp)
 #define	WANTTODUMP(dp) CHANGEDSINCE(dp, spcl.c_ddate)
 #endif
 
+extern ino_t iexclude_list[IEXCLUDE_MAXNUM];	/* the inode exclude list */
+extern int iexclude_num;	/* number of elements in the list */
+
 /*
  * Determine if given inode should be dumped
  */
@@ -217,6 +220,18 @@ mapfileino(ino_t ino, long *tapesize, int *dirskipped)
 	 * to the usedinomap.
 	 */
 	SETINO(ino, usedinomap);
+
+	/* 04-Feb-00 ILC */
+	if(iexclude_num) {	/* if there are inodes in the exclude list */
+		int idx;	/* then check this inode against it */
+		for (idx=0; idx<iexclude_num; idx++) {
+			if (ino == iexclude_list[idx]) {
+				msg("Excluding inode number %d\n", ino);
+				return;	/* if in list then skip */
+			}
+		}
+	}
+
 	if (mode == IFDIR)
 		SETINO(ino, dumpdirmap);
 	if (WANTTODUMP(dp)) {
@@ -283,9 +298,9 @@ mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *bu
 	dp = getino(dirent->inode);
 	mode = dp->di_mode & IFMT;
 	if (mode == IFDIR && dp->di_nlink != 0 && dp->di_dtime == 0) {
-		if ((dirent->name[0] != '.' || dirent->name_len != 1) &&
+		if ((dirent->name[0] != '.' || ( dirent->name_len & 0xFF ) != 1) &&
 		    (dirent->name[0] != '.' || dirent->name[1] != '.' ||
-		     dirent->name_len != 2)) {
+		     ( dirent->name_len & 0xFF ) != 2)) {
 		retval = ext2fs_dir_iterate(fs, ino, 0, NULL,
 					    mapfilesindir, private);
 		if (retval)
@@ -516,9 +531,9 @@ searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void
 	if (dp->inode == 0)
 		return 0;
 	if (dp->name[0] == '.') {
-		if (dp->name_len == 1)
+		if (( dp->name_len & 0xFF ) == 1)
 			return 0;
-		if (dp->name[1] == '.' && dp->name_len == 2)
+		if (dp->name[1] == '.' && ( dp->name_len & 0xFF ) == 2)
 			return 0;
 	}
 	if (mdc->nodump) {
@@ -667,7 +682,7 @@ dumpino(struct dinode *dp, ino_t ino)
 	obi.di_gen = dp->di_gen;
 	memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
 	if (dp->di_file_acl || dp->di_dir_acl)
-		warn("ACLs in inode #%ld won't be dumped", ino);
+		warn("ACLs in inode #%ld won't be dumped", (long)ino);
 	memmove(&spcl.c_dinode, &obi, sizeof(obi));
 #else	/* __linux__ */
 	spcl.c_dinode = *dp;
@@ -850,7 +865,7 @@ dumpdirino(struct dinode *dp, ino_t ino)
 	/* Do the conversion */
 	retval = ext2fs_dir_iterate(fs, ino, 0, NULL, convert_dir, (void *)&cdc);
 	if (retval) {
-		com_err(disk, retval, "while converting directory #%ld\n", ino);
+		com_err(disk, retval, "while converting directory #%ld\n", (long)ino);
 		exit(X_ABORT);
 	}
 	/* Fix the last entry */
@@ -877,7 +892,7 @@ dumpdirino(struct dinode *dp, ino_t ino)
 	obi.di_gen = dp->di_gen;
 	memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
 	if (dp->di_file_acl || dp->di_dir_acl)
-		warn("ACLs in inode #%ld won't be dumped", ino);
+		warn("ACLs in inode #%ld won't be dumped", (long)ino);
 	memmove(&spcl.c_dinode, &obi, sizeof(obi));
 #else	/* __linux__ */
 	spcl.c_dinode = *dp;