X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fmain.c;h=09aa8c7b4fed75cbf54e2be292fd9c47ff9dc706;hp=8911d2069475a9366848a7644d17324f7db88d88;hb=9c6fe7dd40d422c0f98425d519d05d70f654e748;hpb=35b24fb7fabcf6df3b37aebf70c228d5b0688d32

diff --git a/restore/main.c b/restore/main.c
index 8911d20..09aa8c7 100644
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.20 2001/04/10 12:46:53 stelian Exp $";
+	"$Id: main.c,v 1.23 2001/04/26 08:59:32 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -50,6 +50,8 @@ static const char rcsid[] =
 #include <errno.h>
 
 #ifdef	__linux__
+#include <sys/time.h>
+#include <time.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
@@ -116,9 +118,11 @@ main(int argc, char *argv[])
 	FILE *filelist = NULL;
 	char fname[MAXPATHLEN];
 #ifdef USE_QFA
-	time_t tistart, tiend, titaken;
 	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);
@@ -247,6 +251,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)
@@ -428,7 +437,7 @@ main(int argc, char *argv[])
 	 * Batch extraction of tape contents.
 	 */
 	case 'x':
-#ifdef USE_QFA
+#ifdef USE_QFADEBUG
 		tistart = time(NULL);
 #endif
 		setup();
@@ -451,14 +460,12 @@ main(int argc, char *argv[])
 		setdirmodes(0);
 		if (dflag)
 			checkrestore();
-#ifdef USE_QFA
+#ifdef USE_QFADEBUG
 		tiend = time(NULL);
 		titaken = tiend - tistart;
-#ifdef USE_QFA
 		msg("restore took %d:%02d:%02d\n", titaken / 3600, 
 			(titaken % 3600) / 60, titaken % 60);
-#endif
-#endif
+#endif /* USE_QFADEBUG */
 		break;
 	}
 	exit(0);
@@ -484,14 +491,21 @@ usage(void)
 #else
 #define kerbflag
 #endif
+
+#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\t%s%s\n",
 	  __progname, " -C [-c" kerbflag "Mvy] [-b blocksize] [-D filesystem] [-f file] [-s fileno]",
-	  __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]",
+	  __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] " qfaflag "[-s fileno]",
 	  __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]",
 	  __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]",
-	  __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]",
-	  __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]");
+	  __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+	  __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] " qfaflag "[-s fileno] [-X filelist] [file ...]");
 	exit(1);
 }