X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fmain.c;h=8b6b08e0a57b7b4cad9ccf47698771a284e26749;hp=1843d4b431fe955439baf80427bd85b3810121f2;hb=b8f7cbe65e70f2ec792c447995ba00ca360ec0c9;hpb=4d5ed2f38cb1dce0244a05f94c8aec7f725a1f33

diff --git a/restore/main.c b/restore/main.c
index 1843d4b..8b6b08e 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,16 +41,23 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.16 2001/02/21 16:13:05 stelian Exp $";
+	"$Id: main.c,v 1.26 2001/07/18 13:12:33 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
+#include <compatlfs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 
 #ifdef	__linux__
+#include <sys/time.h>
+#include <time.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #include <signal.h>
 #include <string.h>
@@ -83,7 +90,7 @@ long	volno = 0;
 long	ntrec;
 char	*dumpmap;
 char	*usedinomap;
-ino_t	maxino;
+dump_ino_t maxino;
 time_t	dumptime;
 time_t	dumpdate;
 FILE 	*terminal;
@@ -92,6 +99,7 @@ int	compare_ignore_not_found;
 int	compare_errors;
 char	filesys[NAMELEN];
 static const char *stdin_opt = NULL;
+char	*bot_script = NULL;
 
 #ifdef	__linux__
 char	*__progname;
