X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Ftape.c;h=bd411b945bf298467144dee8d1a297d160ee102c;hp=c4c50c0cc750d5af689358a9052e611ccf95e740;hb=e17af4c1a919e1d1456d6079682b63c7df947a7f;hpb=b43981b3544000a3683e6a53ea1cf8412f09e4d5

diff --git a/restore/tape.c b/restore/tape.c
index c4c50c0..bd411b9 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.85 2005/01/14 13:01:34 stelian Exp $";
+	"$Id: tape.c,v 1.101 2011/05/05 16:05:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -61,6 +61,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/mtio.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #ifdef	__linux__
 #include <sys/time.h>
@@ -167,6 +169,7 @@ static void	 xtrlnkskip __P((char *, size_t));
 static void	 xtrmap __P((char *, size_t));
 static void	 xtrmapskip __P((char *, size_t));
 static void	 xtrskip __P((char *, size_t));
+static void	 xtrxattr __P((char *, size_t));
 static void	 setmagtapein __P((void));
 static int	 extractattr __P((char *));
 static void	 compareattr __P((char *));
@@ -196,6 +199,9 @@ static void	xtrcmpskip __P((char *, size_t));
 static int readmapflag;
 static int readingmaps;		/* set to 1 while reading the maps */
 
+static char xattrbuf[XATTR_MAXSIZE];
+static int xattrlen;
+
 #ifdef DUMP_MACOSX
 static DumpFinderInfo	gFndrInfo;
 #endif
@@ -342,6 +348,7 @@ setup(void)
 #endif
 	FLUSHTAPEBUF();
 	findtapeblksize();
