Bell 32V release
[unix-history] / usr / src / cmd / restor.c
index 9dc1b40..2b6db17 100644 (file)
@@ -380,7 +380,7 @@ ragain:
                        for (i = 0; i < NADDR; i++)
                                taddr[i] = 0;
                        l3tol(taddr, dino.di_addr, 1);
                        for (i = 0; i < NADDR; i++)
                                taddr[i] = 0;
                        l3tol(taddr, dino.di_addr, 1);
-                       getfile(ino, rstrfile, rstrskip, dino.di_size);
+                       getfile(d, rstrfile, rstrskip, dino.di_size);
                        ip = &tino;
                        ltol3(ip->di_addr, taddr, NADDR);
                        ip1 = &dino;
                        ip = &tino;
                        ltol3(ip->di_addr, taddr, NADDR);
                        ip1 = &dino;
@@ -463,6 +463,7 @@ long        size;
                if (checktype(&addrblock, TS_ADDR) == 0) {
                        spcl = addrblock;
                        curino = 0;
                if (checktype(&addrblock, TS_ADDR) == 0) {
                        spcl = addrblock;
                        curino = 0;
+                       curino = 0;
                        return;
                }
 start:
                        return;
                }
 start:
@@ -505,8 +506,7 @@ char *b;
                if ((i = read(mt, tbf, NTREC*BSIZE)) < 0) {
                        printf("Tape read error: inode %u\n", curino);
                        eflag++;
                if ((i = read(mt, tbf, NTREC*BSIZE)) < 0) {
                        printf("Tape read error: inode %u\n", curino);
                        eflag++;
-                       for (i = 0; i < NTREC; i++)
-                               clearbuf(&tbf[i*BSIZE]);
+                       exit(1);
                }
                if (i == 0) {
                        bct = NTREC + 1;
                }
                if (i == 0) {
                        bct = NTREC + 1;
@@ -1140,8 +1140,6 @@ short     *m;
 
 done()
 {
 
 done()
 {
-#ifndef STANDALONE
        unlink(dirfile);
        unlink(dirfile);
-#endif
        exit(0);
 }
        exit(0);
 }