Added -a flag to restore (automatic walk through volumes)

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 8d9c6d2c6ab7fa1a83482b9fdbc99623815d018d..d0ca888b92be4da03b897bc46d2a1b0a00355be5 100644 (file)
--- a/restore/main.c
+++ b/restore/main.c
@@ -2,8 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@noos.fr>, 1999-2000
- *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ *     Stelian Pop <stelian@popies.net>, 1999-2000
+ *     Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.27 2001/08/13 16:17:52 stelian Exp $";
+       "$Id: main.c,v 1.35 2002/01/16 10:29:26 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -80,9 +80,9 @@ static const char rcsid[] =
 #include "restore.h"
 #include "extern.h"
 
-int    bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
-int    hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, zflag = 0;
-int    uflag = 0;
+int    aflag = 0, bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
+int    hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, Vflag = 0, zflag = 0;
+int    uflag = 0, lflag = 0, Lflag = 0;
 int    dokerberos = 0;
 char   command = '\0';
 long   dumpnum = 1;
@@ -154,16 +154,19 @@ main(int argc, char *argv[])
                ;                                                               
        obsolete(&argc, &argv);
        while ((ch = getopt(argc, argv, 
-               "b:CcdD:f:F:hi"
+               "ab:CcdD:f:F:hi"
 #ifdef KERBEROS
                "k"
 #endif
-               "mMN"
+               "lL:mMN"
 #ifdef USE_QFA
                "Q:"
 #endif
-               "Rrs:tT:uvxX:y")) != -1)
+               "Rrs:tT:uvVxX:y")) != -1)
                switch(ch) {
+               case 'a':
+                       aflag = 1;
+                       break;
                case 'b':
                        /* Change default tape blocksize. */
                        bflag = 1;
@@ -214,6 +217,16 @@ main(int argc, char *argv[])
                                    ch, command);
                        command = ch;
                        break;
+               case 'l':
+                       lflag = 1;
+                       break;
+               case 'L':
+                       Lflag = strtol(optarg, &p, 10);
+                       if (*p)
+                               errx(1, "illegal limit -- %s", optarg);
+                       if (Lflag < 0)
+                               errx(1, "limit must be greater than 0");
+                       break;
                case 'm':
                        mflag = 0;
                        break;
@@ -243,6 +256,9 @@ main(int argc, char *argv[])
                case 'v':
                        vflag = 1;
                        break;
+               case 'V':
+                       Vflag = 1;
+                       break;
                case 'X':
                        if( !strcmp(optarg,"-") ) {
                                use_stdin("-X");
@@ -277,7 +293,22 @@ main(int argc, char *argv[])
 
        atexit(cleanup);
 
-       setinput(inputdev);
+       if (command == 'C' && inputdev[0] != '/' && strcmp(inputdev, "-")
+#ifdef RRESTORE
+           && !strchr(inputdev, ':')
+#endif
+         ) {
+               /* 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';
+               setinput(fullpathinput);
+       }
+       else
+               setinput(inputdev);
 
        if (argc == 0 && !filelist) {
                argc = 1;
@@ -365,6 +396,7 @@ main(int argc, char *argv[])
         * Incremental restoration of a file system.
         */
        case 'r':
+               aflag = 1;      /* in -r or -R mode, -a is default */
                setup();
                if (dumptime > 0) {
                        /*
@@ -402,6 +434,7 @@ main(int argc, char *argv[])
         * Resume an incremental file system restoration.
         */
        case 'R':
+               aflag = 1;      /* in -r or -R mode, -a is default */
                initsymtable(symtbl);
                skipmaps();
                skipdirs();
@@ -513,12 +546,12 @@ usage(void)
 
        (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] [-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 ...]");
+         __progname, " -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-L limit] [-s fileno]",
+         __progname, " -i [-ach" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
+         __progname, " -r [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+         __progname, " -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+         __progname, " -t [-ch" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+         __progname, " -x [-ach" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
        exit(1);
 }
 
@@ -556,6 +589,7 @@ obsolete(int *argcp, char **argvp[])
                case 'D':
                case 'f':
                case 'F':
+               case 'L':
                case 'Q':
                case 's':
                case 'T':