+	cvtflag = 0;
 	if (gethead(&spcl) == FAIL) {
 		blkcnt--; /* push back this block */
 		blksread--;
@@ -469,7 +476,6 @@ getvol(long nextvol)
 	if (nextvol == 1) {
 		tapesread = 0;
 		gettingfile = 0;
-		tpblksread = 0;
 		blksread = 0;
 	}
 	if (pipein) {
@@ -516,7 +522,8 @@ again:
 		do	{
 			fprintf(stderr, "Specify next volume # (none if no more volumes): ");
 			(void) fflush(stderr);
-			(void) fgets(buf, TP_BSIZE, terminal);
+			if (!fgets(buf, TP_BSIZE, terminal))
+				break;
 		} while (!feof(terminal) && buf[0] == '\n');
 		if (feof(terminal))
 			exit(1);
@@ -565,6 +572,8 @@ again:
 	}
 	if (haderror || (bot_code && !Mflag)) {
 		haderror = 0;
+		if (compare_errors)
+			fprintf(stderr, "%d compare errors so far\n", compare_errors);
 #ifdef sunos
 		fprintf(stderr, "Mount volume %ld\n", (long)newvol);
 #else
@@ -577,7 +586,8 @@ again:
 		fprintf(stderr, "otherwise enter tape name (default: %s) ", magtape);
 #endif
 		(void) fflush(stderr);
-		(void) fgets(buf, TP_BSIZE, terminal);
+		if (fgets(buf, TP_BSIZE, terminal))
+			exit(1);
 		if (feof(terminal))
 			exit(1);
 		if (!strcmp(buf, "none\n")) {
@@ -837,9 +847,54 @@ extractfile(struct entry *ep, int doremove)
 		return (FAIL);
 
 	case IFSOCK:
-		Vprintf(stdout, "skipped socket %s\n", name);
+	{
+		uid_t luid = curfile.dip->di_uid;
+		gid_t lgid = curfile.dip->di_gid;
+
+		Vprintf(stdout, "extract socket %s\n", name);
 		skipfile();
+		if (Nflag)
+			return (GOOD);
+		if (! (spcl.c_flags & DR_METAONLY)) {
+			int sk;
+			struct sockaddr_un addr;
+
+			if (uflag)
+				(void)unlink(name);
+
+			if ((sk = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
+				warn("%s: cannot create socket", name);
+				return (FAIL);
+			}
+			addr.sun_family = AF_UNIX;
+			strcpy(addr.sun_path, name);
+			if (bind(sk, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) {
+				warn("%s: cannot create socket", name);
+				return (FAIL);
+			}
+			close(sk);
+		}
+		if (chown(name, luid, lgid) < 0)
+			warn("%s: chown", name);
+		if (chmod(name, mode) < 0)
+			warn("%s: chmod", name);
+		extractattr(name);
+		utimes(name, timep);
+		if (flags)
+#ifdef	__linux__
+			(void) lsetflags(name, flags);
+#else
+#ifdef sunos
+			{
+			warn("%s: cannot call chflags", name);
+			/* (void) chflags(name, flags); */
+			}
+#else
+			(void) chflags(name, flags);
+#endif
+#endif
 		return (GOOD);
+	}
 
 	case IFDIR:
 	{
@@ -878,29 +933,36 @@ extractfile(struct entry *ep, int doremove)
 			skipfile();
 
 #ifdef HAVE_LCHOWN
-		(void) lchown(name, luid, lgid);
+		if (lchown(name, luid, lgid) < 0)
+			warn("%s: lchown", name);
 #endif
 		extractattr(name);
 		return (GOOD);
 	}
 
 	case IFIFO:
+	{
+		uid_t luid = curfile.dip->di_uid;
+		gid_t lgid = curfile.dip->di_gid;
+
 		Vprintf(stdout, "extract fifo %s\n", name);
-		if (Nflag) {
-			skipfile();
+		skipfile();
+		if (Nflag)
 			return (GOOD);
-		}
 		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);
+		if (chown(name, luid, lgid) < 0)
+			warn("%s: chown", name);
+		if (chmod(name, mode) < 0)
+			warn("%s: chmod", name);
+		extractattr(name);
+		utimes(name, timep);
 		if (flags)
 #ifdef  __linux__
 			(void) lsetflags(name, flags);
@@ -914,29 +976,33 @@ extractfile(struct entry *ep, int doremove)
 			(void) chflags(name, flags);
 #endif
 #endif
-		skipfile();
-		extractattr(name);
-		utimes(name, timep);
 		return (GOOD);
-
+	}
 	case IFCHR:
 	case IFBLK:
+	{
+		uid_t luid = curfile.dip->di_uid;
+		gid_t lgid = curfile.dip->di_gid;
+		int lrdev = (int)curfile.dip->di_rdev;
+
 		Vprintf(stdout, "extract special file %s\n", name);
-		if (Nflag) {
-			skipfile();
+		skipfile();
+		if (Nflag)
 			return (GOOD);
-		}
 		if (! (spcl.c_flags & DR_METAONLY)) {
 			if (uflag)
 				(void)unlink(name);
-			if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
+			if (mknod(name, mode, lrdev) < 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);
+		if (chown(name, luid, lgid) < 0)
+			warn("%s: chown", name);
+		if (chmod(name, mode) < 0)
+			warn("%s: chmod", name);
+		extractattr(name);
+		utimes(name, timep);
 		if (flags)
 #ifdef	__linux__
 			{
@@ -956,11 +1022,8 @@ extractfile(struct entry *ep, int doremove)
 			}
 #endif
 #endif
-		skipfile();
-		extractattr(name);
-		utimes(name, timep);
 		return (GOOD);
-
+	}
 	case IFREG:
 	{
 		uid_t luid = curfile.dip->di_uid;
@@ -985,8 +1048,12 @@ extractfile(struct entry *ep, int doremove)
 		}
 		else
 			skipfile();
-		(void) chown(name, luid, lgid);
-		(void) chmod(name, mode);
+		if (chown(name, luid, lgid) < 0)
+			warn("%s: chown", name);
+		if (chmod(name, mode) < 0)
+			warn("%s: chmod", name);
+		extractattr(name);
+		utimes(name, timep);
 		if (flags)
 #ifdef	__linux__
 			(void) lsetflags(name, flags);
@@ -1000,8 +1067,6 @@ extractfile(struct entry *ep, int doremove)
 			(void) chflags(name, flags);
 #endif
 #endif
-		extractattr(name);
-		utimes(name, timep);
 		return (GOOD);
 	}
 	}
@@ -1029,10 +1094,14 @@ extractattr(char *path)
 			skipfile();
 #endif
 			break;
-		case EXT_XATTR:
-			msg("EA/ACLs not supported in this version, skipping\n");
-			skipfile();
-			break;
+		case EXT_XATTR: {
+			char xattr[XATTR_MAXSIZE];
+			
+			if (readxattr(xattr) == GOOD) {
+				xattr_extract(path, xattr);
+				break;
+			}
+		}
 		default:
 			msg("unexpected inode extension %ld, skipping\n", spcl.c_extattributes);
 			skipfile();
@@ -1054,7 +1123,6 @@ extractfinderinfoufs(char *name)
 	u_int32_t	uid;
 	u_int32_t	gid;
 	char	path[MAXPATHLEN], fname[MAXPATHLEN];
-	int toto;
 
 	curfile.name = name;
 	curfile.action = USING;
@@ -1203,17 +1271,50 @@ extractresourceufs(char *name)
 		/* and add the resource data from tape */
 		getfile(xtrfile, xtrskip);
 
-		(void) fchown(ofile, uid, gid);
-		(void) fchmod(ofile, mode);
+		if (fchown(ofile, uid, gid) < 0)
+			warn("%s: fchown", name);
+		if (fchmod(ofile, mode) < 0)
+			warn("%s: fchmod", name);
 		(void) close(ofile);
-		(void) lsetflags(oFileRsrc, flags);
 		utimes(oFileRsrc, timep);
+		(void) lsetflags(oFileRsrc, flags);
 		return (GOOD);
 	}
 	/* NOTREACHED */
 }
 #endif /* DUMP_MACOSX */
 
+int
+readxattr(char *buffer)
+{
+	if (dflag)
+		msg("reading EA data for inode %lu\n", curfile.ino);
+
+	curfile.name = "EA block";
+	if (curfile.dip->di_size > XATTR_MAXSIZE) {
+		fprintf(stderr, "EA size too big (%ld)", (long)curfile.dip->di_size);
+		skipfile();
+		return (FAIL);
+	}
+
+	memset(xattrbuf, 0, XATTR_MAXSIZE);
+	xattrlen = 0;
+
+	/*
+	 * ugly hack: cope with invalid spcl.c_addr[] records written by
+	 * old versions of dump.
+	 */
+	readmapflag = 1;
+
+	getfile(xtrxattr, xtrnull);
+
+	readmapflag = 0;
+
+	memcpy(buffer, xattrbuf, XATTR_MAXSIZE);
+
+	return (GOOD);
+}
+
 /*
  * skip over bit maps on the tape
  */
@@ -1300,7 +1401,11 @@ loop:
 			break;
 		}
 	}
