typo

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 9b2ea0f3abef1f0b7ee9c549a6cb2b55e271bc55..09aa8c7b4fed75cbf54e2be292fd9c47ff9dc706 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.18 2001/03/20 10:02:48 stelian Exp $";
+       "$Id: main.c,v 1.23 2001/04/26 08:59:32 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -50,7 +50,13 @@ 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
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #include <signal.h>
 #include <string.h>
@@ -111,6 +117,12 @@ main(int argc, char *argv[])
        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 +143,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:hi"
 #ifdef KERBEROS
-#define        optlist "b:CcdD:f:hikmMNRrs:tT:uvxX:y"
-#else
-#define        optlist "b:CcdD:f:himMNRrs:tT:uvxX:y"
+               "k"
 #endif
-       while ((ch = getopt(argc, argv, optlist)) != -1)
+               "mMN"
+#ifdef USE_QFA
+               "Q:"
+#endif
+               "Rrs:tT:uvxX:y")) != -1)
                switch(ch) {
                case 'b':
                        /* Change default tape blocksize. */
@@ -194,6 +210,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 +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)
@@ -244,6 +271,45 @@ 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.
@@ -371,6 +437,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 +460,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);
@@ -416,13 +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",
-         __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] [-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] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+         __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] " qfaflag "[-s fileno] [-X filelist] [file ...]");
        exit(1);
 }
 
@@ -459,6 +542,7 @@ obsolete(int *argcp, char **argvp[])
                case 'b':
                case 'D':
                case 'f':
+               case 'Q':
                case 's':
                case 'T':
                case 'X':