Relicensed dump/restore under the revised BSD license, as per ftp://ftp.cs.berkeley...

[dump.git] / restore / tape.c

diff --git a/restore/tape.c b/restore/tape.c
index 9bfb4c5051e74098d6cfa38670cf84d8fcf36ce9..56830c4f8174944f9ccf9d8ae97f39d8cdf851ba 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -23,11 +23,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.69 2003/02/11 12:43:45 stelian Exp $";
+       "$Id: tape.c,v 1.73 2003/03/30 15:40:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -2085,7 +2081,8 @@ setmagtapein(void) {
                        magtapein = ioctl(mt, MTIOCGET, (char *)&mt_stat) == 0;
        }
 
-       Vprintf(stdout,"Input is from %s\n", 
+       Vprintf(stdout,"Input is from a %s %s\n",
+                       host ? "remote" : "local",
                        magtapein ? "tape" :
                        Vflag ? "multi-volume (no tape)" : "file/pipe");
 }
@@ -2653,13 +2650,12 @@ ReReadInodeFromTape(dump_ino_t theino)
        do {
                cntloop++;
                gethead(&spcl);
-       } while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate) && (cntloop < 32));
+       } while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate) && (cntloop < ntrec));
 #ifdef DEBUG_QFA
        fprintf(stderr, "%ld reads\n", cntloop);
-       if (cntloop == 32) {
+       if (cntloop == ntrec) {
                fprintf(stderr, "DEBUG: bufsize %d\n", bufsize);
                fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
-               fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
        }
 #endif
        findinode(&spcl);