#ifndef lint
static const char rcsid[] =
- "$Id: restore.c,v 1.13 2000/12/21 11:14:54 stelian Exp $";
+ "$Id: restore.c,v 1.18 2001/06/18 10:58:28 stelian Exp $";
#endif /* not lint */
#include <config.h>
#ifdef __linux__
#include <sys/param.h>
#include <sys/time.h>
+#include <time.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
#include <bsdcompat.h>
#else /* __linux__ */
#include <ufs/ufs/dinode.h>
* List entries on the tape.
*/
long
-listfile(char *name, ino_t ino, int type)
+listfile(char *name, dump_ino_t ino, int type)
{
long descend = hflag ? GOOD : FAIL;
+#ifdef USE_QFA
+ long tnum;
+ long tpos;
+#endif
if (TSTINO(ino, dumpmap) == 0)
return (descend);
Vprintf(stdout, "%s", type == LEAF ? "leaf" : "dir ");
- fprintf(stdout, "%10lu\t%s\n", (unsigned long)ino, name);
+#ifdef USE_QFA
+ if (tapeposflag) { /* add QFA positions to output */
+ (void)Inode2Tapepos(ino, &tnum, &tpos, 1);
+ fprintf(stdout, "%10lu\t%ld\t%ld\t%s\n", (unsigned long)ino,
+ tnum, tpos, name);
+ }
+ else
+#endif
+ fprintf(stdout, "%10lu\t%s\n", (unsigned long)ino, name);
return (descend);
}
* Request that new entries be extracted.
*/
long
-addfile(char *name, ino_t ino, int type)
+addfile(char *name, dump_ino_t ino, int type)
{
register struct entry *ep, *np;
long descend = hflag ? GOOD : FAIL;
*/
/* ARGSUSED */
long
-deletefile(char *name, ino_t ino, int type)
+deletefile(char *name, dump_ino_t ino, int type)
{
long descend = hflag ? GOOD : FAIL;
struct entry *ep;
removeoldleaves(void)
{
register struct entry *ep, *nextep;
- register ino_t i, mydirino;
+ register dump_ino_t i, mydirino;
Vprintf(stdout, "Mark entries to be removed.\n");
if ((ep = lookupino(WINO))) {
* Renames are done at the same time.
*/
long
-nodeupdates(char *name, ino_t ino, int type)
+nodeupdates(char *name, dump_ino_t ino, int type)
{
register struct entry *ep, *np, *ip;
long descend = GOOD;
* for it, we discard the name knowing that it will be on the
* next incremental tape.
*/
- case NULL:
+ case 0:
if (compare_ignore_not_found) break;
fprintf(stderr, "%s: (inode %lu) not found on tape\n",
name, (unsigned long)ino);
findunreflinks(void)
{
register struct entry *ep, *np;
- register ino_t i;
+ register dump_ino_t i;
Vprintf(stdout, "Find unreferenced names.\n");
for (i = ROOTINO; i < maxino; i++) {
compareleaves(void)
{
register struct entry *ep;
- ino_t first;
+ dump_ino_t first;
long curvol;
first = lowerbnd(ROOTINO);
createleaves(char *symtabfile)
{
register struct entry *ep;
- ino_t first;
+ dump_ino_t first;
long curvol;
if (command == 'R') {
void
createfiles(void)
{
- register ino_t first, next, last;
+ register dump_ino_t first, next, last;
register struct entry *ep;
long curvol;
+#ifdef USE_QFA
+ long tnum, tpos, curtpos, tmpcnt;
+ time_t tistart, tiend, titaken;
+#endif
Vprintf(stdout, "Extract requested files\n");
curfile.action = SKIP;
first = lowerbnd(ROOTINO);
last = upperbnd(maxino - 1);
for (;;) {
+#ifdef USE_QFA
+ tmpcnt = 1;
+#endif
first = lowerbnd(first);
last = upperbnd(last);
/*
* or an out of order volume change is encountered
*/
next = lowerbnd(curfile.ino);
+#ifdef USE_QFA
+ tistart = time(NULL);
+ if (tapeposflag) {
+ /* get tape position for inode (position directly) */
+ (void)Inode2Tapepos(next, &tnum, &tpos, 1);
+ if (tpos == 0)
+ /* get tape position for last available inode
+ * (position before) */
+ (void)Inode2Tapepos(next, &tnum, &tpos, 0);
+ if (tpos != 0) {
+ if (tnum != volno)
+ (void)RequestVol(tnum);
+ if (GetTapePos(&curtpos) == 0) {
+ /* curtpos +1000 ???, some drives
+ * might be too slow */
+ if (tpos > curtpos) {
+#ifdef DEBUG_QFA
+ msg("positioning tape %ld from %ld to %ld for inode %10lu ...\n", volno, curtpos, tpos, (unsigned long)next);
+#endif
+ if (GotoTapePos(tpos) == 0) {
+#ifdef DEBUG_QFA
+ if (GetTapePos(&curtpos) == 0)
+ msg("before resnyc at tape position %ld\n", curtpos);
+#endif
+ (void)ReReadFromTape();
+#ifdef DEBUG_QFA
+ if (GetTapePos(&curtpos) == 0)
+ msg("after resync at tape position %ld\n", curtpos);
+#endif
+ }
+ }
+ }
+ }
+ }
+#endif /* USA_QFA */
+
do {
curvol = volno;
- while (next > curfile.ino && volno == curvol)
+ while (next > curfile.ino && volno == curvol) {
+#ifdef USE_QFA
+ ++tmpcnt;
+#endif
skipfile();
+ }
skipmaps();
skipdirs();
} while (volno == curvol + 1);
+#ifdef USE_QFA
+ tiend = time(NULL);
+ titaken = tiend - tistart;
+#ifdef DEBUG_QFA
+ if (titaken / 60 > 0)
+ msg("%ld reads took %d:%02d:%02d\n",
+ tmpcnt, titaken / 3600,
+ (titaken % 3600) / 60, titaken % 60);
+#endif
+#endif /* USE_QFA */
+
/*
* If volume change out of order occurred the
* current state must be recalculated
createlinks(void)
{
register struct entry *np, *ep;
- register ino_t i;
+ register dump_ino_t i;
char name[BUFSIZ];
if ((ep = lookupino(WINO))) {
checkrestore(void)
{
register struct entry *ep;
- register ino_t i;
+ register dump_ino_t i;
Vprintf(stdout, "Check the symbol table.\n");
for (i = WINO; i < maxino; i++) {
* A paranoid check that things are as they should be.
*/
long
-verifyfile(char *name, ino_t ino, int type)
+verifyfile(char *name, dump_ino_t ino, int type)
{
struct entry *np, *ep;
long descend = GOOD;