From 9d49c83f5624f5cf13b7e27fd1f058b10dad50a3 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Mon, 24 Dec 2001 15:53:41 +0000 Subject: [PATCH] Another set of fixes for file not found at end of tape. --- restore/restore.c | 5 +++-- restore/restore.h | 3 ++- restore/tape.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/restore/restore.c b/restore/restore.c index f0118f2..6183804 100644 --- a/restore/restore.c +++ b/restore/restore.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: restore.c,v 1.19 2001/12/24 12:31:12 stelian Exp $"; + "$Id: restore.c,v 1.20 2001/12/24 15:53:41 stelian Exp $"; #endif /* not lint */ #include @@ -867,7 +867,8 @@ createfiles(void) */ while (curfile.ino > last) { curfile.action = SKIP; - getvol((long)0); + if (!pipein) + getvol((long)0); if (curfile.ino == maxino) { next = lowerbnd(next); while (next < curfile.ino) { diff --git a/restore/restore.h b/restore/restore.h index 9f5b9c0..a55a8fd 100644 --- a/restore/restore.h +++ b/restore/restore.h @@ -5,7 +5,7 @@ * Stelian Pop , 1999-2000 * Stelian Pop - AlcĂ´ve , 2000 * - * $Id: restore.h,v 1.19 2001/11/16 14:09:07 stelian Exp $ + * $Id: restore.h,v 1.20 2001/12/24 15:53:41 stelian Exp $ */ /* @@ -78,6 +78,7 @@ extern time_t dumptime; /* time that this dump begins */ extern time_t dumpdate; /* time that this dump was made */ extern char command; /* opration being performed */ extern FILE *terminal; /* file descriptor for the terminal input */ +extern int pipein; /* input is from a pipe */ extern char *tmpdir; /* name of temp directory */ extern int oldinofmt; /* reading tape with old format inodes */ extern int Bcvt; /* need byte swapping on inodes and dirs */ diff --git a/restore/tape.c b/restore/tape.c index c46394b..4b4f736 100644 --- a/restore/tape.c +++ b/restore/tape.c @@ -46,7 +46,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.49 2001/12/24 12:31:12 stelian Exp $"; + "$Id: tape.c,v 1.50 2001/12/24 15:53:41 stelian Exp $"; #endif /* not lint */ #include @@ -97,7 +97,7 @@ int noresyncmesg = 0; #endif /* USE_QFA */ static long fssize = MAXBSIZE; static int mt = -1; -static int pipein = 0; +int pipein = 0; static int magtapein = 0; /* input is from magtape */ static char magtape[MAXPATHLEN]; static char magtapeprefix[MAXPATHLEN]; -- 2.39.2