* Ported to Linux's Second Extended File System as part of the
* dump and restore backup suit
* Remy Card <card@Linux.EU.Org>, 1994-1997
- * Stelian Pop <pop@cybercable.fr>, 1999
+ * Stelian Pop <pop@cybercable.fr>, 1999-2000
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.10 1999/11/21 02:24:47 tiniou Exp $";
+ "$Id: traverse.c,v 1.18 2000/05/28 18:16:42 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
#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) {
#define WANTTODUMP(dp) CHANGEDSINCE(dp, spcl.c_ddate)
#endif
+extern ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */
+extern int iexclude_num; /* number of elements in the list */
+
/*
* Determine if given inode should be dumped
*/
* to the usedinomap.
*/
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)) {
dp = getino(dirent->inode);
mode = dp->di_mode & IFMT;
if (mode == IFDIR && dp->di_nlink != 0 && dp->di_dtime == 0) {
- if ((dirent->name[0] != '.' || dirent->name_len != 1) &&
+ if ((dirent->name[0] != '.' || ( dirent->name_len & 0xFF ) != 1) &&
(dirent->name[0] != '.' || dirent->name[1] != '.' ||
- dirent->name_len != 2)) {
+ ( dirent->name_len & 0xFF ) != 2)) {
retval = ext2fs_dir_iterate(fs, ino, 0, NULL,
mapfilesindir, private);
if (retval)
if (dp->inode == 0)
return 0;
if (dp->name[0] == '.') {
- if (dp->name_len == 1)
+ if (( dp->name_len & 0xFF ) == 1)
return 0;
- if (dp->name[1] == '.' && dp->name_len == 2)
+ if (dp->name[1] == '.' && ( dp->name_len & 0xFF ) == 2)
return 0;
}
if (mdc->nodump) {
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)
- warn("ACLs in inode #%ld won't be dumped", ino);
+ warn("ACLs in inode #%ld won't be dumped", (long)ino);
memmove(&spcl.c_dinode, &obi, sizeof(obi));
#else /* __linux__ */
spcl.c_dinode = *dp;
if (bc.cnt > 0) {
blksout (bc.buf, bc.cnt, bc.ino);
}
+ free(bc.buf);
#else
for (ind_level = 0; ind_level < NIADDR; ind_level++) {
dmpindir(ino, dp->di_ib[ind_level], ind_level, &size);
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';
/* Do the conversion */
retval = ext2fs_dir_iterate(fs, ino, 0, NULL, convert_dir, (void *)&cdc);
if (retval) {
- com_err(disk, retval, "while converting directory #%ld\n", ino);
+ com_err(disk, retval, "while converting directory #%ld\n", (long)ino);
exit(X_ABORT);
}
/* Fix the last entry */
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)
- warn("ACLs in inode #%ld won't be dumped", ino);
+ warn("ACLs in inode #%ld won't be dumped", (long)ino);
memmove(&spcl.c_dinode, &obi, sizeof(obi));
#else /* __linux__ */
spcl.c_dinode = *dp;