@@ -105,12 +113,18 @@ int
 main(int argc, char *argv[])
 {
 	int ch;
-	ino_t ino;
+	dump_ino_t ino;
 	char *inputdev = _PATH_DEFTAPE;
 	char *symtbl = "./restoresymtable";
 	char *p, name[MAXPATHLEN];
 	FILE *filelist = NULL;
 	char fname[MAXPATHLEN];
+#ifdef USE_QFA
+	tapeposflag = 0;
+#endif
+#ifdef USE_QFADEBUG
+	time_t tistart, tiend, titaken;
+#endif
 
 	/* Temp files should *not* be readable.  We set permissions later. */
 	(void) umask(077);
@@ -131,12 +145,16 @@ main(int argc, char *argv[])
 	for (p = tmpdir + strlen(tmpdir) - 1; p >= tmpdir && *p == '/'; p--)
 		;                                                               
 	obsolete(&argc, &argv);
+	while ((ch = getopt(argc, argv, 
+		"b:CcdD:f:F:hi"
 #ifdef KERBEROS
-#define	optlist "b:CcdD:f:hikmMNRrs:tT:uvxX:y"
-#else
-#define	optlist "b:CcdD:f:himMNRrs:tT:uvxX:y"
+		"k"
+#endif
+		"mMN"
+#ifdef USE_QFA
+		"Q:"
 #endif
-	while ((ch = getopt(argc, argv, optlist)) != -1)
+		"Rrs:tT:uvxX:y")) != -1)
 		switch(ch) {
 		case 'b':
 			/* Change default tape blocksize. */
@@ -165,6 +183,9 @@ main(int argc, char *argv[])
 				use_stdin("-f");
 			inputdev = optarg;
 			break;
+		case 'F':
+			bot_script = optarg;
+			break;
 		case 'h':
 			hflag = 0;
 			break;
@@ -194,6 +215,12 @@ main(int argc, char *argv[])
 		case 'N':
 			Nflag = 1;
 			break;
+#ifdef USE_QFA
+		case 'Q':
+			gTapeposfile = optarg;
+			tapeposflag = 1;
+			break;
+#endif
 		case 's':
 			/* Dumpnum (skip to) for multifile dump tapes. */
 			dumpnum = strtol(optarg, &p, 10);
@@ -229,6 +256,11 @@ main(int argc, char *argv[])
 	if (command == '\0')
 		errx(1, "none of C, i, R, r, t or x options specified");
 
+#ifdef USE_QFA
+	if (!mflag && tapeposflag)
+		errx(1, "m and Q options are mutually exclusive");
+#endif
+
 	if (signal(SIGINT, onintr) == SIG_IGN)
 		(void) signal(SIGINT, SIG_IGN);
 	if (signal(SIGTERM, onintr) == SIG_IGN)
@@ -244,19 +276,58 @@ main(int argc, char *argv[])
 		*--argv = ".";
 	}
 
+#ifdef USE_QFA
+	if (tapeposflag) {
+		msg("reading QFA positions from %s\n", gTapeposfile);
+		if ((gTapeposfp = fopen(gTapeposfile, "r")) == NULL)
+			errx(1, "can't open file for reading -- %s",
+				gTapeposfile);
+		/* start reading header info */
+		if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+			errx(1, "not requested format of -- %s", gTapeposfile);
+		gTps[strlen(gTps) - 1] = 0;     /* delete end of line */
+		if (strcmp(gTps, QFA_MAGIC) != 0)
+			errx(1, "not requested format of -- %s", gTapeposfile);
+		if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+			errx(1, "not requested format of -- %s", gTapeposfile);
+		gTps[strlen(gTps) - 1] = 0;
+		if (strcmp(gTps, QFA_VERSION) != 0)
+			errx(1, "not requested format of -- %s", gTapeposfile);
+		/* read dumpdate */
+		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 */
+		/* read empty line */
+		if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+			errx(1, "not requested format of -- %s", gTapeposfile);
+		gTps[strlen(gTps) - 1] = 0;
+		/* read table header line */
+		if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+			errx(1, "not requested format of -- %s", gTapeposfile);
+		gTps[strlen(gTps) - 1] = 0;
+		/* end reading header info */
+		/* tape position table starts here */
+		gSeekstart = ftell(gTapeposfp); /* remember for later use */
+}
+#endif /* USE_QFA */
+
 	switch (command) {
 	/*
 	 * Compare contents of tape.
 	 */
 	case 'C': {
-		struct stat stbuf;
+		struct STAT stbuf;
 
 		Vprintf(stdout, "Begin compare restore\n");
 		compare_ignore_not_found = 0;
 		compare_errors = 0;
 		setup();
 		printf("filesys = %s\n", filesys);
-		if (stat(filesys, &stbuf) < 0)
+		if (STAT(filesys, &stbuf) < 0)
 			err(1, "cannot stat directory %s", filesys);
 		if (chdir(filesys) < 0)
 			err(1, "cannot cd to %s", filesys);
@@ -371,6 +442,9 @@ main(int argc, char *argv[])
 	 * Batch extraction of tape contents.
 	 */
 	case 'x':
+#ifdef USE_QFADEBUG
+		tistart = time(NULL);
+#endif
 		setup();
 		extractdirs(1);
 		initsymtable((char *)0);
@@ -391,6 +465,12 @@ main(int argc, char *argv[])
 		setdirmodes(0);
 		if (dflag)
 			checkrestore();
+#ifdef USE_QFADEBUG
+		tiend = time(NULL);
+		titaken = tiend - tistart;
+		msg("restore took %d:%02d:%02d\n", titaken / 3600, 
+			(titaken % 3600) / 60, titaken % 60);
+#endif /* USE_QFADEBUG */
 		break;
 	}
 	exit(0);
@@ -401,20 +481,36 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+#ifdef __linux__
+	const char *ext2ver, *ext2date;
+
+	ext2fs_get_library_version(&ext2ver, &ext2date);
+	(void)fprintf(stderr, "%s %s (using libext2fs %s of %s)\n", 
+		      __progname, _DUMP_VERSION, ext2ver, ext2date);
+#else
+	(void)fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
+#endif
+
 #ifdef KERBEROS
 #define kerbflag "k"
 #else
 #define kerbflag
 #endif
-	(void)fprintf(stderr, 
-	  "%s %s\n", __progname, _DUMP_VERSION);
+
+#ifdef USE_QFA
+#define qfaflag "[-Q file] "
+#else
+#define qfaflag
+#endif
+
 	(void)fprintf(stderr,
-	  "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
-	  __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]",
-	  __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
-	  __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
-	  __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]",
-	  __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]");
+	  "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
+	  __progname, " -C [-c" kerbflag "Mvy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
+	  __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
+	  __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+	  __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+	  __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+	  __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
 	exit(1);
 }
 
@@ -451,6 +547,8 @@ obsolete(int *argcp, char **argvp[])
 		case 'b':
 		case 'D':
 		case 'f':
+		case 'F':
+		case 'Q':
 		case 's':
 		case 'T':
 		case 'X':