X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftraverse.c;h=038c96f1d3c35676620d055dc72fa19e734d0e8e;hb=43460f04f3920ae39f345a2fb39d000a890a4283;hp=69cf6a2a56f0aad024a528a97d3e52a9d97c291c;hpb=0bd5aa901caaf832e40166fc72994c2923cfb159;p=dump.git diff --git a/dump/traverse.c b/dump/traverse.c index 69cf6a2..038c96f 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -41,20 +41,26 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.24 2000/12/05 16:57:38 stelian Exp $"; + "$Id: traverse.c,v 1.26 2001/03/19 13:22:49 stelian Exp $"; #endif /* not lint */ +#include +#include +#include +#ifdef __STDC__ +#include +#include +#endif + #include #include #ifdef __linux__ #include +#include #include #include #include -#define swab32(x) ext2fs_swab32(x) -#else /* __linux__ */ -#define swab32(x) x -#ifdef sunos +#elif defined sunos #include #include @@ -64,22 +70,10 @@ static const char rcsid[] = #include #include #include -#endif #endif /* __linux__ */ #include -#include -#include -#ifdef __STDC__ -#include -#include -#endif - -#ifdef __linux__ -#include -#endif - #include "dump.h" #define HASDUMPEDFILE 0x1 @@ -105,36 +99,66 @@ static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); #endif static void mapfileino __P((ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)); static int exclude_ino __P((ino_t ino)); +extern ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */ +extern int iexclude_num; /* number of elements in list */ -/* #define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 */ -#ifdef EXT3_FEATURE_INCOMPAT_RECOVER +/* Temporary fix waiting for Andreas fixes... */ +#define ext2_ino_t ino_t +#undef EXT3_FEATURE_INCOMPAT_RECOVER + +#ifndef EXT3_FEATURE_COMPAT_HAS_JOURNAL +#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +#endif +#ifndef EXT2_FEATURE_INCOMPAT_FILETYPE +#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 +#endif +#ifndef EXT3_FEATURE_INCOMPAT_RECOVER +#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 #define FORCE_OPEN EXT2_FLAG_FORCE +#define ext2_journal_ino(sb) (*((__u32 *)sb + 0x38)) #else #define FORCE_OPEN 0 +#define ext2_journal_ino(sb) (sb->s_journal_inum) +#endif +#ifndef EXT3_FEATURE_INCOMPAT_JOURNAL_DEV +#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 +#endif + +#ifndef EXT2_LIB_FEATURE_INCOMPAT_SUPP +#define EXT2_LIB_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_RECOVER | \ + EXT2_FEATURE_INCOMPAT_FILETYPE) #endif int dump_fs_open(const char *disk, ext2_filsys *fs) { int retval; - struct ext2fs_sb *s; retval = ext2fs_open(disk, FORCE_OPEN, 0, 0, unix_io_manager, fs); -#if defined(EXT2_LIB_FEATURE_COMPAT_SUPP) && defined(EXT2_LIB_FEATURE_INCOMPAT_SUPP) && defined(EXT2_LIB_FEATURE_RO_COMPAT_SUPP) && defined(EXT2_ET_UNSUPP_FEATURE) && defined(EXT2_ET_RO_UNSUPP_FEATURE) if (!retval) { - s = (struct ext2fs_sb *) (*fs)->super; - if ((s->s_feature_compat & ~EXT2_LIB_FEATURE_COMPAT_SUPP) || -#ifdef EXT3_FEATURE_INCOMPAT_RECOVER - (s->s_feature_incompat & ~(EXT3_FEATURE_INCOMPAT_RECOVER | EXT2_LIB_FEATURE_INCOMPAT_SUPP))) { -#else - (s->s_feature_incompat & ~EXT2_LIB_FEATURE_INCOMPAT_SUPP)) { -#endif + struct ext2_super_block *es = (*fs)->super; + ext2_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"); + 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", + retval); retval = EXT2_ET_UNSUPP_FEATURE; + ext2fs_close(*fs); } - else if (s->s_feature_ro_compat & ~EXT2_LIB_FEATURE_RO_COMPAT_SUPP) { - retval = EXT2_ET_RO_UNSUPP_FEATURE; + else if (es->s_feature_compat & + EXT3_FEATURE_COMPAT_HAS_JOURNAL && journal_ino && + !exclude_ino(journal_ino)) { + iexclude_list[iexclude_num++] = journal_ino; + msg("Added ext3 journal inode %d to exclude list\n", + journal_ino); } } -#endif /* defined && defined && defined... */ return retval; } @@ -149,6 +173,7 @@ long blockest(struct dinode const *dp) { long blkest, sizeest; + u_quad_t i_size; /* * dp->di_size is the size of the file in bytes. @@ -164,19 +189,20 @@ blockest(struct dinode const *dp) * dump blocks (sizeest vs. blkest in the indirect block * calculation). */ - blkest = howmany(dbtob(dp->di_blocks), TP_BSIZE); - sizeest = howmany(dp->di_size, TP_BSIZE); + blkest = howmany((u_quad_t)dp->di_blocks*fs->blocksize, TP_BSIZE); + i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32); + sizeest = howmany(i_size, TP_BSIZE); if (blkest > sizeest) blkest = sizeest; #ifdef __linux__ - if (dp->di_size > fs->blocksize * NDADDR) { + if (i_size > 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)); } #else - if (dp->di_size > sblock->fs_bsize * NDADDR) { + if (i_size > sblock->fs_bsize * NDADDR) { /* calculate the number of indirect blocks on the dump tape */ blkest += howmany(sizeest - NDADDR * sblock->fs_bsize / TP_BSIZE, @@ -186,9 +212,6 @@ blockest(struct dinode const *dp) return (blkest + 1); } -extern ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */ -extern int iexclude_num; /* number of elements in the list */ - /* * This tests whether an inode is in the exclude list */ @@ -682,7 +705,8 @@ struct block_context { * Dump a block to the tape */ static int -dumponeblock(ext2_filsys fs, blk_t *blocknr, int blockcnt, void *private) +dumponeblock(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt, + blk_t ref_block, int ref_offset, void * private) { struct block_context *p; int i; @@ -715,7 +739,7 @@ dumponeblock(ext2_filsys fs, blk_t *blocknr, int blockcnt, void *private) void dumpino(struct dinode *dp, ino_t ino) { - int cnt; + unsigned long cnt; fsizeT size; char buf[TP_BSIZE]; struct old_bsd_inode obi; @@ -724,6 +748,7 @@ dumpino(struct dinode *dp, ino_t ino) #else int ind_level; #endif + u_quad_t i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32); if (newtape) { newtape = 0; @@ -735,7 +760,7 @@ dumpino(struct dinode *dp, ino_t ino) obi.di_mode = dp->di_mode; obi.di_uid = dp->di_uid; obi.di_gid = dp->di_gid; - obi.di_qsize.v = (u_quad_t)dp->di_size; + obi.di_qsize.v = i_size; obi.di_atime = dp->di_atime; obi.di_mtime = dp->di_mtime; obi.di_ctime = dp->di_ctime; @@ -744,7 +769,7 @@ dumpino(struct dinode *dp, ino_t ino) 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 || dp->di_dir_acl) + if (dp->di_file_acl) warn("ACLs in inode #%ld won't be dumped", (long)ino); memmove(&spcl.c_dinode, &obi, sizeof(obi)); #else /* __linux__ */ @@ -771,8 +796,8 @@ dumpino(struct dinode *dp, ino_t ino) * Check for short symbolic link. */ #ifdef __linux__ - if (dp->di_size > 0 && - dp->di_size < EXT2_N_BLOCKS * sizeof (daddr_t)) { + if (i_size > 0 && + i_size < EXT2_N_BLOCKS * sizeof (daddr_t)) { spcl.c_addr[0] = 1; spcl.c_count = 1; writeheader(ino); @@ -800,7 +825,7 @@ dumpino(struct dinode *dp, ino_t ino) case S_IFDIR: #endif case S_IFREG: - if (dp->di_size > 0) + if (i_size) break; /* fall through */ @@ -815,16 +840,16 @@ dumpino(struct dinode *dp, ino_t ino) msg("Warning: undefined file type 0%o\n", dp->di_mode & IFMT); return; } - if (dp->di_size > NDADDR * sblock->fs_bsize) + 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(dp->di_size, sblock->fs_fsize); + cnt = howmany(i_size, sblock->fs_fsize); blksout(&dp->di_db[0], cnt, ino); - if ((size = dp->di_size - NDADDR * sblock->fs_bsize) <= 0) + if ((quad_t) (size = i_size - NDADDR * sblock->fs_bsize) <= 0) return; #ifdef __linux__ bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super); @@ -833,7 +858,7 @@ dumpino(struct dinode *dp, ino_t ino) bc.ino = ino; bc.next_block = NDADDR; - ext2fs_block_iterate (fs, ino, 0, NULL, dumponeblock, (void *)&bc); + ext2fs_block_iterate2(fs, ino, 0, NULL, dumponeblock, (void *)&bc); if (bc.cnt > 0) { blksout (bc.buf, bc.cnt, bc.ino); } @@ -953,7 +978,7 @@ dumpdirino(struct dinode *dp, ino_t ino) 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 || dp->di_dir_acl) + if (dp->di_file_acl) warn("ACLs in inode #%ld won't be dumped", (long)ino); memmove(&spcl.c_dinode, &obi, sizeof(obi)); #else /* __linux__ */ @@ -1017,16 +1042,15 @@ dmpindir(ino_t ino, daddr_t blk, int ind_level, fsizeT *size) */ #if defined(EXT2_FLAG_SWAP_BYTES) if ((fs->flags & EXT2_FLAG_SWAP_BYTES) || - (fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) { + (fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) #endif + { max = sblock->fs_bsize >> 2; swapme = (blk_t *) idblk; for (i = 0; i < max; i++, swapme++) - *swapme = swab32(*swapme); -#if defined(EXT2_FLAG_SWAP_BYTES) + *swapme = ext2fs_swab32(*swapme); } -#endif -#endif +#endif /* __linux__ */ else memset(idblk, 0, (int)sblock->fs_bsize); if (ind_level <= 0) { @@ -1106,29 +1130,20 @@ dumpmap(char *map, int type, ino_t ino) /* * Write a header record to the dump tape. */ +#if defined __linux__ && !defined(int32_t) +#define int32_t __s32 +#endif void writeheader(ino_t ino) { -#ifdef __linux__ - register __s32 sum, cnt, *lp; -#else register int32_t sum, cnt, *lp; -#endif spcl.c_inumber = ino; spcl.c_magic = NFS_MAGIC; spcl.c_checksum = 0; -#ifdef __linux__ - lp = (__s32 *)&spcl; -#else lp = (int32_t *)&spcl; -#endif sum = 0; -#ifdef __linux__ - cnt = sizeof(union u_spcl) / (4 * sizeof(__s32)); -#else cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t)); -#endif while (--cnt >= 0) { sum += *lp++; sum += *lp++;