#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.57 2002/01/31 10:25:55 stelian Exp $";
+ "$Id: tape.c,v 1.61 2002/05/06 08:45:41 stelian Exp $";
#endif /* not lint */
#include <config.h>
#endif
static int readmapflag;
+static int readingmaps; /* set to 1 while reading the maps */
/*
* Set up an input source. This is called from main.c before setup() is.
}
if (vflag || command == 't' || command == 'C')
printdumpinfo();
+#ifdef USE_QFA
+ if (tapeposflag && spcl.c_date != qfadumpdate)
+ errx(1, "different QFA/dumpdates detected\n");
+#endif
if (filesys[0] == '\0') {
char *dirptr;
strncpy(filesys, spcl.c_filesys, NAMELEN);
Dprintf(stdout, "header read failed at %ld blocks\n", (long)blksread);
panic("no header after volume mark!\n");
}
+ readingmaps = 1;
findinode(&spcl);
if (spcl.c_type != TS_CLRI)
errx(1, "Cannot find file removal list");
maxino = (spcl.c_count * TP_BSIZE * NBBY) + 1;
- Dprintf(stdout, "maxino = %ld\n", (long)maxino);
map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
if (map == NULL)
errx(1, "no memory for active inode map");
usedinomap = map;
curfile.action = USING;
getfile(xtrmap, xtrmapskip);
- findinode(&spcl);
+ while (spcl.c_type == TS_ADDR) {
+ /* Recompute maxino and the map */
+ char *oldmap = usedinomap;
+ dump_ino_t oldmaxino = maxino;
+ maxino += (spcl.c_count * TP_BSIZE * NBBY) + 1;
+ map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
+ if (map == NULL)
+ errx(1, "no memory for active inode map");
+ usedinomap = map;
+ memcpy(usedinomap, oldmap, howmany(oldmaxino, NBBY));
+ free(oldmap);
+
+ spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
+ getfile(xtrmap, xtrmapskip);
+ }
+ Dprintf(stdout, "maxino = %lu\n", (unsigned long)maxino);
if (spcl.c_type != TS_BITS)
errx(1, "Cannot find file dump list");
map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
dumpmap = map;
curfile.action = USING;
getfile(xtrmap, xtrmapskip);
+ while (spcl.c_type == TS_ADDR) {
+ spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
+ getfile(xtrmap, xtrmapskip);
+ }
/*
* If there may be whiteout entries on the tape, pretend that the
* whiteout inode exists, so that the whiteout entries can be
*/
if (oldinofmt == 0)
SETINO(WINO, dumpmap);
+ readingmaps = 0;
findinode(&spcl);
}
if (nextvol == 1) {
tapesread = 0;
gettingfile = 0;
+ tpblksread = 0;
+ blksread = 0;
}
if (pipein) {
if (nextvol != 1)
}
saved_blksread = blksread;
saved_tpblksread = tpblksread;
+#if defined(USE_QFA) && defined(sunos)
+ if (createtapeposflag || tapeposflag)
+ close(fdsmtc);
+#endif
again:
if (pipein)
exit(1); /* pipes do not get a second chance */
while (newvol <= 0) {
if (tapesread == 0) {
fprintf(stderr, "%s%s%s%s%s",
- "You have not read any tapes yet.\n",
+ "You have not read any volumes yet.\n",
"Unless you know which volume your",
" file(s) are on you should start\n",
"with the last volume and work",
}
if (newvol == volno) {
tapesread |= 1 << volno;
+#if defined(USE_QFA) && defined(sunos)
+ if (createtapeposflag || tapeposflag) {
+ if (OpenSMTCmt(magtape) < 0) {
+ volno = -1;
+ haderror = 1;
+ goto again;
+ }
+ }
+#endif
return;
}
closemt();
}
if (haderror || (bot_code && !Mflag)) {
haderror = 0;
- fprintf(stderr, "Mount tape volume %ld\n", (long)newvol);
- fprintf(stderr, "Enter ``none'' if there are no more tapes\n");
- fprintf(stderr, "otherwise enter tape name (default: %s) ", magtape);
+ fprintf(stderr, "Mount volume %ld\n", (long)newvol);
+ fprintf(stderr, "Enter ``none'' if there are no more volumes\n");
+ fprintf(stderr, "otherwise enter volume name (default: %s) ", magtape);
(void) fflush(stderr);
(void) fgets(buf, TP_BSIZE, terminal);
if (feof(terminal))
goto again;
}
tapesread |= 1 << volno;
- blksread = saved_blksread;
- tpblksread = saved_tpblksread;
/*
* If continuing from the previous volume, skip over any
* blocks read already at the end of the previous volume.
#endif /* !HAVE_ZLIB && !HAVE_BZLIB */
}
Dprintf(stdout, "read %ld recs, tape starts with %ld\n",
- tpblksread, (long)tmpbuf.c_firstrec);
+ tpblksread - 1, (long)tmpbuf.c_firstrec);
if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) {
if (!wantnext) {
- tpblksread = tmpbuf.c_firstrec;
+ tpblksread = tmpbuf.c_firstrec + 1;
for (i = tmpbuf.c_count; i > 0; i--)
readtape(buf);
} else if (tmpbuf.c_firstrec > 0 &&
}
}
+#ifdef sunos
+struct timeval
+ time_t tv_sec; /* seconds */
+ suseconds_t tv_usec; /* and microseconds */
+};
+#endif
+
int
-extractfile(char *name)
+extractfile(struct entry *ep, int doremove)
{
unsigned int flags;
mode_t mode;
struct timeval timep[2];
- struct entry *ep;
+ char *name = myname(ep);
+
+ /* If removal is requested (-r mode) do remove it unless
+ * we are extracting a metadata only inode */
+ if (spcl.c_flags & DR_METAONLY) {
+ Vprintf(stdout, "file %s is metadata only\n", name);
+ }
+ else {
+ if (doremove) {
+ removeleaf(ep);
+ ep->e_flags &= ~REMOVED;
+ }
+ }
curfile.name = name;
curfile.action = USING;
-#ifdef __linux__
+#if defined(__linux__) || defined(sunos)
timep[0].tv_sec = curfile.dip->di_atime.tv_sec;
timep[0].tv_usec = curfile.dip->di_atime.tv_usec;
timep[1].tv_sec = curfile.dip->di_mtime.tv_sec;
timep[1].tv_usec = curfile.dip->di_mtime.tv_usec;
-#else /* __linux__ */
+#else /* __linux__ || sunos */
timep[0].tv_sec = curfile.dip->di_atime;
timep[0].tv_usec = curfile.dip->di_atimensec / 1000;
timep[1].tv_sec = curfile.dip->di_mtime;
case IFDIR:
if (mflag) {
- ep = lookupname(name);
if (ep == NULL || ep->e_flags & EXTRACT)
panic("unextracted directory %s\n", name);
skipfile();
uid_t luid = curfile.dip->di_uid;
gid_t lgid = curfile.dip->di_gid;
#endif
- lnkbuf[0] = '\0';
- pathlen = 0;
- getfile(xtrlnkfile, xtrlnkskip);
- if (pathlen == 0) {
- Vprintf(stdout,
- "%s: zero length symbolic link (ignored)\n", name);
- return (GOOD);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ lnkbuf[0] = '\0';
+ pathlen = 0;
+ getfile(xtrlnkfile, xtrlnkskip);
+ if (pathlen == 0) {
+ Vprintf(stdout,
+ "%s: zero length symbolic link (ignored)\n", name);
+ return (GOOD);
+ }
+ if (linkit(lnkbuf, name, SYMLINK) == FAIL)
+ return (FAIL);
}
- if (linkit(lnkbuf, name, SYMLINK) == FAIL)
- return (FAIL);
+ else
+ skipfile();
+
#ifdef HAVE_LCHOWN
(void) lchown(name, luid, lgid);
#endif
skipfile();
return (GOOD);
}
- if (uflag && !Nflag)
- (void)unlink(name);
- if (mkfifo(name, mode) < 0) {
- warn("%s: cannot create fifo", name);
- skipfile();
- return (FAIL);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ if (uflag && !Nflag)
+ (void)unlink(name);
+ if (mkfifo(name, mode) < 0) {
+ warn("%s: cannot create fifo", name);
+ skipfile();
+ return (FAIL);
+ }
}
(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
(void) chmod(name, mode);
skipfile();
return (GOOD);
}
- if (uflag)
- (void)unlink(name);
- if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
- warn("%s: cannot create special file", name);
- skipfile();
- return (FAIL);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ if (uflag)
+ (void)unlink(name);
+ if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
+ warn("%s: cannot create special file", name);
+ skipfile();
+ return (FAIL);
+ }
}
(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
(void) chmod(name, mode);
return (GOOD);
case IFREG:
+ {
+ uid_t luid = curfile.dip->di_uid;
+ gid_t lgid = curfile.dip->di_gid;
+
Vprintf(stdout, "extract file %s\n", name);
if (Nflag) {
skipfile();
return (GOOD);
}
- if (uflag)
- (void)unlink(name);
- if ((ofile = OPEN(name, O_WRONLY | O_CREAT | O_TRUNC,
- 0666)) < 0) {
- warn("%s: cannot create file", name);
- skipfile();
- return (FAIL);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ if (uflag)
+ (void)unlink(name);
+ if ((ofile = OPEN(name, O_WRONLY | O_CREAT | O_TRUNC,
+ 0666)) < 0) {
+ warn("%s: cannot create file", name);
+ skipfile();
+ return (FAIL);
+ }
+ getfile(xtrfile, xtrskip);
+ (void) close(ofile);
}
- (void) fchown(ofile, curfile.dip->di_uid, curfile.dip->di_gid);
- (void) fchmod(ofile, mode);
+ else
+ skipfile();
+ (void) chown(name, luid, lgid);
+ (void) chmod(name, mode);
if (flags)
#ifdef __linux__
- (void) setflags(ofile, flags);
+ (void) fsetflags(name, flags);
#else
- (void) fchflags(ofile, flags);
+ (void) chflags(name, flags);
#endif
- getfile(xtrfile, xtrskip);
- (void) close(ofile);
utimes(name, timep);
return (GOOD);
}
+ }
/* NOTREACHED */
}
curfile.name, (long)blksread);
}
if (curblk > 0) {
- (*fill)((char *)buf, (size_t)(curblk * TP_BSIZE) + size);
+ (*fill)((char *)buf, (size_t)((curblk * TP_BSIZE) + size));
last_write_was_hole = 0;
}
if (size > 0) {
if (last_write_was_hole) {
FTRUNCATE(ofile, origsize);
}
- findinode(&spcl);
+ if (!readingmaps)
+ findinode(&spcl);
gettingfile = 0;
}
name, mode & 07777, sb.st_mode & 07777);
do_compare_error;
}
+ if (spcl.c_flags & DR_METAONLY) {
+ skipfile();
+ return;
+ }
switch (mode & IFMT) {
default:
skipfile();
numtrec = ntrec;
cnt = ntrec * TP_BSIZE;
rd = 0;
+#ifdef USE_QFA
+ if (createtapeposflag)
+ (void)GetTapePos(&curtapepos);
+#endif
getmore:
#ifdef RRESTORE
if (host)
buf->c_dinode.di_gid = u_ospcl.s_ospcl.c_dinode.odi_gid;
buf->c_dinode.di_size = u_ospcl.s_ospcl.c_dinode.odi_size;
buf->c_dinode.di_rdev = u_ospcl.s_ospcl.c_dinode.odi_rdev;
-#ifdef __linux__
+#if defined(__linux__) || defined(sunos)
buf->c_dinode.di_atime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_atime;
buf->c_dinode.di_mtime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_mtime;
buf->c_dinode.di_ctime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_ctime;
-#else /* __linux__ */
+#else /* __linux__ || sunos */
buf->c_dinode.di_atime = u_ospcl.s_ospcl.c_dinode.odi_atime;
buf->c_dinode.di_mtime = u_ospcl.s_ospcl.c_dinode.odi_mtime;
buf->c_dinode.di_ctime = u_ospcl.s_ospcl.c_dinode.odi_ctime;
-#endif /* __linux__ */
+#endif /* __linux__ || sunos */
buf->c_count = u_ospcl.s_ospcl.c_count;
memmove(buf->c_addr, u_ospcl.s_ospcl.c_fill, (long)256);
if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||
(buf->c_dinode.di_mode & IFMT) == IFDIR && Qcvt == 0) {
qcvt.qval = buf->c_dinode.di_size;
if (qcvt.val[0] || qcvt.val[1]) {
- printf("Note: Doing Quad swapping\n");
+ Vprintf(stdout, "Note: Doing Quad swapping\n");
Qcvt = 1;
}
}
findinode(&spcl);
noresyncmesg = 0;
}
+
+void
+ReReadInodeFromTape(dump_ino_t theino)
+{
+ long cntloop = 0;
+
+ FLUSHTAPEBUF();
+ noresyncmesg = 1;
+ do {
+ cntloop++;
+ gethead(&spcl);
+ } while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate) && (cntloop < 32));
+#ifdef DEBUG_QFA
+ fprintf(stderr, "%ld reads\n", cntloop);
+ if (cntloop == 32) {
+ fprintf(stderr, "DEBUG: bufsize %d\n", bufsize);
+ fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
+ fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
+ }
+#endif
+ findinode(&spcl);
+ noresyncmesg = 0;
+}
#endif /* USE_QFA */
void
git.wh0rd.org / dump.git / blobdiff