#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.43 2001/07/18 13:46:17 stelian Exp $";
+ "$Id: tape.c,v 1.45 2001/07/20 09:01:46 stelian Exp $";
#endif /* not lint */
#include <config.h>
void
getvol(long nextvol)
{
- long newvol = 0, savecnt = 0, wantnext = 0, i;
+ long newvol = 0, wantnext = 0, i;
+ long saved_blksread = 0, saved_tpblksread = 0;
union u_spcl tmpspcl;
# define tmpbuf tmpspcl.s_spcl
char buf[TP_BSIZE];
return;
goto gethdr;
}
- savecnt = blksread;
+ saved_blksread = blksread;
+ saved_tpblksread = tpblksread;
again:
if (pipein)
exit(1); /* pipes do not get a second chance */
volno = newvol;
setdumpnum();
FLUSHTAPEBUF();
+ findtapeblksize();
if (gethead(&tmpbuf) == FAIL) {
Dprintf(stdout, "header read failed at %ld blocks\n", (long)blksread);
fprintf(stderr, "tape is not dump tape\n");
volno = 0;
haderror = 1;
+ blksread = saved_blksread;
+ tpblksread = saved_tpblksread;
goto again;
}
if (tmpbuf.c_volume != volno) {
fprintf(stderr, "Wrong volume (%d)\n", tmpbuf.c_volume);
volno = 0;
haderror = 1;
+ blksread = saved_blksread;
+ tpblksread = saved_tpblksread;
goto again;
}
if (tmpbuf.c_date != dumpdate || tmpbuf.c_ddate != dumptime) {
fprintf(stderr, "\twanted: %s", ctime(&dumpdate));
volno = 0;
haderror = 1;
+ blksread = saved_blksread;
+ tpblksread = saved_tpblksread;
goto again;
}
tapesread |= 1 << volno;
- blksread = savecnt;
+ blksread = saved_blksread;
+ tpblksread = saved_tpblksread;
/*
* If continuing from the previous volume, skip over any
* blocks read already at the end of the previous volume.