X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftraverse.c;h=64c32a5b75fc253e0ef4864c58f9c9c1b3fe81e3;hp=fb868dba4050aec08cc81ae8a961cc5eb6045f19;hb=cca7148b36e60b4671518602ff9a7c2d0c22a7b2;hpb=4acaf865a54528c32e3f2650007462c97f86a933

diff --git a/dump/traverse.c b/dump/traverse.c
index fb868db..64c32a5 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.57 2004/03/01 15:38:13 stelian Exp $";
+	"$Id: traverse.c,v 1.66 2005/05/02 15:10:46 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -100,6 +100,7 @@ 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 void dump_xattr __P((dump_ino_t ino, struct dinode *dp));
 
 #ifdef HAVE_EXT2_JOURNAL_INUM
 #define ext2_journal_ino(sb) (sb->s_journal_inum)
@@ -208,6 +209,14 @@ blockest(struct dinode const *dp)
 	if (blkest > sizeest)
 		blkest = sizeest;
 #ifdef	__linux__
+	if ((dp->di_mode & IFMT) == IFDIR) {
+		/*
+		 * for directories, assume only half of space is filled
+		 * with entries.  
+		 */
+		 blkest = blkest / 2;
+		 sizeest = sizeest / 2;
+	}
 	if (i_size > (u_quad_t)fs->blocksize * NDADDR) {
 		/* calculate the number of indirect blocks on the dump tape */
 		blkest +=
@@ -275,6 +284,9 @@ mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskip
 	 */
 	SETINO(ino, usedinomap);
 
+	if (NODUMP_FLAG(dp))
+		do_exclude_ino(ino, "nodump attribute");
+
 	if (mode == IFDIR)
 		SETINO(ino, dumpdirmap);
 	if (WANTTODUMP(dp, ino)) {
@@ -288,7 +300,7 @@ mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskip
 		return;
 	}
 	if (mode == IFDIR) {
-		if ( NODUMP_FLAG(dp) || exclude_ino(ino) )
+		if (exclude_ino(ino))
 			CLRINO(ino, usedinomap);
 		*dirskipped = 1;
 	}
@@ -763,7 +775,7 @@ dumponeblock(UNUSED(ext2_filsys fs), blk_t *blocknr, e2_blkcnt_t blockcnt,
 	     UNUSED(blk_t ref_block), UNUSED(int ref_offset), void * private)
 {
 	struct block_context *p;
-	int i;
+	e2_blkcnt_t i;
 
 	if (blockcnt < NDADDR)
 		return 0;
@@ -785,6 +797,68 @@ dumponeblock(UNUSED(ext2_filsys fs), blk_t *blocknr, e2_blkcnt_t blockcnt,
 }
 #endif
 
+static void
+dump_xattr(dump_ino_t ino, struct dinode *dp) {
+
+	if (dp->di_extraisize != 0) {
+#ifdef HAVE_EXT2FS_READ_INODE_FULL
+		char inode[EXT2_INODE_SIZE(fs->super)];
+		errcode_t err;
+		u_int32_t *magic;
+
+		memset(inode, 0, EXT2_INODE_SIZE(fs->super));
+		err = ext2fs_read_inode_full(fs, (ext2_ino_t)ino,
+					     (struct ext2_inode *) inode,
+					     EXT2_INODE_SIZE(fs->super));
+		if (err) {
+			com_err(disk, err, "while reading inode #%ld\n", (long)ino);
+			exit(X_ABORT);
+		}
+
+		magic = (void *)inode + EXT2_GOOD_OLD_INODE_SIZE + dp->di_extraisize;
+		if (*magic == EXT2_XATTR_MAGIC) {
+			char xattr[EXT2_INODE_SIZE(fs->super)];
+			int i;
+			char *cp;
+
+			if (vflag)
+				msg("dumping EA (inode) in inode #%ld\n", (long)ino);
+			memset(xattr, 0, EXT2_INODE_SIZE(fs->super));
+			memcpy(xattr, (void *)magic,
+			       EXT2_INODE_SIZE(fs->super) - 
+			       (EXT2_GOOD_OLD_INODE_SIZE + dp->di_extraisize));
+			magic = (u_int32_t *)xattr;
+			*magic = EXT2_XATTR_MAGIC2;
+
+			spcl.c_type = TS_INODE;
+			spcl.c_dinode.di_size = EXT2_INODE_SIZE(fs->super);
+			spcl.c_flags |= DR_EXTATTRIBUTES;
+			spcl.c_extattributes = EXT_XATTR;
+			spcl.c_count = howmany(EXT2_INODE_SIZE(fs->super), TP_BSIZE);
+			writeheader(ino);
+			for (i = 0, cp = xattr; i < spcl.c_count; i++, cp += TP_BSIZE)
+				writerec(cp, 0);
+			spcl.c_flags &= ~DR_EXTATTRIBUTES;
+			spcl.c_extattributes = 0;
+		}
+#endif
+	}
+
+	if (dp->di_file_acl) {
+
+		if (vflag)
+			msg("dumping EA (block) in inode #%ld\n", (long)ino);
+
+		spcl.c_type = TS_INODE;
+		spcl.c_dinode.di_size = sblock->fs_bsize;
+		spcl.c_flags |= DR_EXTATTRIBUTES;
+		spcl.c_extattributes = EXT_XATTR;
+		blksout(&dp->di_file_acl, EXT2_FRAGS_PER_BLOCK(fs->super), ino);
+		spcl.c_flags &= ~DR_EXTATTRIBUTES;
+		spcl.c_extattributes = 0;
+	}
+}
+
 /*
  * Dump passes 3 and 4.
  *
@@ -831,8 +905,6 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	nbi.di_gen = dp->di_gen;
 	nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid;
 	nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid;
-	if (dp->di_file_acl)
-		msg("ACLs in inode #%ld won't be dumped\n", (long)ino);
 	memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else	/* __linux__ */
 	spcl.c_dinode = *dp;
@@ -845,6 +917,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 		spcl.c_count = 0;
 		writeheader(ino);
 		spcl.c_flags &= ~DR_METAONLY;
+		dump_xattr(ino, dp);
 		return;
 	}
 
@@ -875,6 +948,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 			memmove(buf, dp->di_db, (u_long)dp->di_size);
 			buf[dp->di_size] = '\0';
 			writerec(buf, 0);
+			dump_xattr(ino, dp);
 			return;
 		}
 #endif	/* __linux__ */
