X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftraverse.c;h=204f518de8e5b6cf712eb9913361673745eedac8;hb=8eb05297aafdfd88bbd946a35d4db771604503bd;hp=29288848e1a31edcf7ee7ffa42c82774c999f3bd;hpb=b45f51d61e911ac8a040bef1efda6afd82261e03;p=dump.git diff --git a/dump/traverse.c b/dump/traverse.c index 2928884..204f518 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -2,8 +2,7 @@ * 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 */ /*- @@ -40,11 +39,8 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; -#endif static const char rcsid[] = - "$Id: traverse.c,v 1.2 1999/10/11 12:53:22 stelian Exp $"; + "$Id: traverse.c,v 1.16 2000/02/10 09:42:32 stelian Exp $"; #endif /* not lint */ #include @@ -52,10 +48,11 @@ static const char rcsid[] = #ifdef __linux__ #include #include -#include +#include #include #define swab32(x) ext2fs_swab32(x) #else /* __linux__ */ +#define swab32(x) x #ifdef sunos #include @@ -96,12 +93,41 @@ typedef long fsizeT; #ifdef __linux__ static int searchdir __P((struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private)); -long long llseek(int fildes, long long offset, int whence); #else static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size)); 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)); + +/* #define EXT3_FEATURE_INCOMPAT_RECOVER */ + +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 + 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 + retval = EXT2_ET_UNSUPP_FEATURE; + } + else if (s->s_feature_ro_compat & ~EXT2_LIB_FEATURE_RO_COMPAT_SUPP) { + retval = EXT2_ET_RO_UNSUPP_FEATURE; + } + } + return retval; +} /* * This is an estimation of the number of TP_BSIZE blocks in the file. @@ -111,8 +137,7 @@ static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); * hence the estimate may be high. */ long -blockest(dp) - register struct dinode *dp; +blockest(struct dinode *dp) { long blkest, sizeest; @@ -165,6 +190,67 @@ blockest(dp) #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 + */ +void +mapfileino(ino_t ino, long *tapesize, int *dirskipped) +{ + register int mode; + register struct dinode *dp; + + /* + * Skip inode if we've already marked it for dumping + */ + if (TSTINO(ino, usedinomap)) + return; + dp = getino(ino); + if ((mode = (dp->di_mode & IFMT)) == 0) + return; +#ifdef __linux__ + if (dp->di_nlink == 0 || dp->di_dtime != 0) + return; +#endif + /* + * Put all dirs in dumpdirmap, inodes that are to be dumped in the + * used map. All inode but dirs who have the nodump attribute go + * 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; idxdi_flags & UF_NODUMP)) + CLRINO(ino, usedinomap); +#endif + *dirskipped = 1; + } +} + /* * Dump pass 1. * @@ -173,37 +259,14 @@ blockest(dp) * the directories in the filesystem. */ int -mapfiles(maxino, tapesize) - ino_t maxino; - long *tapesize; +mapfiles(ino_t maxino, long *tapesize) { - register int mode; register ino_t ino; - register struct dinode *dp; int anydirskipped = 0; - for (ino = ROOTINO; ino < maxino; ino++) { - dp = getino(ino); - if ((mode = (dp->di_mode & IFMT)) == 0) - continue; -#ifdef __linux__ - if (dp->di_nlink == 0 || dp->di_dtime != 0) - continue; -#endif - SETINO(ino, usedinomap); - if (mode == IFDIR) - SETINO(ino, dumpdirmap); - if (WANTTODUMP(dp)) { - SETINO(ino, dumpinomap); - if (mode != IFREG && mode != IFDIR && mode != IFLNK) - *tapesize += 1; - else - *tapesize += blockest(dp); - continue; - } - if (mode == IFDIR) - anydirskipped = 1; - } + for (ino = ROOTINO; ino < maxino; ino++) + mapfileino(ino, tapesize, &anydirskipped); + /* * Restore gets very upset if the root is not dumped, * so ensure that it always is dumped. @@ -215,48 +278,33 @@ mapfiles(maxino, tapesize) #ifdef __linux__ struct mapfile_context { long *tapesize; - int anydirskipped; + int *anydirskipped; }; static int -mapfilesindir(dirent, offset, blocksize, buf, private) - struct ext2_dir_entry *dirent; - int offset; - int blocksize; - char *buf; - void *private; +mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private) { register struct dinode *dp; register int mode; - ino_t ino; errcode_t retval; struct mapfile_context *mfc; + ino_t ino; ino = dirent->inode; mfc = (struct mapfile_context *)private; - dp = getino(ino); - if ((mode = (dp->di_mode & IFMT)) != 0 && - dp->di_nlink != 0 && dp->di_dtime == 0) { - SETINO(ino, usedinomap); - if (mode == IFDIR) - SETINO(ino, dumpdirmap); - if (WANTTODUMP(dp)) { - SETINO(ino, dumpinomap); - if (mode != IFREG && mode != IFDIR && mode != IFLNK) - *mfc->tapesize += 1; - else - *mfc->tapesize += blockest(dp); - } - if (mode == IFDIR) { - mfc->anydirskipped = 1; - if ((dirent->name[0] != '.' || dirent->name_len != 1) && - (dirent->name[0] != '.' || dirent->name[1] != '.' || - dirent->name_len != 2)) { - retval = ext2fs_dir_iterate(fs, ino, 0, NULL, - mapfilesindir, private); - if (retval) - return retval; - } + + mapfileino(dirent->inode, mfc->tapesize, mfc->anydirskipped); + + 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 & 0xFF ) != 1) && + (dirent->name[0] != '.' || dirent->name[1] != '.' || + ( dirent->name_len & 0xFF ) != 2)) { + retval = ext2fs_dir_iterate(fs, ino, 0, NULL, + mapfilesindir, private); + if (retval) + return retval; } } return 0; @@ -270,16 +318,13 @@ mapfilesindir(dirent, offset, blocksize, buf, private) * the directories in the filesystem. */ int -mapfilesfromdir(maxino, tapesize, directory) - ino_t maxino; - long *tapesize; - char *directory; +mapfilesfromdir(ino_t maxino, long *tapesize, char *directory) { errcode_t retval; struct mapfile_context mfc; ino_t dir_ino; char dir_name [MAXPATHLEN]; - int i; + int i, anydirskipped = 0; /* * Mark every directory in the path as being dumped @@ -295,8 +340,7 @@ mapfilesfromdir(maxino, tapesize, directory) dir_name); exit(X_ABORT); } -/* SETINO(dir_ino, dumpinomap); */ - SETINO(dir_ino, dumpdirmap); + mapfileino(dir_ino, tapesize, &anydirskipped); } } /* @@ -307,11 +351,10 @@ mapfilesfromdir(maxino, tapesize, directory) com_err(disk, retval, "while translating %s", directory); exit(X_ABORT); } -/* SETINO(dir_ino, dumpinomap); */ - SETINO(dir_ino, dumpdirmap); + mapfileino(dir_ino, tapesize, &anydirskipped); mfc.tapesize = tapesize; - mfc.anydirskipped = 0; + mfc.anydirskipped = &anydirskipped; retval = ext2fs_dir_iterate(fs, dir_ino, 0, NULL, mapfilesindir, (void *)&mfc); @@ -319,16 +362,28 @@ mapfilesfromdir(maxino, tapesize, directory) com_err(disk, retval, "while mapping files in %s", directory); exit(X_ABORT); } + /* + * Ensure that the root inode actually appears in the file list + * for a subdir + */ + mapfileino(ROOTINO, tapesize, &anydirskipped); /* * Restore gets very upset if the root is not dumped, * so ensure that it always is dumped. */ -/* SETINO(ROOTINO, dumpinomap); */ - SETINO(ROOTINO, dumpdirmap); - return (mfc.anydirskipped); + SETINO(ROOTINO, dumpinomap); + return anydirskipped; } #endif +#ifdef __linux__ +struct mapdirs_context { + int *ret; + int nodump; + long *tapesize; +}; +#endif + /* * Dump pass 2. * @@ -342,19 +397,19 @@ mapfilesfromdir(maxino, tapesize, directory) * pass using this algorithm. */ int -mapdirs(maxino, tapesize) - ino_t maxino; - long *tapesize; +mapdirs(ino_t maxino, long *tapesize) { register struct dinode *dp; register int isdir; register char *map; register ino_t ino; -#ifndef __linux +#ifndef __linux__ register int i; long filesize; +#else + struct mapdirs_context mdc; #endif - int ret, change = 0; + int ret, change = 0, nodump; isdir = 0; /* XXX just to get gcc to shut up */ for (map = dumpdirmap, ino = 1; ino < maxino; ino++) { @@ -362,12 +417,24 @@ mapdirs(maxino, tapesize) isdir = *map++; else isdir >>= 1; - if ((isdir & 1) == 0 || TSTINO(ino, dumpinomap)) + /* + * If dir has been removed from the used map, it's either + * because it had the nodump flag, or it herited it from + * its parent. A directory can't be in dumpinomap if not + * in usedinomap, but we have to go through it anyway + * to propagate the nodump attribute. + */ + nodump = (TSTINO(ino, usedinomap) == 0); + if ((isdir & 1) == 0 || + (TSTINO(ino, dumpinomap) && nodump == 0)) continue; dp = getino(ino); #ifdef __linux__ ret = 0; - ext2fs_dir_iterate(fs, ino, 0, NULL, searchdir, (void *) &ret); + mdc.ret = &ret; + mdc.nodump = nodump; + mdc.tapesize = tapesize; + ext2fs_dir_iterate(fs, ino, 0, NULL, searchdir, (void *) &mdc); #else /* __linux__ */ filesize = dp->di_size; for (ret = 0, i = 0; filesize > 0 && i < NDADDR; i++) { @@ -392,7 +459,11 @@ mapdirs(maxino, tapesize) change = 1; continue; } - if ((ret & HASSUBDIRS) == 0) { + if (nodump) { + if (ret & HASSUBDIRS) + change = 1; /* subdirs have inherited nodump */ + CLRINO(ino, dumpdirmap); + } else if ((ret & HASSUBDIRS) == 0) { if (!TSTINO(ino, dumpinomap)) { CLRINO(ino, dumpdirmap); change = 1; @@ -409,11 +480,7 @@ mapdirs(maxino, tapesize) * require the directory to be dumped. */ static int -dirindir(ino, blkno, ind_level, filesize) - ino_t ino; - daddr_t blkno; - int ind_level; - long *filesize; +dirindir(ino_t ino, daddr_t blkno, int ind_level, long *filesize) { int ret = 0; register int i; @@ -450,32 +517,48 @@ dirindir(ino, blkno, ind_level, filesize) */ #ifdef __linux__ static int -searchdir(dp, offset, blocksize, buf, private) - struct ext2_dir_entry *dp; - int offset; - int blocksize; - char *buf; - void *private; +searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private) { - int *ret = (int *) private; + struct mapdirs_context *mdc; + int *ret; + long *tapesize; + struct dinode *ip; + + mdc = (struct mapdirs_context *)private; + ret = mdc->ret; + tapesize = mdc->tapesize; 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 (TSTINO(dp->inode, dumpinomap)) { - *ret |= HASDUMPEDFILE; - if (*ret & HASSUBDIRS) - return DIRENT_ABORT; - } - if (TSTINO(dp->inode, dumpdirmap)) { - *ret |= HASSUBDIRS; - if (*ret & HASDUMPEDFILE) - return DIRENT_ABORT; + if (mdc->nodump) { + 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 */ + if ((ip->di_mode & IFMT) == IFDIR) { + SETINO(dp->inode, dumpdirmap); + *ret |= HASSUBDIRS; + } + } else { + if (TSTINO(dp->inode, dumpinomap)) { + *ret |= HASDUMPEDFILE; + if (*ret & HASSUBDIRS) + return DIRENT_ABORT; + } + if (TSTINO(dp->inode, dumpdirmap)) { + *ret |= HASSUBDIRS; + if (*ret & HASDUMPEDFILE) + return DIRENT_ABORT; + } } return 0; } @@ -483,11 +566,7 @@ searchdir(dp, offset, blocksize, buf, private) #else /* __linux__ */ static int -searchdir(ino, blkno, size, filesize) - ino_t ino; - daddr_t blkno; - register long size; - long filesize; +searchdir(ino_t ino, daddr_t blkno, long size, long filesize) { register struct direct *dp; register long loc, ret = 0; @@ -571,9 +650,7 @@ dumponeblock(ext2_filsys fs, blk_t *blocknr, int blockcnt, void *private) * Dump the contents of an inode to tape. */ void -dumpino(dp, ino) - register struct dinode *dp; - ino_t ino; +dumpino(struct dinode *dp, ino_t ino) { int cnt; fsizeT size; @@ -605,7 +682,7 @@ dumpino(dp, ino) 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 #%d 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; @@ -697,6 +774,7 @@ dumpino(dp, ino) 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); @@ -722,32 +800,26 @@ struct convert_dir_context { * size of the entry, and creates it in a temporary buffer */ static int -convert_dir(dirent, offset, blocksize, buf, private) - struct ext2_dir_entry *dirent; - int offset; - int blocksize; - char *buf; - void *private; +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 + 1); + 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; - strncpy(dp->d_name, dirent->name, dirent->name_len); + dp->d_namlen = dirent->name_len & 0xFF; + strncpy(dp->d_name, dirent->name, dp->d_namlen); dp->d_name[dp->d_namlen] = '\0'; p->prev_offset = p->offset; p->offset += reclen; @@ -761,9 +833,7 @@ convert_dir(dirent, offset, blocksize, buf, private) * Dumps a directory to tape after converting it to the BSD format */ void -dumpdirino(dp, ino) - register struct dinode *dp; - ino_t ino; +dumpdirino(struct dinode *dp, ino_t ino) { fsizeT size; char buf[TP_BSIZE]; @@ -786,15 +856,15 @@ dumpdirino(dp, ino) ext2fs directory to avoid problems ;-) */ cdc.buf = (char *)malloc(dp->di_size * 2 * sizeof(char)); if (cdc.buf == NULL) - err(1, "Cannot allocate buffer to convert directory #%ld\n", - ino); + err(1, "Cannot allocate buffer to convert directory #%lu\n", + (unsigned long)ino); cdc.offset = 0; cdc.prev_offset = 0; cdc.bs = MIN(DIRBLKSIZ, TP_BSIZE); /* 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 */ @@ -821,7 +891,7 @@ dumpdirino(dp, ino) 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 #%d 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; @@ -866,11 +936,7 @@ dumpdirino(dp, ino) * Read indirect blocks, and pass the data blocks to be dumped. */ static void -dmpindir(ino, blk, ind_level, size) - ino_t ino; - daddr_t blk; - int ind_level; - fsizeT *size; +dmpindir(ino_t ino, daddr_t blk, int ind_level, fsizeT *size) { int i, cnt; #ifdef __linux__ @@ -926,10 +992,7 @@ dmpindir(ino, blk, ind_level, size) * Collect up the data into tape record sized buffers and output them. */ void -blksout(blkp, frags, ino) - daddr_t *blkp; - int frags; - ino_t ino; +blksout(daddr_t *blkp, int frags, ino_t ino) { register daddr_t *bp; int i, j, count, blks, tbperdb; @@ -949,12 +1012,14 @@ blksout(blkp, frags, ino) spcl.c_count = count - i; writeheader(ino); bp = &blkp[i / tbperdb]; - for (j = i; j < count; j += tbperdb, bp++) - if (*bp != 0) + for (j = i; j < count; j += tbperdb, bp++) { + if (*bp != 0) { if (j + tbperdb <= count) dumpblock(*bp, (int)sblock->fs_bsize); else dumpblock(*bp, (count - j) * TP_BSIZE); + } + } spcl.c_type = TS_ADDR; } } @@ -963,10 +1028,7 @@ blksout(blkp, frags, ino) * Dump a map to the tape. */ void -dumpmap(map, type, ino) - char *map; - int type; - ino_t ino; +dumpmap(char *map, int type, ino_t ino) { register int i; char *cp; @@ -982,8 +1044,7 @@ dumpmap(map, type, ino) * Write a header record to the dump tape. */ void -writeheader(ino) - ino_t ino; +writeheader(ino_t ino) { #ifdef __linux__ register __s32 sum, cnt, *lp; @@ -1017,8 +1078,7 @@ writeheader(ino) #ifdef __linux__ struct dinode * -getino(inum) - ino_t inum; +getino(ino_t inum) { static struct dinode dinode; @@ -1028,8 +1088,7 @@ getino(inum) } #else /* __linux__ */ struct dinode * -getino(inum) - ino_t inum; +getino(ino_t inum) { static daddr_t minino, maxino; static struct dinode inoblock[MAXINOPB]; @@ -1055,18 +1114,15 @@ int breaderrors = 0; #define BREADEMAX 32 void -bread(blkno, buf, size) - daddr_t blkno; - char *buf; - int size; +bread(daddr_t blkno, char *buf, int size) { int cnt, i; extern int errno; loop: #ifdef __linux__ - if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) != - ((ext2_loff_t)blkno << dev_bshift)) + if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) != + (((ext2_loff_t)blkno) << dev_bshift)) #else if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) != ((off_t)blkno << dev_bshift)) @@ -1111,8 +1167,8 @@ loop: memset(buf, 0, size); for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) { #ifdef __linux__ - if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) != - ((ext2_loff_t)blkno << dev_bshift)) + if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) != + (((ext2_loff_t)blkno) << dev_bshift)) #else if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) != ((off_t)blkno << dev_bshift))