X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fmain.c;h=2f2db7a192c832aae6683f15246884f266eb98e6;hb=9ca70cf6a082bb146eaaa0b09361643feca38875;hp=fb51380cf600c92078c0f584ce675a2b224f312a;hpb=e51470bfc05d83f82c37d24504220c7163bbd4c1;p=dump.git

diff --git a/restore/main.c b/restore/main.c
index fb51380..2f2db7a 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,11 +41,12 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.37 2002/01/25 14:59:53 stelian Exp $";
+	"$Id: main.c,v 1.40 2002/06/08 07:10:37 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
 #include <compatlfs.h>
+#include <fcntl.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -82,7 +83,7 @@ static const char rcsid[] =
 
 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;
+int	uflag = 0, lflag = 0, Lflag = 0, oflag = 0;
 char	*Afile = NULL;
 int	dokerberos = 0;
 char	command = '\0';
@@ -109,9 +110,13 @@ char	*gTapeposfile;
 char	gTps[255];
 long	gSeekstart;
 int	tapeposflag;
+int	gTapeposfd;
+int	createtapeposflag;
+unsigned long qfadumpdate;
+long long curtapepos;
 #endif /* USE_QFA */
 
-#ifdef	__linux__
+#if defined(__linux__) || defined(sunos)
 char	*__progname;
 #endif
 
@@ -129,17 +134,18 @@ main(int argc, char *argv[])
 	char *p, name[MAXPATHLEN];
 	FILE *filelist = NULL;
 	char fname[MAXPATHLEN];
-#ifdef USE_QFA
-	tapeposflag = 0;
-#endif
-#ifdef USE_QFADEBUG
+#ifdef DEBUG_QFA
 	time_t tistart, tiend, titaken;
 #endif
+#ifdef USE_QFA
+	tapeposflag = 0;
+	createtapeposflag = 0;
+#endif /* USE_QFA */
 
 	/* Temp files should *not* be readable.  We set permissions later. */
 	(void) umask(077);
 	filesys[0] = '\0';
-#ifdef	__linux__
+#if defined(__linux__) || defined(sunos)
 	__progname = argv[0];
 #endif
 
@@ -160,9 +166,9 @@ main(int argc, char *argv[])
 #ifdef KERBEROS
 		"k"
 #endif
-		"lL:mMN"
+		"lL:mMNo"
 #ifdef USE_QFA
-		"Q:"
+		"P:Q:"
 #endif
 		"Rrs:tT:uvVxX:y")) != -1)
 		switch(ch) {
@@ -213,6 +219,9 @@ main(int argc, char *argv[])
 #endif
 		case 'C':
 		case 'i':
+#ifdef USE_QFA
+		case 'P':
+#endif
 		case 'R':
 		case 'r':
 		case 't':
@@ -222,6 +231,13 @@ main(int argc, char *argv[])
 				    "%c and %c options are mutually exclusive",
 				    ch, command);
 			command = ch;
+#ifdef USE_QFA
+			if (ch == 'P') {
+				gTapeposfile = optarg;
+				createtapeposflag = 1;
+			}
+#endif
+
 			break;
 		case 'l':
 			lflag = 1;
@@ -242,6 +258,9 @@ main(int argc, char *argv[])
 		case 'N':
 			Nflag = 1;
 			break;
+		case 'o':
+			oflag = 1;
+			break;
 #ifdef USE_QFA
 		case 'Q':
 			gTapeposfile = optarg;
@@ -349,10 +368,7 @@ main(int argc, char *argv[])
 		if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
 			errx(1, "not requested format of -- %s", gTapeposfile);
 		gTps[strlen(gTps) - 1] = 0;
-		/* TODO: check dumpdate from QFA file with current dump file's
-		 * dump date */
-		/* if not equal either output warning and continue without QFA
-		 * or abort */
+		qfadumpdate = atol(gTps);
 		/* read empty line */
 		if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
 			errx(1, "not requested format of -- %s", gTapeposfile);