@@ -905,6 +979,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	case S_IFCHR:
 	case S_IFBLK:
 		writeheader(ino);
+		dump_xattr(ino, dp);
 		return;
 
 	default:
@@ -920,8 +995,10 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	else
 		cnt = howmany(i_size, sblock->fs_fsize);
 	blksout(&dp->di_db[0], cnt, ino);
-	if ((quad_t) (size = i_size - NDADDR * sblock->fs_bsize) <= 0)
+	if ((quad_t) (size = i_size - NDADDR * sblock->fs_bsize) <= 0) {
+		dump_xattr(ino, dp);
 		return;
+	}
 #ifdef	__linux__
 	bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);
 	bc.buf = (int *)malloc (bc.max * sizeof (int));
@@ -945,6 +1022,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 		blksout (bc.buf, bc.cnt, bc.ino);
 	}
 	free(bc.buf);
+	dump_xattr(ino, dp);
 #else
 	for (ind_level = 0; ind_level < NIADDR; ind_level++) {
 		dmpindir(ino, dp->di_ib[ind_level], ind_level, &size);
@@ -977,6 +1055,10 @@ convert_dir(struct ext2_dir_entry *dirent, UNUSED(int offset),
 	struct direct *dp;
 	int reclen;
 
+	/* do not save entries to excluded inodes */
+	if (exclude_ino(dirent->inode))
+		return 0;
+
 	p = (struct convert_dir_context *)private;
 
 	reclen = EXT2_DIR_REC_LEN((dirent->name_len & 0xFF) + 1);
@@ -1089,8 +1171,6 @@ dumpdirino(struct dinode *dp, dump_ino_t ino)
 	nbi.di_gen = dp->di_gen;
 	nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid;
 	nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid;
-	if (dp->di_file_acl)
-		msg("ACLs in inode #%ld won't be dumped\n", (long)ino);
 	memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else	/* __linux__ */
 	spcl.c_dinode = *dp;
@@ -1127,6 +1207,7 @@ dumpdirino(struct dinode *dp, dump_ino_t ino)
 	}
 
 	(void)free(cdc.buf);
+	dump_xattr(ino, dp);
 }
 #endif	/* __linux__ */
 
@@ -1190,9 +1271,9 @@ dmpindir(dump_ino_t ino, daddr_t blk, int ind_level, fsizeT *size)
  * Collect up the data into tape record sized buffers and output them.
  */
 void
-blksout(daddr_t *blkp, int frags, dump_ino_t ino)
+blksout(blk_t *blkp, int frags, dump_ino_t ino)
 {
-	daddr_t *bp;
+	blk_t *bp;
 	int i, j, count, blks, tbperdb;
 
 	blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
@@ -1233,6 +1314,7 @@ dumpmap(char *map, int type, dump_ino_t ino)
 
 	spcl.c_type = type;
 	spcl.c_count = howmany(mapsize * sizeof(char), TP_BSIZE);
+	spcl.c_dinode.di_size = mapsize;
 	writeheader(ino);
 	for (i = 0, cp = map; i < spcl.c_count; i++, cp += TP_BSIZE)
 		writerec(cp, 0);
@@ -1283,7 +1365,11 @@ getino(dump_ino_t inum)
 	errcode_t err;
 
 	curino = inum;
+#ifdef HAVE_EXT2FS_READ_INODE_FULL
+	err = ext2fs_read_inode_full(fs, (ext2_ino_t)inum, (struct ext2_inode *) &dinode, sizeof(struct dinode));
+#else
 	err = ext2fs_read_inode(fs, (ext2_ino_t)inum, (struct ext2_inode *) &dinode);
+#endif
 	if (err) {
 		com_err(disk, err, "while reading inode #%ld\n", (long)inum);
 		exit(X_ABORT);
@@ -1317,14 +1403,14 @@ getino(dump_ino_t inum)
 int	breaderrors = 0;
 
 void
-bread(daddr_t blkno, char *buf, int size)
+bread(ext2_loff_t blkno, char *buf, int size)
 {
 	int cnt, i;
 
 loop:
 #ifdef	__linux__
-	if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
-			(((ext2_loff_t)blkno) << dev_bshift))
+	if (ext2fs_llseek(diskfd, (blkno << dev_bshift), 0) !=
+			(blkno << dev_bshift))
 #else
 	if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
 						((off_t)blkno << dev_bshift))
@@ -1370,8 +1456,8 @@ loop:
 	memset(buf, 0, size);
 	for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
 #ifdef	__linux__
-		if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
-				(((ext2_loff_t)blkno) << dev_bshift))
+		if (ext2fs_llseek(diskfd, (blkno << dev_bshift), 0) !=
+				(blkno << dev_bshift))
 #else
 		if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
 						((off_t)blkno << dev_bshift))