#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.15 2000/02/04 20:22:21 stelian Exp $";
+ "$Id: traverse.c,v 1.20 2000/09/26 13:17:09 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
#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,
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 */
#else
retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, fs);
#endif
+#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) ||
retval = EXT2_ET_RO_UNSUPP_FEATURE;
}
}
+#endif /* defined && defined && defined... */
return retval;
}
/* 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) {
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
-extern ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */
-extern int iexclude_num; /* number of elements in the list */
+/* 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
*/
SETINO(ino, usedinomap);
- /* 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]) {
- msg("Excluding inode number %d\n", ino);
- return; /* if in list then skip */
- }
- }
- }
-
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;
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;
}
}
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';