X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fmain.c;h=361c4ecd4b4e190e01e03a251011e783a2e2ed3a;hp=98674e4c8fc4c171cbef59a6489e3b436c4160f9;hb=a55ce9149e3f4a5f848a20b7593dbe8cd7b0bbd1;hpb=e1abc9ce25132eef1239047a071c2c1d4822dd9f

diff --git a/restore/main.c b/restore/main.c
index 98674e4..361c4ec 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -37,11 +37,12 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.44 2003/03/30 15:40:38 stelian Exp $";
+	"$Id: main.c,v 1.47 2004/12/15 11:00:01 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
 #include <compatlfs.h>
+#include <sys/types.h>
 #include <fcntl.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -59,7 +60,15 @@ static const char rcsid[] =
 #include <signal.h>
 #include <string.h>
 #else	/* __linux__ */
+#ifdef sunos
+#include <signal.h>
+#include <string.h>
+#include <sys/fcntl.h>
+#include <bsdcompat.h>
+#include <sys/mtio.h>
+#else
 #include <ufs/ufs/dinode.h>
+#endif
 #endif	/* __linux__ */
 #include <protocols/dumprestore.h>
 
@@ -77,9 +86,13 @@ static const char rcsid[] =
 #include "restore.h"
 #include "extern.h"
 
+int abortifconnerr = 1;		/* set to 1 if lib dumprmt.o should exit on connection errors
+                                otherwise just print a message using msg */
+
 int	aflag = 0, bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
 int	hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, Vflag = 0, zflag = 0;
 int	uflag = 0, lflag = 0, Lflag = 0, oflag = 0;
+int	ufs2flag = 0;
 char	*Afile = NULL;
 int	dokerberos = 0;
 char	command = '\0';
@@ -112,6 +125,8 @@ unsigned long qfadumpdate;
 long long curtapepos;
 #endif /* USE_QFA */
 
+long smtc_errno;
+
 #if defined(__linux__) || defined(sunos)
 char	*__progname;
 #endif
@@ -379,6 +394,18 @@ main(int argc, char *argv[])
 		/* end reading header info */
 		/* tape position table starts here */
 		gSeekstart = ftell(gTapeposfp); /* remember for later use */
+#ifdef sunos
+		if (GetSCSIIDFromPath(inputdev, &scsiid)) {
+			errx(1, "can't get SCSI-ID for %s\n", inputdev);
+		}
+		if (scsiid < 0) {
+			errx(1, "can't get SCSI-ID for %s\n", inputdev);
+		}
+		sprintf(smtcpath, "/dev/rsmtc%ld,0", scsiid);
+		if ((fdsmtc = open(smtcpath, O_RDWR)) == -1) {
+			errx(1, "can't open smtc device: %s, %d\n", smtcpath, errno);
+		}
+#endif
 	}
 #endif /* USE_QFA */
 
@@ -400,9 +427,10 @@ main(int argc, char *argv[])
 			err(1, "cannot cd to %s", filesys);
 		compare_ignore_not_found = dumptime > 0;
 		initsymtable((char *)0);
-		extractdirs(0);
+		extractdirs(1);
 		treescan(".", ROOTINO, nodeupdates);
 		compareleaves();
+		comparedirmodes();
 		checkrestore();
 		if (compare_errors) {
 			printf("Some files were modified!\n");
@@ -535,6 +563,11 @@ main(int argc, char *argv[])
 		setdirmodes(oflag ? FORCE : 0);
 		if (dflag)
 			checkrestore();
+#ifdef sunos
+		if (fdsmtc != -1) {
+			close(fdsmtc);
+		}
+#endif /* sunos */
 #ifdef DEBUG_QFA
 		tiend = time(NULL);
 		titaken = tiend - tistart;
@@ -547,6 +580,18 @@ main(int argc, char *argv[])
 #ifdef DEBUG_QFA
 		tistart = time(NULL);
 #endif
+#ifdef sunos
+		if (GetSCSIIDFromPath(inputdev, &scsiid)) {
+			errx(1, "can't get SCSI-ID for %s\n", inputdev);
+		}
+		if (scsiid < 0) {
+			errx(1, "can't get SCSI-ID for %s\n", inputdev);
+		}
+		sprintf(smtcpath, "/dev/rsmtc%ld,0", scsiid);
+		if ((fdsmtc = open(smtcpath, O_RDWR)) == -1) {
+			errx(1, "can't open smtc device: %s, %d\n", smtcpath, errno);
+		}
+#endif /* sunos */
 		setup();
 		msg("writing QFA positions to %s\n", gTapeposfile);
 		(void) umask(orig_umask);
@@ -556,7 +601,7 @@ main(int argc, char *argv[])
 			errx(1, "can't create tapeposfile\n");
 		(void) umask(FORCED_UMASK);
 		/* print QFA-file header */
-		sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION,(unsigned long)spcl.c_date);
+		sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
 		if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
 			errx(1, "can't write tapeposfile\n");
 		sprintf(gTps, "ino\ttapeno\ttapepos\n");
@@ -578,14 +623,19 @@ main(int argc, char *argv[])
 			treescan(name, ino, addfile);
 		}
 		createfiles();
+#ifdef sunos
+		if (fdsmtc != -1) {
+			close(fdsmtc);
+		}
+#endif /* sunos */
 #ifdef DEBUG_QFA
 		tiend = time(NULL);
 		titaken = tiend - tistart;
-		msg("writing QFA positions took %d:%02d:%02d\n", titaken / 3600,
+		msg("writing QFA positions took %d:%02d:%02d\n", titaken / 3600, 
 			(titaken % 3600) / 60, titaken % 60);
 #endif /* DEBUG_QFA */
 		break;
-#endif /* USE_QFA */
+#endif	/* USE_QFA */
 	}
 	exit(0);
 	/* NOTREACHED */