Fixed restore to use the full volume path when doing a compare.

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 8911d2069475a9366848a7644d17324f7db88d88..3feca826338866a97364a94d7555baa6538e1624 100644 (file)
--- a/restore/main.c
+++ b/restore/main.c
@@ -41,15 +41,18 @@
 
 #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.28 2001/08/14 13:11:58 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
@@ -78,7 +81,7 @@ static const char rcsid[] =
 #include "extern.h"
 
 int    bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
-int    hflag = 1, mflag = 1, Nflag = 0, zflag = 0;
+int    hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, zflag = 0;
 int    uflag = 0;
 int    dokerberos = 0;
 char   command = '\0';
@@ -96,6 +99,15 @@ int  compare_ignore_not_found;
 int    compare_errors;
 char   filesys[NAMELEN];
 static const char *stdin_opt = NULL;
+char   *bot_script = NULL;
+
+#ifdef USE_QFA
+FILE   *gTapeposfp;
+char   *gTapeposfile;
+char   gTps[255];
+long   gSeekstart;
+int    tapeposflag;
+#endif /* USE_QFA */
 
 #ifdef __linux__
 char   *__progname;
@@ -116,9 +128,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);
@@ -140,7 +154,7 @@ main(int argc, char *argv[])
                ;                                                               
        obsolete(&argc, &argv);
        while ((ch = getopt(argc, argv, 
-               "b:CcdD:f:hi"
+               "b:CcdD:f:F:hi"
 #ifdef KERBEROS
                "k"
 #endif
@@ -177,6 +191,9 @@ main(int argc, char *argv[])
                                use_stdin("-f");
                        inputdev = optarg;
                        break;
+               case 'F':
+                       bot_script = optarg;
+                       break;
                case 'h':
                        hflag = 0;
                        break;
@@ -247,6 +264,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)
@@ -255,7 +277,19 @@ main(int argc, char *argv[])
 
        atexit(cleanup);
 
-       setinput(inputdev);
+       if (command == 'C' && inputdev[0] != '/') {
+               /* since we chdir into the directory we are comparing
+                * to, we must retain the full tape path */
+               char wd[MAXPATHLEN], fullpathinput[MAXPATHLEN];
+               if (!getcwd(wd, MAXPATHLEN))
+                       err(1, "can't get current directory");
+               snprintf(fullpathinput, MAXPATHLEN, "%s/%s", wd, inputdev);
+               fullpathinput[MAXPATHLEN - 1] = '\0';
+printf("FULLPATH is %s\n", fullpathinput);
+               setinput(fullpathinput);
+       }
+       else
+               setinput(inputdev);
 
        if (argc == 0 && !filelist) {
                argc = 1;
@@ -306,14 +340,14 @@ main(int argc, char *argv[])
         * 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);
@@ -428,7 +462,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 +485,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 +516,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, " -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, " -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);
 }
 
@@ -528,6 +567,7 @@ obsolete(int *argcp, char **argvp[])
                case 'b':
                case 'D':
                case 'f':
+               case 'F':
                case 'Q':
                case 's':
                case 'T':