X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftraverse.c;h=6ed1d287f3d572cbb7ec7f08cc4538ba9f36bc9e;hp=c8547604a7c0751f14833407938e762acf1ca56f;hb=b0e0d7757fe7cdc08be0269f37a7193e07fb1bb3;hpb=0cedbda5e645e6a30ef47fa3e0fae683160d4431

diff --git a/dump/traverse.c b/dump/traverse.c
index c854760..6ed1d28 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -18,11 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -41,16 +37,18 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.44 2002/04/04 08:20:23 stelian Exp $";
+	"$Id: traverse.c,v 1.71 2010/06/10 12:17:35 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <sys/types.h>
 #ifdef __STDC__
 #include <string.h>
 #include <unistd.h>
 #endif
+#include <errno.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -101,12 +99,13 @@ static	int dirindir __P((dump_ino_t ino, daddr_t blkno, int level, long *size));
 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 mapfileino __P((dump_ino_t ino, struct dinode const *dp, long 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)
 #else
-#define ext2_journal_ino(sb) (*((__u32 *)sb + 0x38))
+#define ext2_journal_ino(sb) (*((u_int32_t *)sb + 0x38))
 #endif
 #ifndef HAVE_EXT2_INO_T
 typedef ino_t ext2_ino_t;
@@ -132,6 +131,17 @@ typedef ino_t ext2_ino_t;
 #ifndef EXT2_RESIZE_INO
 #define EXT2_RESIZE_INO			7
 #endif
+#ifndef EXT2_FT_UNKNOWN
+#define EXT2_FT_UNKNOWN		0
+#define EXT2_FT_REG_FILE 	1
+#define EXT2_FT_DIR		2
+#define EXT2_FT_CHRDEV		3
+#define EXT2_FT_BLKDEV		4
+#define EXT2_FT_FIFO		5
+#define EXT2_FT_SOCK		6
+#define EXT2_FT_SYMLINK		7
+#define EXT2_FT_MAX		8
+#endif
 
 int dump_fs_open(const char *disk, ext2_filsys *fs)
 {
@@ -193,17 +203,25 @@ blockest(struct dinode const *dp)
 	 *	dump blocks (sizeest vs. blkest in the indirect block
 	 *	calculation).
 	 */
-	blkest = howmany((u_quad_t)dp->di_blocks*fs->blocksize, TP_BSIZE);
+	blkest = howmany((u_quad_t)dp->di_blocks * 512, fs->blocksize) * (fs->blocksize / TP_BSIZE);
 	i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32);
-	sizeest = howmany(i_size, TP_BSIZE);
+	sizeest = howmany(i_size, fs->blocksize) * (fs->blocksize / TP_BSIZE);
 	if (blkest > sizeest)
 		blkest = sizeest;
 #ifdef	__linux__
-	if (i_size > fs->blocksize * NDADDR) {
+	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 +=
 			howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE,
-			NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super));
+			TP_NINDIR);
 	}
 #else
 	if (i_size > sblock->fs_bsize * NDADDR) {
@@ -222,7 +240,7 @@ blockest(struct dinode const *dp)
 #define MSINCE(dp, t) \
 	((dp)->di_mtime >= (t))
 #define	CHANGEDSINCE(dp, t) \
-	(CSINCE(dp, t) || MSINCE(dp, t))
+	CSINCE(dp, t)
 
 /* The NODUMP_FLAG macro tests if a file has the nodump flag. */
 #ifdef UF_NODUMP
@@ -233,7 +251,7 @@ blockest(struct dinode const *dp)
 
 /* The WANTTODUMP macro decides whether a file should be dumped. */
 #define	WANTTODUMP(dp, ino) \
-	(CHANGEDSINCE(dp, spcl.c_ddate) && \
+	(CHANGEDSINCE(dp, ((u_int32_t)spcl.c_ddate)) && \
 	 (!NODUMP_FLAG(dp)) && \
 	 (!exclude_ino(ino)))
 
@@ -242,7 +260,7 @@ blockest(struct dinode const *dp)
  * copy of the given inode, or be NULL (in which case it is fetched.)
  */
 static void
-mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)
+mapfileino(dump_ino_t ino, struct dinode const *dp, long long *tapesize, int *dirskipped)
 {
 	int mode;
 
@@ -266,11 +284,14 @@ 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)) {
 		SETINO(ino, dumpinomap);
-		if (!MSINCE(dp, spcl.c_ddate))
+		if (!MSINCE(dp, (u_int32_t)spcl.c_ddate))
 			SETINO(ino, metainomap);
 		if (mode != IFREG && mode != IFDIR && mode != IFLNK)
 			*tapesize += 1;
@@ -279,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;
 	}
