-A archive file implementation

[dump.git] / restore / main.c

diff --git a/restore/main.c b/restore/main.c
index 8862d0da03d1b7dc4239a608312a874fd666302c..fb51380cf600c92078c0f584ce675a2b224f312a 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.32 2001/11/16 14:09:07 stelian Exp $";
+       "$Id: main.c,v 1.37 2002/01/25 14:59:53 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -80,9 +80,10 @@ static const char rcsid[] =
 #include "restore.h"
 #include "extern.h"
 
-int    bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 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;
+int    uflag = 0, lflag = 0, Lflag = 0;
+char   *Afile = NULL;
 int    dokerberos = 0;
 char   command = '\0';
 long   dumpnum = 1;
@@ -100,6 +101,7 @@ int compare_errors;
 char   filesys[NAMELEN];
 static const char *stdin_opt = NULL;
 char   *bot_script = NULL;
+dump_ino_t volinfo[TP_NINOS];
 
 #ifdef USE_QFA
 FILE   *gTapeposfp;
@@ -154,16 +156,23 @@ main(int argc, char *argv[])
                ;                                                               
        obsolete(&argc, &argv);
        while ((ch = getopt(argc, argv, 
-               "b:CcdD:f:F:hi"
+               "aA:b:CcdD:f:F:hi"
 #ifdef KERBEROS
                "k"
 #endif
-               "lmMN"
+               "lL:mMN"
 #ifdef USE_QFA
                "Q:"
 #endif
                "Rrs:tT:uvVxX:y")) != -1)
                switch(ch) {
+               case 'a':
+                       aflag = 1;
+                       break;
+               case 'A':
+                       Afile = optarg;
+                       aflag = 1;
+                       break;
                case 'b':
                        /* Change default tape blocksize. */
                        bflag = 1;
@@ -217,6 +226,13 @@ main(int argc, char *argv[])
                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;
@@ -230,6 +246,7 @@ main(int argc, char *argv[])
                case 'Q':
                        gTapeposfile = optarg;
                        tapeposflag = 1;
+                       aflag = 1;
                        break;
 #endif
                case 's':
@@ -273,7 +290,13 @@ main(int argc, char *argv[])
 #ifdef USE_QFA
        if (!mflag && tapeposflag)
                errx(1, "m and Q options are mutually exclusive");
+
+       if (tapeposflag && command != 'i' && command != 'x' && command != 't')
+               errx(1, "Q option is not valid for %c command", command);
 #endif
+       
+       if (Afile && command != 'i' && command != 'x' && command != 't')
+               errx(1, "A option is not valid for %c command", command);
 
        if (signal(SIGINT, onintr) == SIG_IGN)
                (void) signal(SIGINT, SIG_IGN);
@@ -386,6 +409,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) {
                        /*
@@ -423,6 +447,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();
@@ -456,6 +481,7 @@ main(int argc, char *argv[])
                setup();
                extractdirs(0);
                initsymtable((char *)0);
+               printvolinfo();
                for (;;) {
                        NEXTFILE(p);
                        if (!p)
@@ -510,9 +536,13 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
-#ifdef __linux__
+       char white[MAXPATHLEN];
        const char *ext2ver, *ext2date;
 
+       memset(white, ' ', MAXPATHLEN);
+       white[MIN(strlen(__progname), MAXPATHLEN - 1)] = '\0';
+
+#ifdef __linux__
        ext2fs_get_library_version(&ext2ver, &ext2date);
        (void)fprintf(stderr, "%s %s (using libext2fs %s of %s)\n", 
                      __progname, _DUMP_VERSION, ext2ver, ext2date);
@@ -532,14 +562,26 @@ usage(void)
 #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 "lMvVy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
-         __progname, " -i [-ch" 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 [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
+       fprintf(stderr,
+               "usage:"
+               "\t%s -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
+               "\t%s    [-F script] [-L limit] [-s fileno]\n"
+               "\t%s -i [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f file]\n"
+               "\t%s    [-F script] " qfaflag "[-s fileno]\n"
+               "\t%s -r [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+               "\t%s    [-s fileno] [-T directory]\n"
+               "\t%s -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+               "\t%s    [-s fileno] [-T directory]\n"
+               "\t%s -t [-ch" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\n"
+               "\t%s    [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n"
+               "\t%s -x [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f file]\n"
+               "\t%s    [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
+               __progname, white, 
+               __progname, white, 
+               __progname, white,
+               __progname, white, 
+               __progname, white, 
+               __progname, white);
        exit(1);
 }
 
@@ -573,10 +615,12 @@ obsolete(int *argcp, char **argvp[])
 
        for (flags = 0; *ap; ++ap) {
                switch (*ap) {
+               case 'A':
                case 'b':
                case 'D':
                case 'f':
                case 'F':
+               case 'L':
                case 'Q':
                case 's':
                case 'T':