@@ -364,7 +380,7 @@ main(int argc, char *argv[])
 		/* end reading header info */
 		/* tape position table starts here */
 		gSeekstart = ftell(gTapeposfp); /* remember for later use */
-}
+	}
 #endif /* USE_QFA */
 
 	switch (command) {
@@ -497,7 +513,7 @@ main(int argc, char *argv[])
 	 * Batch extraction of tape contents.
 	 */
 	case 'x':
-#ifdef USE_QFADEBUG
+#ifdef DEBUG_QFA
 		tistart = time(NULL);
 #endif
 		setup();
@@ -517,16 +533,56 @@ main(int argc, char *argv[])
 		}
 		createfiles();
 		createlinks();
-		setdirmodes(0);
+		setdirmodes(oflag ? FORCE : 0);
 		if (dflag)
 			checkrestore();
-#ifdef USE_QFADEBUG
+#ifdef DEBUG_QFA
 		tiend = time(NULL);
 		titaken = tiend - tistart;
 		msg("restore took %d:%02d:%02d\n", titaken / 3600, 
 			(titaken % 3600) / 60, titaken % 60);
-#endif /* USE_QFADEBUG */
+#endif /* DEBUG_QFA */
 		break;
+#ifdef USE_QFA
+	case 'P':
+#ifdef DEBUG_QFA
+		tistart = time(NULL);
+#endif
+		setup();
+		msg("writing QFA positions to %s\n", gTapeposfile);
+		if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0)
+			errx(1, "can't create tapeposfile\n");
+		/* print QFA-file header */
+		sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION,(unsigned long)spcl.c_date);
+		if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+			errx(1, "can't write tapeposfile\n");
+		sprintf(gTps, "ino\ttapeno\ttapepos\n");
+		if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+			errx(1, "can't write tapeposfile\n");
+
+		extractdirs(1);
+		initsymtable((char *)0);
+		for (;;) {
+			NEXTFILE(p);
+			if (!p)
+				break;
+			canon(p, name, sizeof(name));
+			ino = dirlookup(name);
+			if (ino == 0)
+				continue;
+			if (mflag)
+				pathcheck(name);
+			treescan(name, ino, addfile);
+		}
+		createfiles();
+#ifdef DEBUG_QFA
+		tiend = time(NULL);
+		titaken = tiend - tistart;
+		msg("writing QFA positions took %d:%02d:%02d\n", titaken / 3600,
+			(titaken % 3600) / 60, titaken % 60);
+#endif /* DEBUG_QFA */
+		break;
+#endif /* USE_QFA */
 	}
 	exit(0);
 	/* NOTREACHED */
@@ -564,20 +620,27 @@ usage(void)
 
 	fprintf(stderr,
 		"usage:"
-		"\t%s -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
+		"\t%s -C [-cd" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
 		"\t%s    [-F script] [-L limit] [-s fileno]\n"
-		"\t%s -i [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f file]\n"
+		"\t%s -i [-acdh" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
 		"\t%s    [-F script] " qfaflag "[-s fileno]\n"
-		"\t%s -r [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+#ifdef USE_QFA
+		"\t%s -P file [-acdh" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+		"\t%s    [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
+#endif
+		"\t%s -r [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
 		"\t%s    [-s fileno] [-T directory]\n"
-		"\t%s -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+		"\t%s -R [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
 		"\t%s    [-s fileno] [-T directory]\n"
-		"\t%s -t [-ch" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\n"
+		"\t%s -t [-cdh" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\n"
 		"\t%s    [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n"
-		"\t%s -x [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f file]\n"
+		"\t%s -x [-acdh" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
 		"\t%s    [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
 		__progname, white, 
 		__progname, white, 
+#ifdef USE_QFA
+		__progname, white, 
+#endif
 		__progname, white,
 		__progname, white, 
 		__progname, white,