@@ -294,7 +315,7 @@ mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskip
  */
 #ifdef __linux__
 int
-mapfiles(dump_ino_t maxino, long *tapesize)
+mapfiles(UNUSED(dump_ino_t maxino), long long *tapesize)
 {
 	ext2_ino_t ino;
 	int anydirskipped = 0;
@@ -338,7 +359,7 @@ mapfiles(dump_ino_t maxino, long *tapesize)
 }
 #else
 int
-mapfiles(dump_ino_t maxino, long *tapesize)
+mapfiles(dump_ino_t maxino, long long *tapesize)
 {
 	dump_ino_t ino;
 	int anydirskipped = 0;
@@ -357,7 +378,7 @@ mapfiles(dump_ino_t maxino, long *tapesize)
 
 #ifdef __linux__
 int
-maponefile(dump_ino_t maxino, long *tapesize, char *directory)
+maponefile(UNUSED(dump_ino_t maxino), long long *tapesize, char *directory)
 {
 	errcode_t retval;
 	ext2_ino_t dir_ino;
@@ -367,7 +388,7 @@ maponefile(dump_ino_t maxino, long *tapesize, char *directory)
 	/*
 	 * Mark every directory in the path as being dumped
 	 */
-	for (i = 0; i < strlen (directory); i++) {
+	for (i = 0; i < (int)strlen (directory); i++) {
 		if (directory[i] == '/') {
 			strncpy (dir_name, directory, i);
 			dir_name[i] = '\0';
@@ -405,12 +426,13 @@ maponefile(dump_ino_t maxino, long *tapesize, char *directory)
 
 #ifdef	__linux__
 struct mapfile_context {
-	long *tapesize;
+	long long *tapesize;
 	int *anydirskipped;
 };
 
 static int
-mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
+mapfilesindir(struct ext2_dir_entry *dirent, UNUSED(int offset), 
+	      UNUSED(int blocksize), UNUSED(char *buf), void *private)
 {
 	struct dinode const *dp;
 	int mode;
@@ -446,7 +468,7 @@ mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *bu
  * the directories in the filesystem.
  */
 int
-mapfilesfromdir(dump_ino_t maxino, long *tapesize, char *directory)
+mapfilesfromdir(UNUSED(dump_ino_t maxino), long long *tapesize, char *directory)
 {
 	errcode_t retval;
 	struct mapfile_context mfc;
@@ -457,7 +479,7 @@ mapfilesfromdir(dump_ino_t maxino, long *tapesize, char *directory)
 	/*
 	 * Mark every directory in the path as being dumped
 	 */
-	for (i = 0; i < strlen (directory); i++) {
+	for (i = 0; i < (int)strlen (directory); i++) {
 		if (directory[i] == '/') {
 			strncpy (dir_name, directory, i);
 			dir_name[i] = '\0';
@@ -508,7 +530,7 @@ mapfilesfromdir(dump_ino_t maxino, long *tapesize, char *directory)
 struct mapdirs_context {
 	int *ret;
 	int nodump;
-	long *tapesize;
+	long long *tapesize;
 };
 #endif
 
@@ -525,7 +547,7 @@ struct mapdirs_context {
  * pass using this algorithm.
  */
 int
-mapdirs(dump_ino_t maxino, long *tapesize)
+mapdirs(dump_ino_t maxino, long long *tapesize)
 {
 	struct	dinode *dp;
 	int isdir;
@@ -552,9 +574,10 @@ mapdirs(dump_ino_t maxino, long *tapesize)
 		 * in usedinomap, but we have to go through it anyway 
 	 	 * to propagate the nodump attribute.
 		 */
+		if ((isdir & 1) == 0)
+			continue;
 		nodump = (TSTINO(ino, usedinomap) == 0);
-		if ((isdir & 1) == 0 ||
-		    (TSTINO(ino, dumpinomap) && nodump == 0))
+		if (TSTINO(ino, dumpinomap) && nodump == 0)
 			continue;
 		dp = getino(ino);
 #ifdef	__linux__
@@ -645,11 +668,12 @@ dirindir(dump_ino_t ino, daddr_t blkno, int ind_level, long *filesize)
  */
 #ifdef	__linux__
 static	int
-searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private)
+searchdir(struct ext2_dir_entry *dp, UNUSED(int offset), 
+	  UNUSED(int blocksize), UNUSED(char *buf), void *private)
 {
 	struct mapdirs_context *mdc;
 	int *ret;
-	long *tapesize;
+	long long *tapesize;
 	struct dinode *ip;
 
 	mdc = (struct mapdirs_context *)private;
@@ -668,12 +692,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 {
@@ -747,14 +772,12 @@ struct block_context {
  * Dump a block to the tape
  */
 static int
-dumponeblock(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
-	     blk_t ref_block, int ref_offset, void * private)
+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;
 	p = (struct block_context *)private;
 	for (i = p->next_block; i < blockcnt; i++) {
 		p->buf[p->cnt++] = 0;
@@ -773,6 +796,70 @@ dumponeblock(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);
+			for (i = 0; i < spcl.c_count; i++)
+				spcl.c_addr[i] = 1;
+			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.
  *
@@ -784,7 +871,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	unsigned long cnt;
 	fsizeT size, remaining;
 	char buf[TP_BSIZE];
-	struct old_bsd_inode obi;
+	struct new_bsd_inode nbi;
 	int i;
 #ifdef	__linux__
 	struct block_context bc;
@@ -804,22 +891,22 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	}
 	CLRINO(ino, dumpinomap);
 #ifdef	__linux__
-	memset(&obi, 0, sizeof(obi));
-	obi.di_mode = dp->di_mode;
-	obi.di_uid = dp->di_uid;
-	obi.di_gid = dp->di_gid;
-	obi.di_qsize.v = i_size;
-	obi.di_atime = dp->di_atime;
-	obi.di_mtime = dp->di_mtime;
-	obi.di_ctime = dp->di_ctime;
-	obi.di_nlink = dp->di_nlink;
-	obi.di_blocks = dp->di_blocks;
-	obi.di_flags = dp->di_flags;
-	obi.di_gen = dp->di_gen;
-	memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
-	if (dp->di_file_acl)
-		warn("ACLs in inode #%ld won't be dumped", (long)ino);
-	memmove(&spcl.c_dinode, &obi, sizeof(obi));
+	memset(&nbi, 0, sizeof(nbi));
+	nbi.di_mode = dp->di_mode;
+	nbi.di_nlink = dp->di_nlink;
+	nbi.di_ouid = dp->di_uid;
+	nbi.di_ogid = dp->di_gid;
+	nbi.di_size = i_size;
+	nbi.di_atime.tv_sec = dp->di_atime;
+	nbi.di_mtime.tv_sec = dp->di_mtime;
+	nbi.di_ctime.tv_sec = dp->di_ctime;
+	memmove(&nbi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
+	nbi.di_flags = dp->di_flags;
+	nbi.di_blocks = dp->di_blocks;
+	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;
+	memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else	/* __linux__ */
 	spcl.c_dinode = *dp;
 #endif	/* __linux__ */
@@ -827,11 +914,11 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	spcl.c_count = 0;
 
 	if (metaonly && (dp->di_mode & S_IFMT)) {
-		printf("Write header with spcl.c_count=%d\n",spcl.c_count);
 		spcl.c_flags |= DR_METAONLY;
 		spcl.c_count = 0;
 		writeheader(ino);
 		spcl.c_flags &= ~DR_METAONLY;
+		dump_xattr(ino, dp);
 		return;
 	}
 
@@ -862,6 +949,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__ */
@@ -892,23 +980,13 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	case S_IFCHR:
 	case S_IFBLK:
 		writeheader(ino);
+		dump_xattr(ino, dp);
 		return;
 
 	default:
 		msg("Warning: undefined file type 0%o\n", dp->di_mode & IFMT);
 		return;
 	}
-	if (i_size > NDADDR * sblock->fs_bsize)
-#ifdef	__linux__
-		cnt = NDADDR * EXT2_FRAGS_PER_BLOCK(fs->super);
-#else
-		cnt = NDADDR * sblock->fs_frag;
-#endif
-	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)
-		return;
 #ifdef	__linux__
 	bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);
 	bc.buf = (int *)malloc (bc.max * sizeof (int));
@@ -916,11 +994,11 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
 	bc.ino = ino;
 	bc.next_block = NDADDR;
 
-	ext2fs_block_iterate2(fs, (ext2_ino_t)ino, 0, NULL, dumponeblock, (void *)&bc);
+	ext2fs_block_iterate2(fs, (ext2_ino_t)ino, BLOCK_FLAG_DATA_ONLY, NULL, dumponeblock, (void *)&bc);
 	/* deal with holes at the end of the inode */
 	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++) {
+		for (i = 0; i < (int)howmany(remaining, sblock->fs_fsize); i++) {
 			bc.buf[bc.cnt++] = 0;
 			if (bc.cnt == bc.max) {
 				blksout (bc.buf, bc.cnt, bc.ino);
@@ -932,7 +1010,17 @@ 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
+	if (i_size > (u_quad_t)NDADDR * sblock->fs_bsize)
+		cnt = NDADDR * sblock->fs_frag;
+	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) {
+		dump_xattr(ino, dp);
+		return;
+	}
 	for (ind_level = 0; ind_level < NIADDR; ind_level++) {
 		dmpindir(ino, dp->di_ib[ind_level], ind_level, &size);
 		if (size <= 0)
@@ -957,25 +1045,56 @@ struct convert_dir_context {
  * size of the entry, and creates it in a temporary buffer
  */
 static int
-convert_dir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
+convert_dir(struct ext2_dir_entry *dirent, UNUSED(int offset), 
+	    UNUSED(int blocksize), UNUSED(char *buf), void *private)
 {
 	struct convert_dir_context *p;
-	struct olddirect *dp;
+	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);
 	if (((p->offset + reclen - 1) / p->bs) != (p->offset / p->bs)) {
-		dp = (struct olddirect *)(p->buf + p->prev_offset);
+		dp = (struct direct *)(p->buf + p->prev_offset);
 		dp->d_reclen += p->bs - (p->offset % p->bs);
 		p->offset += p->bs - (p->offset % p->bs);
 	}
 
-	dp = (struct olddirect *)(p->buf + p->offset);
+	dp = (struct direct *)(p->buf + p->offset);
 	dp->d_ino = dirent->inode;
 	dp->d_reclen = reclen;
 	dp->d_namlen = dirent->name_len & 0xFF;
+	switch ((dirent->name_len & 0xFF00) >> 8) {
+	default:
+		dp->d_type = DT_UNKNOWN;
+		break;
+	case EXT2_FT_REG_FILE:
+		dp->d_type = DT_REG;
+		break;
+	case EXT2_FT_DIR:
+		dp->d_type = DT_DIR;
+		break;
+	case EXT2_FT_CHRDEV:
+		dp->d_type = DT_CHR;
+		break;
+	case EXT2_FT_BLKDEV:
+		dp->d_type = DT_BLK;
+		break;
+	case EXT2_FT_FIFO:
+		dp->d_type = DT_FIFO;
+		break;
+	case EXT2_FT_SOCK:
+		dp->d_type = DT_SOCK;
+		break;
+	case EXT2_FT_SYMLINK:
+		dp->d_type = DT_LNK;
+		break;
+	}
 	strncpy(dp->d_name, dirent->name, dp->d_namlen);
 	dp->d_name[dp->d_namlen] = '\0';
 	p->prev_offset = p->offset;
@@ -994,7 +1113,7 @@ dumpdirino(struct dinode *dp, dump_ino_t ino)
 {
 	fsizeT size;
 	char buf[TP_BSIZE];
-	struct old_bsd_inode obi;
+	struct new_bsd_inode nbi;
 	struct convert_dir_context cdc;
 	errcode_t retval;
 	struct ext2_dir_entry *de;
@@ -1034,22 +1153,22 @@ dumpdirino(struct dinode *dp, dump_ino_t ino)
 	dir_size = cdc.offset;
 
 #ifdef	__linux__
-	memset(&obi, 0, sizeof(obi));
-	obi.di_mode = dp->di_mode;
-	obi.di_uid = dp->di_uid;
-	obi.di_gid = dp->di_gid;
-	obi.di_qsize.v = dir_size; /* (u_quad_t)dp->di_size; */
-	obi.di_atime = dp->di_atime;
-	obi.di_mtime = dp->di_mtime;
-	obi.di_ctime = dp->di_ctime;
-	obi.di_nlink = dp->di_nlink;
-	obi.di_blocks = dp->di_blocks;
-	obi.di_flags = dp->di_flags;
-	obi.di_gen = dp->di_gen;
-	memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
-	if (dp->di_file_acl)
-		warn("ACLs in inode #%ld won't be dumped", (long)ino);
-	memmove(&spcl.c_dinode, &obi, sizeof(obi));
+	memset(&nbi, 0, sizeof(nbi));
+	nbi.di_mode = dp->di_mode;
+	nbi.di_nlink = dp->di_nlink;
+	nbi.di_ouid = dp->di_uid;
+	nbi.di_ogid = dp->di_gid;
+	nbi.di_size = dir_size; /* (u_quad_t)dp->di_size; */
+	nbi.di_atime.tv_sec = dp->di_atime;
+	nbi.di_mtime.tv_sec = dp->di_mtime;
+	nbi.di_ctime.tv_sec = dp->di_ctime;
+	memmove(&nbi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
+	nbi.di_flags = dp->di_flags;
+	nbi.di_blocks = dp->di_blocks;
+	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;
+	memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else	/* __linux__ */
 	spcl.c_dinode = *dp;
 #endif	/* __linux__ */
@@ -1085,6 +1204,7 @@ dumpdirino(struct dinode *dp, dump_ino_t ino)
 	}
 
 	(void)free(cdc.buf);
+	dump_xattr(ino, dp);
 }
 #endif	/* __linux__ */
 
@@ -1148,9 +1268,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);
@@ -1191,12 +1311,13 @@ 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);
 }
 
-#if defined __linux__ && !defined(int32_t)
+#if defined(__linux__) && !defined(int32_t)
 #define int32_t __s32
 #endif
 
@@ -1241,7 +1362,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);
@@ -1269,21 +1394,20 @@ 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;
 
 void
-bread(daddr_t blkno, char *buf, int size)
+bread(ext2_loff_t blkno, char *buf, int size)
 {
 	int cnt, i;
-	extern int errno;
 
 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))
@@ -1306,12 +1430,13 @@ 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);
-	if (++breaderrors > breademax) {
+		msg("short read error from %s: [block %d, ext2blk %d]: count=%d, got=%d\n",
+			disk, blkno, dbtofsb(sblock, blkno), size, cnt);
+	if (breademax && ++breaderrors > breademax) {
 		msg("More than %d block read errors from %d\n",
 			breademax, disk);
 		broadcast("DUMP IS AILING!\n");
@@ -1328,8 +1453,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))
@@ -1338,11 +1463,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);
 	}
 }