X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=dump%2Ftraverse.c;h=7bdfef1c96c0e412a4cec3934b7ad42c212e6e7a;hb=e3956dfb7715a21919aa66dd4209a2dc1c3c82da;hp=0a394aea1c304c3ab4ee66125639fb87ee2341b2;hpb=7af2fada292acbfb50d441c4be192690dff40283;p=dump.git diff --git a/dump/traverse.c b/dump/traverse.c index 0a394ae..7bdfef1 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -37,7 +37,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.70 2010/06/10 12:01:30 stelian Exp $"; + "$Id: traverse.c,v 1.73 2011/06/10 13:07:29 stelian Exp $"; #endif /* not lint */ #include @@ -240,7 +240,7 @@ blockest(struct dinode const *dp) #define MSINCE(dp, t) \ ((dp)->di_mtime >= (t)) #define CHANGEDSINCE(dp, t) \ - (CSINCE(dp, t) || MSINCE(dp, t)) + CSINCE(dp, t) /* The NODUMP_FLAG macro tests if a file has the nodump flag. */ #ifdef UF_NODUMP @@ -868,8 +868,9 @@ dump_xattr(dump_ino_t ino, struct dinode *dp) { void dumpino(struct dinode *dp, dump_ino_t ino, int metaonly) { - unsigned long cnt; - fsizeT size, remaining; + //unsigned long cnt; + //fsizeT size; + fsizeT remaining; char buf[TP_BSIZE]; struct new_bsd_inode nbi; int i; @@ -992,7 +993,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly) bc.buf = (int *)malloc (bc.max * sizeof (int)); bc.cnt = 0; bc.ino = ino; - bc.next_block = NDADDR; + bc.next_block = 0; ext2fs_block_iterate2(fs, (ext2_ino_t)ino, BLOCK_FLAG_DATA_ONLY, NULL, dumponeblock, (void *)&bc); /* deal with holes at the end of the inode */ @@ -1348,6 +1349,7 @@ mkchecksum(union u_spcl *tmpspcl) void writeheader(dump_ino_t ino) { + char *state; /* need to have some place to put this! */ spcl.c_inumber = ino; spcl.c_magic = NFS_MAGIC; mkchecksum((union u_spcl *)&spcl);