X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftraverse.c;h=901ef2de6c7ce6f7c47695451899d1276c057642;hb=f9dbe020b33318ccc4d0b68816dc50b7a17a0c65;hp=06eeb7373cb0954cf3512c3191aedded1f859265;hpb=11856e771fadee7ddb9b5a613c91f562bf363da7;p=dump.git

diff --git a/dump/traverse.c b/dump/traverse.c
index 06eeb73..901ef2d 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.40 2002/01/16 09:32:14 stelian Exp $";
+	"$Id: traverse.c,v 1.45 2002/04/11 09:19:07 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -143,15 +143,14 @@ int dump_fs_open(const char *disk, ext2_filsys *fs)
 		dump_ino_t journal_ino = ext2_journal_ino(es);
 
 		if (es->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV){
-			fprintf(stderr, "This an journal, not a filesystem!\n");
+			msg("This is a journal, not a filesystem!\n");
 			retval = EXT2_ET_UNSUPP_FEATURE;
 			ext2fs_close(*fs);
 		}
 		else if ((retval = es->s_feature_incompat &
 					~(EXT2_LIB_FEATURE_INCOMPAT_SUPP |
 					  EXT3_FEATURE_INCOMPAT_RECOVER))) {
-			fprintf(stderr,
-				"Unsupported feature(s) 0x%x in filesystem\n",
+			msg("Unsupported feature(s) 0x%x in filesystem\n",
 				retval);
 			retval = EXT2_ET_UNSUPP_FEATURE;
 			ext2fs_close(*fs);
@@ -218,8 +217,12 @@ blockest(struct dinode const *dp)
 }
 
 /* Auxiliary macro to pick up files changed since previous dump. */
+#define CSINCE(dp, t) \
+	((dp)->di_ctime >= (t))
+#define MSINCE(dp, t) \
+	((dp)->di_mtime >= (t))
 #define	CHANGEDSINCE(dp, t) \
-	((dp)->di_mtime >= (t) || (dp)->di_ctime >= (t))
+	(CSINCE(dp, t) || MSINCE(dp, t))
 
 /* The NODUMP_FLAG macro tests if a file has the nodump flag. */
 #ifdef UF_NODUMP
@@ -241,7 +244,7 @@ blockest(struct dinode const *dp)
 static void
 mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)
 {
-	register int mode;
+	int mode;
 
 	/*
 	 * Skip inode if we've already marked it for dumping
@@ -267,6 +270,8 @@ mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskip
 		SETINO(ino, dumpdirmap);
 	if (WANTTODUMP(dp, ino)) {
 		SETINO(ino, dumpinomap);
+		if (!MSINCE(dp, spcl.c_ddate))
+			SETINO(ino, metainomap);
 		if (mode != IFREG && mode != IFDIR && mode != IFLNK)
 			*tapesize += 1;
 		else
@@ -335,7 +340,7 @@ mapfiles(dump_ino_t maxino, long *tapesize)
 int
 mapfiles(dump_ino_t maxino, long *tapesize)
 {
-	register dump_ino_t ino;
+	dump_ino_t ino;
 	int anydirskipped = 0;
 
 	for (ino = ROOTINO; ino < maxino; ino++)
@@ -407,8 +412,8 @@ struct mapfile_context {
 static int
 mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
 {
-	register struct dinode const *dp;
-	register int mode;
+	struct dinode const *dp;
+	int mode;
 	errcode_t retval;
 	struct mapfile_context *mfc;
 	ext2_ino_t ino;
@@ -522,12 +527,12 @@ struct mapdirs_context {
 int
 mapdirs(dump_ino_t maxino, long *tapesize)
 {
-	register struct	dinode *dp;
-	register int isdir;
-	register char *map;
-	register dump_ino_t ino;
+	struct	dinode *dp;
+	int isdir;
+	char *map;
+	dump_ino_t ino;
 #ifndef __linux__
-	register int i;
+	int i;
 	long filesize;
 #else
 	struct mapdirs_context mdc;
@@ -606,7 +611,7 @@ static int
 dirindir(dump_ino_t ino, daddr_t blkno, int ind_level, long *filesize)
 {
 	int ret = 0;
-	register int i;
+	int i;
 	daddr_t	idblk[MAXNINDIR];
 
 	bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize);
@@ -691,8 +696,8 @@ searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void
 static int
 searchdir(dump_ino_t ino, daddr_t blkno, long size, long filesize)
 {
-	register struct direct *dp;
-	register long loc, ret = 0;
+	struct direct *dp;
+	long loc, ret = 0;
 	char dblk[MAXBSIZE];
 
 	bread(fsbtodb(sblock, blkno), dblk, (int)size);
@@ -774,7 +779,7 @@ dumponeblock(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
  * Dump the contents of an inode to tape.
  */
 void
-dumpino(struct dinode *dp, dump_ino_t ino)
+dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 {
 	unsigned long cnt;
 	fsizeT size, remaining;
@@ -786,7 +791,12 @@ dumpino(struct dinode *dp, dump_ino_t ino)
 #else
 	int ind_level;
 #endif
-	u_quad_t i_size	= dp->di_size + ((u_quad_t) dp->di_size_high << 32);
+	u_quad_t i_size;
+	
+	if (metaonly)
+		i_size = 0;
+	else 
+		i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32);
 
 	if (newtape) {
 		newtape = 0;
@@ -815,6 +825,15 @@ dumpino(struct dinode *dp, dump_ino_t ino)
 #endif	/* __linux__ */
 	spcl.c_type = TS_INODE;
 	spcl.c_count = 0;
+
+	if (metaonly && (dp->di_mode & S_IFMT)) {
+		spcl.c_flags |= DR_METAONLY;
+		spcl.c_count = 0;
+		writeheader(ino);
+		spcl.c_flags &= ~DR_METAONLY;
+		return;
+	}
+
 	switch (dp->di_mode & S_IFMT) {
 
 	case 0:
@@ -1130,7 +1149,7 @@ dmpindir(dump_ino_t ino, daddr_t blk, int ind_level, fsizeT *size)
 void
 blksout(daddr_t *blkp, int frags, dump_ino_t ino)
 {
-	register daddr_t *bp;
+	daddr_t *bp;
 	int i, j, count, blks, tbperdb;
 
 	blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
@@ -1166,7 +1185,7 @@ blksout(daddr_t *blkp, int frags, dump_ino_t ino)
 void
 dumpmap(char *map, int type, dump_ino_t ino)
 {
-	register int i;
+	int i;
 	char *cp;
 
 	spcl.c_type = type;
@@ -1176,21 +1195,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) {
@@ -1199,7 +1217,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);
 }