X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftraverse.c;h=9182b4052677c137b6819a668a7b9e7821cbbf1b;hb=abc63c56d1d2615509730085dfbe905497be888e;hp=204f518de8e5b6cf712eb9913361673745eedac8;hpb=8eb05297aafdfd88bbd946a35d4db771604503bd;p=dump.git

diff --git a/dump/traverse.c b/dump/traverse.c
index 204f518..9182b40 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.16 2000/02/10 09:42:32 stelian Exp $";
+	"$Id: traverse.c,v 1.20 2000/09/26 13:17:09 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -84,11 +84,15 @@ static const char rcsid[] =
 #define	HASDUMPEDFILE	0x1
 #define	HASSUBDIRS	0x2
 
+#ifdef __linux__
+typedef u_quad_t fsizeT;
+#else
 #ifdef	FS_44INODEFMT
 typedef	quad_t fsizeT;
 #else
 typedef	long fsizeT;
 #endif
+#endif
 
 #ifdef	__linux__
 static	int searchdir __P((struct ext2_dir_entry *dp, int offset,
@@ -99,6 +103,7 @@ static	void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size));
 static	int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize));
 #endif
 static	void mapfileino __P((ino_t ino, long *tapesize, int *dirskipped));
+static	int exclude_ino __P((ino_t ino));
 
 /* #define EXT3_FEATURE_INCOMPAT_RECOVER */
 
@@ -112,6 +117,7 @@ int dump_fs_open(const char *disk, ext2_filsys *fs)
 #else
 	retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, fs);
 #endif
+#if defined(EXT2_LIB_FEATURE_COMPAT_SUPP) && defined(EXT2_LIB_FEATURE_INCOMPAT_SUPP) && defined(EXT2_LIB_FEATURE_RO_COMPAT_SUPP) && defined(EXT2_ET_UNSUPP_FEATURE) && defined(EXT2_ET_RO_UNSUPP_FEATURE)
 	if (!retval) {
 		s = (struct ext2fs_sb *) (*fs)->super;
 		if ((s->s_feature_compat & ~EXT2_LIB_FEATURE_COMPAT_SUPP) ||
@@ -126,6 +132,7 @@ int dump_fs_open(const char *disk, ext2_filsys *fs)
 			retval = EXT2_ET_RO_UNSUPP_FEATURE;
 		}
 	}
+#endif /* defined && defined && defined... */
 	return retval;
 }
 
@@ -164,7 +171,7 @@ blockest(struct dinode *dp)
 		/* calculate the number of indirect blocks on the dump tape */
 		blkest +=
 			howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE,
-			TP_NINDIR);
+			NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super));
 	}
 #else
 	if (dp->di_size > sblock->fs_bsize * NDADDR) {
@@ -177,21 +184,41 @@ blockest(struct dinode *dp)
 	return (blkest + 1);
 }
 
+extern ino_t iexclude_list[IEXCLUDE_MAXNUM];	/* the inode exclude list */
+extern int iexclude_num;	/* number of elements in the list */
+
+/*
+ * This tests whether an inode is in the exclude list 
+ */
+int
+exclude_ino(ino_t ino)
+{
+	/* 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])
+				return 1;
+	}
+	return 0;
+}
+
 /* Auxiliary macro to pick up files changed since previous dump. */
 #define	CHANGEDSINCE(dp, t) \
 	((dp)->di_mtime >= (t) || (dp)->di_ctime >= (t))
 
-/* The WANTTODUMP macro decides whether a file should be dumped. */
+/* The NODUMP_FLAG macro tests if a file has the nodump flag. */
 #ifdef UF_NODUMP
-#define	WANTTODUMP(dp) \
-	(CHANGEDSINCE(dp, spcl.c_ddate) && \
-	 (nonodump || ((dp)->di_flags & UF_NODUMP) != UF_NODUMP))
+#define NODUMP_FLAG(dp) (!nonodump && (((dp)->di_flags & UF_NODUMP) == UF_NODUMP))
 #else
-#define	WANTTODUMP(dp) CHANGEDSINCE(dp, spcl.c_ddate)
+#define NODUMP_FLAG(dp) 0
 #endif
 
-extern ino_t iexclude_list[IEXCLUDE_MAXNUM];	/* the inode exclude list */
-extern int iexclude_num;	/* number of elements in the list */
+/* The WANTTODUMP macro decides whether a file should be dumped. */
+#define	WANTTODUMP(dp, ino) \
+	(CHANGEDSINCE(dp, spcl.c_ddate) && \
+	 (!NODUMP_FLAG(dp)) && \
+	 (!exclude_ino(ino)))
 
 /*
  * Determine if given inode should be dumped
@@ -221,20 +248,9 @@ mapfileino(ino_t ino, long *tapesize, int *dirskipped)
 	 */
 	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)) {
+	if (WANTTODUMP(dp, ino)) {
 		SETINO(ino, dumpinomap);
 		if (mode != IFREG && mode != IFDIR && mode != IFLNK)
 			*tapesize += 1;
@@ -243,10 +259,8 @@ mapfileino(ino_t ino, long *tapesize, int *dirskipped)
 		return;
 	}
 	if (mode == IFDIR) {
-#ifdef UF_NODUMP
-		if (!nonodump && (dp->di_flags & UF_NODUMP))
+		if ( NODUMP_FLAG(dp) || exclude_ino(ino) )
 			CLRINO(ino, usedinomap);
-#endif
 		*dirskipped = 1;
 	}
 }