#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.66 2002/11/28 08:54:00 stelian Exp $";
+ "$Id: tape.c,v 1.72 2003/02/17 11:21:29 stelian Exp $";
#endif /* not lint */
#include <config.h>
temptape = magtape;
#ifdef RRESTORE
- if (host)
+ if (!Afile && host)
mt = rmtopen(temptape, O_RDONLY);
else
#endif
else
mt = OPEN(temptape, O_RDONLY, 0);
if (mt < 0)
- err(1, "%s", magtape);
+ err(1, "%s", temptape);
if (!Afile) {
volno = 1;
setmagtapein();
return;
}
closemt();
+
+ /*
+ * if using an archive file, reset its name so readtape()
+ * could properly use remote access.
+ */
+ Afile = NULL;
+
if (Mflag) {
snprintf(magtape, MAXPATHLEN, "%s%03ld", magtapeprefix, newvol);
magtape[MAXPATHLEN - 1] = '\0';
xtrskip(UNUSED(char *buf), size_t size)
{
- if (LSEEK(ofile, (off_t)size, SEEK_CUR) == -1)
+ if (LSEEK(ofile, (OFF_T)size, SEEK_CUR) == -1)
err(1, "seek error extracting inode %lu, name %s\nlseek",
(unsigned long)curfile.ino, curfile.name);
}
struct STAT stemp;
#endif
+ curfile.name = name;
+ curfile.action = USING;
+ mode = curfile.dip->di_mode;
+
+ if ((mode & IFMT) == IFSOCK) {
+ Vprintf(stdout, "skipped socket %s\n", name);
+ skipfile();
+ return;
+ }
+
if ((r = LSTAT(name, &sb)) != 0) {
warn("%s: does not exist (%d)", name, r);
do_compare_error;
return;
}
- curfile.name = name;
- curfile.action = USING;
- mode = curfile.dip->di_mode;
-
Vprintf(stdout, "comparing %s (size: %ld, mode: 0%o)\n", name,
(long)sb.st_size, mode);
#endif
getmore:
#ifdef RRESTORE
- if (host)
+ if (!Afile && host)
i = rmtread(&tapebuf[rd], cnt);
else
#endif
i = ntrec * TP_BSIZE;
memset(tapebuf, 0, (size_t)i);
#ifdef RRESTORE
- if (host)
+ if (!Afile && host)
seek_failed = (rmtseek(i, 1) < 0);
else
#endif
- seek_failed = (LSEEK(mt, i, SEEK_CUR) == (off_t)-1);
+ seek_failed = (LSEEK(mt, i, SEEK_CUR) == (OFF_T)-1);
if (seek_failed) {
warn("continuation failed");
size = len;
while (size > 0) {
#ifdef RRESTORE
- if (host)
+ if (!Afile && host)
i = rmtread(buf, size);
else
#endif
if (mt < 0)
return;
#ifdef RRESTORE
- if (host)
+ if (!Afile && host)
rmtclose();
else
#endif
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");
}
#ifdef RDUMP
if (host)
- err = (rmtseek((long)pos, SEEK_SET) < 0);
+ err = (rmtseek(pos, SEEK_SET) < 0);
else
#endif
{
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);