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

diff --git a/dump/traverse.c b/dump/traverse.c
index 80d7e86..cfa16b3 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.41 2002/01/25 14:59:53 stelian Exp $";
+	"$Id: traverse.c,v 1.47 2002/06/10 14:05:00 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -51,6 +51,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 #endif
+#include <errno.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -143,15 +144,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 +218,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 +245,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 +271,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 +341,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 +413,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 +528,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 +612,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);
@@ -663,12 +669,13 @@ searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void
 		ip = getino(dp->inode);
 		if (TSTINO(dp->inode, dumpinomap)) {
 			CLRINO(dp->inode, dumpinomap);
-			CLRINO(dp->inode, usedinomap);
 			*tapesize -= blockest(ip);
 		}
-		/* Add dir back to the dir map, to propagate nodump */
+		/* Add dir back to the dir map and remove from
+		 * usedinomap to propagate nodump */
 		if ((ip->di_mode & IFMT) == IFDIR) {
 			SETINO(dp->inode, dumpdirmap);
+			CLRINO(dp->inode, usedinomap);
 			*ret |= HASSUBDIRS;
 		}
 	} else {
@@ -691,8 +698,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 +781,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 +793,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 +827,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 +1151,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 +1187,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;
@@ -1258,7 +1279,6 @@ void
 bread(daddr_t blkno, char *buf, int size)
 {
 	int cnt, i;
-	extern int errno;
 
 loop:
 #ifdef	__linux__
@@ -1286,11 +1306,12 @@ loop:
 		goto loop;
 	}
 	if (cnt == -1)
-		msg("read error from %s: %s: [block %d]: count=%d\n",
-			disk, strerror(errno), blkno, size);
+		msg("read error from %s: %s: [block %d, ext2blk %d]: count=%d\n",
+			disk, strerror(errno), blkno, 
+			dbtofsb(sblock, blkno), size);
 	else
-		msg("short read error from %s: [block %d]: count=%d, got=%d\n",
-			disk, blkno, size, cnt);
+		msg("short read error from %s: [block %d, ext2blk %d]: count=%d, got=%d\n",
+			disk, blkno, dbtofsb(sblock, blkno), size, cnt);
 	if (++breaderrors > breademax) {
 		msg("More than %d block read errors from %d\n",
 			breademax, disk);
@@ -1318,11 +1339,12 @@ loop:
 		if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize)
 			continue;
 		if (cnt == -1) {
-			msg("read error from %s: %s: [sector %d]: count=%d\n",
-				disk, strerror(errno), blkno, dev_bsize);
+			msg("read error from %s: %s: [sector %d, ext2blk %d]: count=%d\n",
+				disk, strerror(errno), blkno, 
+				dbtofsb(sblock, blkno), dev_bsize);
 			continue;
 		}
-		msg("short read error from %s: [sector %d]: count=%d, got=%d\n",
-			disk, blkno, dev_bsize, cnt);
+		msg("short read error from %s: [sector %d, ext2blk %d]: count=%d, got=%d\n",
+			disk, blkno, dbtofsb(sblock, blkno), dev_bsize, cnt);
 	}
 }