X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=dump%2Ftraverse.c;h=eda65e1379e87fa4e1417d6f6295b59529795fb4;hb=fe0e02857a1ff7db4bf8cb28780de7ecf2f24234;hp=2a160fa95f31a3ff716ad78bd6a34a49784af95a;hpb=6d732772201861bc57348f4ad5c0970ac00b5d93;p=dump.git diff --git a/dump/traverse.c b/dump/traverse.c index 2a160fa..eda65e1 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -2,8 +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-2000 - * Stelian Pop - Alcôve , 2000 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000-2002 */ /*- @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.36 2001/07/19 09:03:44 stelian Exp $"; + "$Id: traverse.c,v 1.43 2002/02/04 11:18:46 stelian Exp $"; #endif /* not lint */ #include @@ -143,15 +143,14 @@ int dump_fs_open(const char *disk, ext2_filsys *fs) dump_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"); + msg("This is a 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", + msg("Unsupported feature(s) 0x%x in filesystem\n", retval); retval = EXT2_ET_UNSUPP_FEATURE; ext2fs_close(*fs); @@ -159,12 +158,9 @@ int dump_fs_open(const char *disk, ext2_filsys *fs) else { if (es->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL && - journal_ino) { - msg("Exclude journal inode %u\n", - journal_ino); - do_exclude_ino(journal_ino); - } - do_exclude_ino(EXT2_RESIZE_INO); + journal_ino) + do_exclude_ino(journal_ino, "journal inode"); + do_exclude_ino(EXT2_RESIZE_INO, "resize inode"); } } return retval; @@ -244,7 +240,7 @@ blockest(struct dinode const *dp) static void mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped) { - register int mode; + int mode; /* * Skip inode if we've already marked it for dumping @@ -338,7 +334,7 @@ mapfiles(dump_ino_t maxino, long *tapesize) int mapfiles(dump_ino_t maxino, long *tapesize) { - register dump_ino_t ino; + dump_ino_t ino; int anydirskipped = 0; for (ino = ROOTINO; ino < maxino; ino++) @@ -410,8 +406,8 @@ struct mapfile_context { static int mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private) { - register struct dinode const *dp; - register int mode; + struct dinode const *dp; + int mode; errcode_t retval; struct mapfile_context *mfc; ext2_ino_t ino; @@ -525,12 +521,12 @@ struct mapdirs_context { int mapdirs(dump_ino_t maxino, long *tapesize) { - register struct dinode *dp; - register int isdir; - register char *map; - register dump_ino_t ino; + struct dinode *dp; + int isdir; + char *map; + dump_ino_t ino; #ifndef __linux__ - register int i; + int i; long filesize; #else struct mapdirs_context mdc; @@ -609,7 +605,7 @@ static int dirindir(dump_ino_t ino, daddr_t blkno, int ind_level, long *filesize) { int ret = 0; - register int i; + int i; daddr_t idblk[MAXNINDIR]; bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize); @@ -694,8 +690,8 @@ searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void static int searchdir(dump_ino_t ino, daddr_t blkno, long size, long filesize) { - register struct direct *dp; - register long loc, ret = 0; + struct direct *dp; + long loc, ret = 0; char dblk[MAXBSIZE]; bread(fsbtodb(sblock, blkno), dblk, (int)size); @@ -901,8 +897,8 @@ dumpino(struct dinode *dp, dump_ino_t ino) ext2fs_block_iterate2(fs, (ext2_ino_t)ino, 0, NULL, dumponeblock, (void *)&bc); /* deal with holes at the end of the inode */ - if (i_size > bc.next_block*sblock->fs_fsize) { - remaining = i_size - bc.next_block*sblock->fs_fsize; + if (i_size > ((u_quad_t)bc.next_block) * sblock->fs_fsize) { + remaining = i_size - ((u_quad_t)bc.next_block) * sblock->fs_fsize; for (i = 0; i < howmany(remaining, sblock->fs_fsize); i++) { bc.buf[bc.cnt++] = 0; if (bc.cnt == bc.max) { @@ -1133,7 +1129,7 @@ dmpindir(dump_ino_t ino, daddr_t blk, int ind_level, fsizeT *size) void blksout(daddr_t *blkp, int frags, dump_ino_t ino) { - register daddr_t *bp; + daddr_t *bp; int i, j, count, blks, tbperdb; blks = howmany(frags * sblock->fs_fsize, TP_BSIZE); @@ -1169,7 +1165,7 @@ blksout(daddr_t *blkp, int frags, dump_ino_t ino) void dumpmap(char *map, int type, dump_ino_t ino) { - register int i; + int i; char *cp; spcl.c_type = type; @@ -1179,21 +1175,20 @@ dumpmap(char *map, int type, dump_ino_t ino) writerec(cp, 0); } -/* - * Write a header record to the dump tape. - */ #if defined __linux__ && !defined(int32_t) #define int32_t __s32 #endif + +/* + * Compute and fill in checksum information. + */ void -writeheader(dump_ino_t ino) +mkchecksum(union u_spcl *tmpspcl) { - register int32_t sum, cnt, *lp; + int32_t sum, cnt, *lp; - spcl.c_inumber = ino; - spcl.c_magic = NFS_MAGIC; - spcl.c_checksum = 0; - lp = (int32_t *)&spcl; + tmpspcl->s_spcl.c_checksum = 0; + lp = (int32_t *)&tmpspcl->s_spcl; sum = 0; cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t)); while (--cnt >= 0) { @@ -1202,7 +1197,18 @@ writeheader(dump_ino_t ino) sum += *lp++; sum += *lp++; } - spcl.c_checksum = CHECKSUM - sum; + tmpspcl->s_spcl.c_checksum = CHECKSUM - sum; +} + +/* + * Write a header record to the dump tape. + */ +void +writeheader(dump_ino_t ino) +{ + spcl.c_inumber = ino; + spcl.c_magic = NFS_MAGIC; + mkchecksum((union u_spcl *)&spcl); writerec((char *)&spcl, 1); } @@ -1242,11 +1248,10 @@ getino(dump_ino_t inum) /* * Read a chunk of data from the disk. * Try to recover from hard errors by reading in sector sized pieces. - * Error recovery is attempted at most BREADEMAX times before seeking + * Error recovery is attempted at most breademax times before seeking * consent from the operator to continue. */ int breaderrors = 0; -#define BREADEMAX 32 void bread(daddr_t blkno, char *buf, int size) @@ -1285,9 +1290,9 @@ loop: else msg("short read error from %s: [block %d]: count=%d, got=%d\n", disk, blkno, size, cnt); - if (++breaderrors > BREADEMAX) { + if (++breaderrors > breademax) { msg("More than %d block read errors from %d\n", - BREADEMAX, disk); + breademax, disk); broadcast("DUMP IS AILING!\n"); msg("This is an unrecoverable error.\n"); if (!query("Do you want to attempt to continue?")){