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

diff --git a/restore/tape.c b/restore/tape.c
index c4c50c0..ab6b113 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.88 2005/02/25 13:44:32 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -1054,7 +1054,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;
@@ -1346,8 +1345,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 */
@@ -1527,7 +1524,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 +1542,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;
 	}
 
@@ -1652,7 +1649,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 +1727,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 +1770,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;
 		}