X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftraverse.c;h=a49434bdd50943ab9ee95353933132c4308fe9de;hb=109e9e1d1a904627eeae4d519a0f694795b2892c;hp=3c0c378cb66b1c4a7dfdfb2f08deb34e2ad82417;hpb=b9c89cf40bc9563ad83acfede581627718d656ee;p=dump.git diff --git a/dump/traverse.c b/dump/traverse.c index 3c0c378..a49434b 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -2,7 +2,8 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000 */ /*- @@ -40,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.13 2000/01/13 09:38:26 stelian Exp $"; + "$Id: traverse.c,v 1.23 2000/12/04 15:43:16 stelian Exp $"; #endif /* not lint */ #include @@ -84,11 +85,15 @@ static const char rcsid[] = #define HASDUMPEDFILE 0x1 #define HASSUBDIRS 0x2 +#ifdef __linux__ +typedef u_quad_t fsizeT; +#else #ifdef FS_44INODEFMT typedef quad_t fsizeT; #else typedef long fsizeT; #endif +#endif #ifdef __linux__ static int searchdir __P((struct ext2_dir_entry *dp, int offset, @@ -99,19 +104,22 @@ static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size)); static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); #endif static void mapfileino __P((ino_t ino, long *tapesize, int *dirskipped)); +static int exclude_ino __P((ino_t ino)); -/* #define EXT3_FEATURE_INCOMPAT_RECOVER */ +/* #define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 */ +#ifdef EXT3_FEATURE_INCOMPAT_RECOVER +#define FORCE_OPEN EXT2_FLAG_FORCE +#else +#define FORCE_OPEN 0 +#endif int dump_fs_open(const char *disk, ext2_filsys *fs) { int retval; struct ext2fs_sb *s; -#ifdef EXT3_FEATURE_INCOMPAT_RECOVER - retval = ext2fs_open(disk, EXT2_FLAG_FORCE, 0, 0, unix_io_manager, fs); -#else - retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, fs); -#endif + 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) || @@ -126,6 +134,7 @@ int dump_fs_open(const char *disk, ext2_filsys *fs) retval = EXT2_ET_RO_UNSUPP_FEATURE; } } +#endif /* defined && defined && defined... */ return retval; } @@ -164,7 +173,7 @@ blockest(struct dinode *dp) /* calculate the number of indirect blocks on the dump tape */ blkest += howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE, - TP_NINDIR); + NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super)); } #else if (dp->di_size > sblock->fs_bsize * NDADDR) { @@ -177,19 +186,42 @@ blockest(struct dinode *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 + */ +int +exclude_ino(ino_t ino) +{ + /* 04-Feb-00 ILC */ + if (iexclude_num) { /* if there are inodes in the exclude list */ + int idx; /* then check this inode against it */ + for (idx = 0; idx < iexclude_num; idx++) + if (ino == iexclude_list[idx]) + return 1; + } + return 0; +} + /* Auxiliary macro to pick up files changed since previous dump. */ #define CHANGEDSINCE(dp, t) \ ((dp)->di_mtime >= (t) || (dp)->di_ctime >= (t)) -/* The WANTTODUMP macro decides whether a file should be dumped. */ +/* The NODUMP_FLAG macro tests if a file has the nodump flag. */ #ifdef UF_NODUMP -#define WANTTODUMP(dp) \ - (CHANGEDSINCE(dp, spcl.c_ddate) && \ - (nonodump || ((dp)->di_flags & UF_NODUMP) != UF_NODUMP)) +#define NODUMP_FLAG(dp) (!nonodump && (((dp)->di_flags & UF_NODUMP) == UF_NODUMP)) #else -#define WANTTODUMP(dp) CHANGEDSINCE(dp, spcl.c_ddate) +#define NODUMP_FLAG(dp) 0 #endif +/* The WANTTODUMP macro decides whether a file should be dumped. */ +#define WANTTODUMP(dp, ino) \ + (CHANGEDSINCE(dp, spcl.c_ddate) && \ + (!NODUMP_FLAG(dp)) && \ + (!exclude_ino(ino))) + /* * Determine if given inode should be dumped */ @@ -217,9 +249,10 @@ mapfileino(ino_t ino, long *tapesize, int *dirskipped) * to the usedinomap. */ SETINO(ino, usedinomap); + if (mode == IFDIR) SETINO(ino, dumpdirmap); - if (WANTTODUMP(dp)) { + if (WANTTODUMP(dp, ino)) { SETINO(ino, dumpinomap); if (mode != IFREG && mode != IFDIR && mode != IFLNK) *tapesize += 1; @@ -228,10 +261,8 @@ mapfileino(ino_t ino, long *tapesize, int *dirskipped) return; } if (mode == IFDIR) { -#ifdef UF_NODUMP - if (!nonodump && (dp->di_flags & UF_NODUMP)) + if ( NODUMP_FLAG(dp) || exclude_ino(ino) ) CLRINO(ino, usedinomap); -#endif *dirskipped = 1; } } @@ -788,22 +819,21 @@ static int convert_dir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private) { struct convert_dir_context *p; - struct direct *dp; + struct olddirect *dp; int reclen; 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 direct *)(p->buf + p->prev_offset); + dp = (struct olddirect *)(p->buf + p->prev_offset); dp->d_reclen += p->bs - (p->offset % p->bs); p->offset += p->bs - (p->offset % p->bs); } - dp = (struct direct *)(p->buf + p->offset); + dp = (struct olddirect *)(p->buf + p->offset); dp->d_ino = dirent->inode; dp->d_reclen = reclen; - dp->d_type = 0; dp->d_namlen = dirent->name_len & 0xFF; strncpy(dp->d_name, dirent->name, dp->d_namlen); dp->d_name[dp->d_namlen] = '\0';