X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Ftape.c;h=3d673b62b740c9c1057e70a2ef6c3d0cd9dec469;hp=c74e3909f10e46cf1f1ae026573f5d9cfab56bde;hb=d322203c4af88bba3041d46e0810ad9b8688f19a;hpb=cb6d3f79501e3c03637ca49f4b980288771eabd3

diff --git a/restore/tape.c b/restore/tape.c
index c74e390..3d673b6 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.90 2005/06/08 13:24:11 stelian Exp $";
+	"$Id: tape.c,v 1.92 2007/02/22 20:16:23 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -570,6 +570,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
@@ -906,6 +908,8 @@ extractfile(struct entry *ep, int doremove)
 		}
 		(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
 		(void) chmod(name, mode);
+		extractattr(name);
+		utimes(name, timep);
 		if (flags)
 #ifdef  __linux__
 			(void) lsetflags(name, flags);
@@ -920,8 +924,6 @@ extractfile(struct entry *ep, int doremove)
 #endif
 #endif
 		skipfile();
-		extractattr(name);
-		utimes(name, timep);
 		return (GOOD);
 
 	case IFCHR:
@@ -942,6 +944,8 @@ extractfile(struct entry *ep, int doremove)
 		}
 		(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
 		(void) chmod(name, mode);
+		extractattr(name);
+		utimes(name, timep);
 		if (flags)
 #ifdef	__linux__
 			{
@@ -962,8 +966,6 @@ extractfile(struct entry *ep, int doremove)
 #endif
 #endif
 		skipfile();
-		extractattr(name);
-		utimes(name, timep);
 		return (GOOD);
 
 	case IFREG:
@@ -992,6 +994,8 @@ extractfile(struct entry *ep, int doremove)
 			skipfile();
 		(void) chown(name, luid, lgid);
 		(void) chmod(name, mode);
+		extractattr(name);
+		utimes(name, timep);
 		if (flags)
 #ifdef	__linux__
 			(void) lsetflags(name, flags);
@@ -1005,8 +1009,6 @@ extractfile(struct entry *ep, int doremove)
 			(void) chflags(name, flags);
 #endif
 #endif
-		extractattr(name);
-		utimes(name, timep);
 		return (GOOD);
 	}
 	}
@@ -1214,8 +1216,8 @@ extractresourceufs(char *name)
 		(void) fchown(ofile, uid, gid);
 		(void) fchmod(ofile, mode);
 		(void) close(ofile);
-		(void) lsetflags(oFileRsrc, flags);
 		utimes(oFileRsrc, timep);
+		(void) lsetflags(oFileRsrc, flags);
 		return (GOOD);
 	}
 	/* NOTREACHED */