#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.65 2002/11/15 09:25:42 stelian Exp $";
+ "$Id: tape.c,v 1.69 2003/02/11 12:43:45 stelian Exp $";
#endif /* not lint */
#include <config.h>
static void findinode __P((struct s_spcl *));
static void findtapeblksize __P((void));
static int gethead __P((struct s_spcl *));
+static int converthead __P((struct s_spcl *));
+static void converttapebuf __P((struct tapebuf *));
static void readtape __P((char *));
static void setdumpnum __P((void));
static u_int swabi __P((u_int));
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");
/* read the block prefix */
ret = read_a_block(mt, tapebuf, PREFIXSIZE, &rl);
+ converttapebuf(tpb);
if (Vflag && (ret == 0 || rl < (int)PREFIXSIZE || tpb->length == 0))
ret = 0;
if (ret <= 0)
goto readerr;
+ converttapebuf(tpb);
tbufptr = decompress_tapebuf(tpb, rl);
if (tbufptr == NULL) {
msg_read_error("Tape decompression error while");
long i;
size_t len;
struct tapebuf *tpb = (struct tapebuf *) tapebuf;
- struct s_spcl *spclpt = (struct s_spcl *) tapebuf;
+ struct s_spcl spclpt;
for (i = 0; i < ntrec; i++)
((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
if (read_a_block(mt, tapebuf, len, &i) <= 0)
errx(1, "Tape read error on first record");
+ memcpy(&spclpt, tapebuf, TP_BSIZE);
+ if (converthead(&spclpt) == FAIL) {
+ cvtflag++;
+ if (converthead(&spclpt) == FAIL) {
+ /* Special case for old compressed tapes with prefix */
+ if (magtapein && (i % TP_BSIZE != 0))
+ goto oldformat;
+ errx(1, "Tape is not a dump tape");
+ }
+ fprintf(stderr, "Converting to new file system format.\n");
+ }
/*
* If the input is from a file or a pipe, we read TP_BSIZE
* bytes looking for a dump header. If the dump is compressed
* dump is not compressed and does not have a prefix.
*/
if (!magtapein) {
- if (spclpt->c_type == TS_TAPE
- && spclpt->c_flags & DR_COMPRESSED) {
+ if (spclpt.c_type == TS_TAPE
+ && spclpt.c_flags & DR_COMPRESSED) {
/* It's a compressed dump file, read in the */
- /* rest of the block based on spclpt->c_ntrec. */
- if (spclpt->c_ntrec > ntrec)
+ /* rest of the block based on spclpt.c_ntrec. */
+ if (spclpt.c_ntrec > ntrec)
errx(1, "Tape blocksize is too large, use "
- "\'-b %d\' ", spclpt->c_ntrec);
- ntrec = spclpt->c_ntrec;
+ "\'-b %d\' ", spclpt.c_ntrec);
+ ntrec = spclpt.c_ntrec;
len = (ntrec - 1) * TP_BSIZE;
zflag = 1;
}
* what we asked for; adjust the value of ntrec and test for
* a compressed dump tape.
*/
-
if (i % TP_BSIZE != 0) {
+oldformat:
/* may be old format compressed dump tape with a prefix */
- spclpt = (struct s_spcl *) tpb->buf;
+ memcpy(&spclpt, tpb->buf, TP_BSIZE);
+ cvtflag = 0;
+ if (converthead(&spclpt) == FAIL) {
+ cvtflag++;
+ if (converthead(&spclpt) == FAIL)
+ errx(1, "Tape is not a dump tape");
+ fprintf(stderr, "Converting to new file system format.\n");
+ }
if (i % TP_BSIZE == PREFIXSIZE
&& tpb->compressed == 0
- && spclpt->c_type == TS_TAPE
- && spclpt->c_flags & DR_COMPRESSED) {
+ && spclpt.c_type == TS_TAPE
+ && spclpt.c_flags & DR_COMPRESSED) {
zflag = 1;
tbufptr = tpb->buf;
if (tpb->length > bufsize)
i, TP_BSIZE);
}
ntrec = i / TP_BSIZE;
- if (spclpt->c_type == TS_TAPE) {
- if (spclpt->c_flags & DR_COMPRESSED)
+ if (spclpt.c_type == TS_TAPE) {
+ if (spclpt.c_flags & DR_COMPRESSED)
zflag = 1;
- if (spclpt->c_ntrec > ntrec)
+ if (spclpt.c_ntrec > ntrec)
errx(1, "Tape blocksize is too large, use "
- "\'-b %d\' ", spclpt->c_ntrec);
+ "\'-b %d\' ", spclpt.c_ntrec);
}
numtrec = ntrec;
Vprintf(stdout, "Tape block size is %ld\n", ntrec);
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
*/
static int
gethead(struct s_spcl *buf)
+{
+ readtape((char *)buf);
+ return converthead(buf);
+}
+
+static int
+converthead(struct s_spcl *buf)
{
int32_t i;
union {
} u_ospcl;
if (!cvtflag) {
- readtape((char *)buf);
if (buf->c_magic != NFS_MAGIC) {
if (swabi(buf->c_magic) != NFS_MAGIC)
return (FAIL);
if (checksum((int *)buf) == FAIL)
return (FAIL);
if (Bcvt)
- swabst((u_char *)"8i4s31i528bi192b2i", (u_char *)buf);
+ swabst((u_char *)"8i4s31i528bi192b3i", (u_char *)buf);
goto good;
}
- readtape((char *)(&u_ospcl.s_ospcl));
+ memcpy(&u_ospcl.s_ospcl, buf, TP_BSIZE);
memset((char *)buf, 0, (long)TP_BSIZE);
buf->c_type = u_ospcl.s_ospcl.c_type;
buf->c_date = u_ospcl.s_ospcl.c_date;
return(GOOD);
}
+static void
+converttapebuf(struct tapebuf *tpb)
+{
+ if (Bcvt) {
+ struct tb {
+ unsigned int length:28;
+ unsigned int flags:3;
+ unsigned int compressed:1;
+ } tb;
+ swabst((u_char *)"i", (u_char *)tpb);
+ memcpy(&tb, tpb, 4);
+ tpb->length = tb.length;
+ tpb->flags = tb.flags;
+ tpb->compressed = tb.compressed;
+ }
+}
+
/*
* Check that a header is where it belongs and predict the next header
*/
#ifdef RDUMP
if (host)
- err = (rmtseek((long)pos, SEEK_SET) < 0);
+ err = (rmtseek(pos, SEEK_SET) < 0);
else
#endif
{
git.wh0rd.org / dump.git / blobdiff