-	if (gethead(&spcl) == GOOD && size > 0) {
+	while (gethead(&spcl) != GOOD) {
+		fprintf(stderr, "Incorrect block for %s at %ld blocks\n",
+			curfile.name, (long)blksread);
+	}
+	if (size > 0) {
 		if (spcl.c_type == TS_ADDR)
 			goto loop;
 		Dprintf(stdout,
@@ -1321,7 +1426,8 @@ loop:
 		last_write_was_hole = 1;
 	}
 	if (last_write_was_hole) {
-		FTRUNCATE(ofile, origsize);
+		if (FTRUNCATE(ofile, origsize) < 0)
+			warn("%s: ftruncate", curfile.name);
 	}
 	if (!readingmaps) 
 		findinode(&spcl);
@@ -1346,8 +1452,6 @@ xtrfile(char *buf, size_t size)
 static void
 xtrfilefinderinfo(char *buf, size_t size)
 {
-	if (Nflag)
-		return;
 	bcopy(buf, &gFndrInfo, size);
 }
 #endif /* DUMP_MACOSX */
@@ -1483,6 +1587,17 @@ xtrcmpskip(UNUSED(char *buf), size_t size)
 }
 #endif /* COMPARE_ONTHEFLY */
 
+static void
+xtrxattr(char *buf, size_t size)
+{
+	if (xattrlen + size > XATTR_MAXSIZE) {
+		fprintf(stderr, "EA size too big (%ld)", (long)xattrlen + size);
+		return;
+	}
+	memcpy(xattrbuf + xattrlen, buf, size);
+	xattrlen += size;
+}
+
 #if !COMPARE_ONTHEFLY
 static int
 do_cmpfiles(int fd_tape, int fd_disk, OFF_T size)
@@ -1527,7 +1642,7 @@ cmpfiles(char *tapefile, char *diskfile, struct STAT *sbuf_disk)
 	int fd_tape, fd_disk;
 
 	if (STAT(tapefile, &sbuf_tape) != 0) {
-		panic("Can't lstat tmp file %s: %s\n", tapefile,
+		panic("can't lstat tmp file %s: %s\n", tapefile,
 		      strerror(errno));
 		do_compare_error;
 	}
@@ -1545,12 +1660,12 @@ cmpfiles(char *tapefile, char *diskfile, struct STAT *sbuf_disk)
 	}
 
 	if ((fd_tape = OPEN(tapefile, O_RDONLY)) < 0) {
-		panic("Can't open %s: %s\n", tapefile, strerror(errno));
+		panic("can't open %s: %s\n", tapefile, strerror(errno));
 		do_compare_error;
 	}
 	if ((fd_disk = OPEN(diskfile, O_RDONLY)) < 0) {
 		close(fd_tape);
-		panic("Can't open %s: %s\n", diskfile, strerror(errno));
+		panic("can't open %s: %s\n", diskfile, strerror(errno));
 		do_compare_error;
 	}
 
@@ -1598,6 +1713,8 @@ cmpfiles(char *tapefile, char *diskfile, struct STAT *sbuf_disk)
 static void
 compareattr(char *name)
 {
+	int xattr_done = 0;
+	
 	while (spcl.c_flags & DR_EXTATTRIBUTES) {
 		switch (spcl.c_extattributes) {
 		case EXT_MACOSFNDRINFO:
@@ -1608,16 +1725,26 @@ compareattr(char *name)
 			msg("MacOSX not supported for comparision in this version, skipping\n");
 			skipfile();
 			break;
-		case EXT_XATTR:
-			msg("EA/ACLs not supported for comparision in this version, skipping\n");
-			skipxattr();
+		case EXT_XATTR: {
+			char xattr[XATTR_MAXSIZE];
+
+			if (readxattr(xattr) == GOOD) {
+				if (xattr_compare(name, xattr) == FAIL)
+					do_compare_error;
+				xattr_done = 1;
+			}
+			else
+				do_compare_error;
 			break;
+		}
 		default:
 			msg("unexpected inode extension %ld, skipping\n", spcl.c_extattributes);
 			skipfile();
 			break;
 		}
 	}
+	if (!xattr_done && xattr_compare(name, NULL) == FAIL)
+		do_compare_error;
 }
 
 #if !COMPARE_ONTHEFLY
@@ -1652,7 +1779,7 @@ comparefile(char *name)
 	}
 
 	if ((r = LSTAT(name, &sb)) != 0) {
-		warn("%s: does not exist (%d)", name, r);
+		warn("unable to stat %s", name);
 		do_compare_error;
 		skipfile();
 		return;
@@ -1730,7 +1857,7 @@ comparefile(char *name)
 			return;
 		}
 		if ((lsize = readlink(name, lbuf, MAXPATHLEN)) < 0) {
-			panic("readlink of %s failed: %s", name,
+			panic("readlink of %s failed: %s\n", name,
 			      strerror(errno));
 			do_compare_error;
 		}
@@ -1773,7 +1900,7 @@ comparefile(char *name)
 	case IFREG:
 #if COMPARE_ONTHEFLY
 		if ((ifile = OPEN(name, O_RDONLY)) < 0) {
-			panic("Can't open %s: %s\n", name, strerror(errno));
+			warn("can't open %s", name);
 			skipfile();
 			do_compare_error;
 		}
@@ -2016,6 +2143,10 @@ readtape_comprfile(char *buf)
 		((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
 	numtrec = ntrec;
 	tpb = (struct tapebuf *) tapebuf;
+#ifdef USE_QFA
+	if (createtapeposflag)
+		(void)GetTapePos(&curtapepos);
+#endif
 
 	/* read the block prefix */
 	ret = read_a_block(mt, tapebuf, PREFIXSIZE, &rl);
@@ -2105,6 +2236,10 @@ readtape_comprtape(char *buf)
 		((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
 	numtrec = ntrec;
 	tpb = (struct tapebuf *) tapebuf;
+#ifdef USE_QFA
+	if (createtapeposflag)
+		(void)GetTapePos(&curtapepos);
+#endif
 
 	/* read the block */
 	size = bufsize + PREFIXSIZE;
@@ -2294,8 +2429,8 @@ decompress_tapebuf(struct tapebuf *tpbin, int readsize)
 	}
 	if (reason) {
 		if (lengtherr)
-			fprintf(stderr, "%s compressed block: %d expected: %u\n",
-				lengtherr, readsize, tpbin->length + PREFIXSIZE);
+			fprintf(stderr, "%s compressed block: %d expected: %lu\n",
+				lengtherr, readsize, (unsigned long)tpbin->length + PREFIXSIZE);
 		fprintf(stderr, "decompression error, block %ld: %s\n",
 			tpblksread+1, reason);
 		if (!cresult)
@@ -2361,6 +2496,7 @@ findtapeblksize(void)
 		errx(1, "Tape read error on first record");
 
 	memcpy(&spclpt, tapebuf, TP_BSIZE);
+	cvtflag = 0;
 	if (converthead(&spclpt) == FAIL) {
 		cvtflag++;
 		if (converthead(&spclpt) == FAIL) {
@@ -2571,7 +2707,7 @@ converthead(struct s_spcl *buf)
 		if (checksum((int *)buf) == FAIL)
 			return (FAIL);
 		if (Bcvt)
-			swabst((u_char *)"8i4s31i528bi192b3i", (u_char *)buf);
+			swabst((u_char *)"8i4s1l29i528bi192b4i", (u_char *)buf);
 		goto good;
 	}
 	memcpy(&u_ospcl.s_ospcl, buf, TP_BSIZE);
@@ -3208,11 +3344,14 @@ ReReadInodeFromTape(dump_ino_t theino)
 		cntloop++;
 		gethead(&spcl);
 	} while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate));
+
+	tpblksread = spcl.c_tapea + spcl.c_volume;
 #ifdef DEBUG_QFA
 	fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
 	fprintf(stderr, "DEBUG: bufsize %ld\n", bufsize);
 	fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
-	fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
+	fprintf(stderr, "DEBUG: tapea %d\n", spcl.c_tapea);
+	fprintf(stderr, "DEBUG: tpblksread %ld\n", tpblksread);
 #endif
 	findinode(&spcl);
 	noresyncmesg = 0;