Compression fixes for fixed block size tapes.

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 8911d2069475a9366848a7644d17324f7db88d88..8f189d4bba44db5b414695309b1a1b453bb8a2a0 100644 (file)
--- 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.22 2001/04/24 15:04:59 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
@@ -247,6 +249,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)
@@ -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);
 }