X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftraverse.c;h=80d7e86bf17e18441bb28cf38ac708f59d5d516b;hp=e4cf7d383d924e6dfd45140e1eac77de9d174bdb;hb=e51470bfc05d83f82c37d24504220c7163bbd4c1;hpb=cfa03414886424d1dcc4ca41210c26d54204c444

diff --git a/dump/traverse.c b/dump/traverse.c
index e4cf7d3..80d7e86 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -2,8 +2,8 @@
  *	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@noos.fr>, 1999-2000
- *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*-
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.33 2001/04/11 13:42:52 stelian Exp $";
+	"$Id: traverse.c,v 1.41 2002/01/25 14:59:53 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -55,7 +55,11 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/stat.h>
 #ifdef	__linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #include <compaterr.h>
@@ -98,9 +102,6 @@ static	void dmpindir __P((dump_ino_t ino, daddr_t blk, int level, fsizeT *size))
 static	int searchdir __P((dump_ino_t ino, daddr_t blkno, long size, long filesize));
 #endif
 static	void mapfileino __P((dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped));
-static	int exclude_ino __P((dump_ino_t ino));
-extern dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];	/* the inode exclude list */
-extern int iexclude_num;			/* number of elements in list */
 
 #ifdef HAVE_EXT2_JOURNAL_INUM
 #define ext2_journal_ino(sb) (sb->s_journal_inum)
@@ -158,13 +159,9 @@ int dump_fs_open(const char *disk, ext2_filsys *fs)
 		else {
 			if (es->s_feature_compat &
 				EXT3_FEATURE_COMPAT_HAS_JOURNAL && 
-				journal_ino && !exclude_ino(journal_ino)) {
-				iexclude_list[iexclude_num++] = journal_ino;
-				msg("Exclude ext3 journal inode %u\n",
-				    journal_ino);
-			}
-			if (!exclude_ino(EXT2_RESIZE_INO))
-				iexclude_list[iexclude_num++] = EXT2_RESIZE_INO;
+				journal_ino)
+				do_exclude_ino(journal_ino, "journal inode");
+			do_exclude_ino(EXT2_RESIZE_INO, "resize inode");
 		}
 	}
 	return retval;
@@ -220,22 +217,6 @@ blockest(struct dinode const *dp)
 	return (blkest + 1);
 }
 
-/*
- * This tests whether an inode is in the exclude list 
- */
-int
-exclude_ino(dump_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))
@@ -917,8 +898,8 @@ dumpino(struct dinode *dp, dump_ino_t ino)
 
 	ext2fs_block_iterate2(fs, (ext2_ino_t)ino, 0, NULL, dumponeblock, (void *)&bc);
 	/* deal with holes at the end of the inode */
-	remaining = i_size - bc.next_block*sblock->fs_fsize;
-	if (remaining > 0) 
+	if (i_size > ((u_quad_t)bc.next_block) * sblock->fs_fsize) {
+		remaining = i_size - ((u_quad_t)bc.next_block) * sblock->fs_fsize;
 		for (i = 0; i < howmany(remaining, sblock->fs_fsize); i++) {
 			bc.buf[bc.cnt++] = 0;
 			if (bc.cnt == bc.max) {
@@ -926,6 +907,7 @@ dumpino(struct dinode *dp, dump_ino_t ino)
 				bc.cnt = 0;
 			}
 		}
+	}
 	if (bc.cnt > 0) {
 		blksout (bc.buf, bc.cnt, bc.ino);
 	}
@@ -1194,21 +1176,20 @@ dumpmap(char *map, int type, dump_ino_t ino)
 		writerec(cp, 0);
 }
 
-/*
- * Write a header record to the dump tape.
- */
 #if defined __linux__ && !defined(int32_t)
 #define int32_t __s32
 #endif
+
+/* 
+ * Compute and fill in checksum information.
+ */
 void
-writeheader(dump_ino_t ino)
+mkchecksum(union u_spcl *tmpspcl) 
 {
-	register int32_t sum, cnt, *lp;
+	int32_t sum, cnt, *lp;
 
-	spcl.c_inumber = ino;
-	spcl.c_magic = NFS_MAGIC;
-	spcl.c_checksum = 0;
-	lp = (int32_t *)&spcl;
+	tmpspcl->s_spcl.c_checksum = 0;
+	lp = (int32_t *)&tmpspcl->s_spcl;
 	sum = 0;
 	cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t));
 	while (--cnt >= 0) {
@@ -1217,7 +1198,18 @@ writeheader(dump_ino_t ino)
 		sum += *lp++;
 		sum += *lp++;
 	}
-	spcl.c_checksum = CHECKSUM - sum;
+	tmpspcl->s_spcl.c_checksum = CHECKSUM - sum;
+}
+
+/*
+ * Write a header record to the dump tape.
+ */
+void
+writeheader(dump_ino_t ino)
+{
+	spcl.c_inumber = ino;
+	spcl.c_magic = NFS_MAGIC;
+	mkchecksum((union u_spcl *)&spcl);
 	writerec((char *)&spcl, 1);
 }
 
@@ -1257,11 +1249,10 @@ getino(dump_ino_t inum)
 /*
  * Read a chunk of data from the disk.
  * Try to recover from hard errors by reading in sector sized pieces.
- * Error recovery is attempted at most BREADEMAX times before seeking
+ * Error recovery is attempted at most breademax times before seeking
  * consent from the operator to continue.
  */
 int	breaderrors = 0;
-#define	BREADEMAX 32
 
 void
 bread(daddr_t blkno, char *buf, int size)
@@ -1300,9 +1291,9 @@ loop:
 	else
 		msg("short read error from %s: [block %d]: count=%d, got=%d\n",
 			disk, blkno, size, cnt);
-	if (++breaderrors > BREADEMAX) {
+	if (++breaderrors > breademax) {
 		msg("More than %d block read errors from %d\n",
-			BREADEMAX, disk);
+			breademax, disk);
 		broadcast("DUMP IS AILING!\n");
 		msg("This is an unrecoverable error.\n");
 		if (!query("Do you want to attempt to continue?")){