Added '-F script' option to dump.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 806de5efe278b990f2844d9f994f9b39d02b7cb1..277e422cc97737a6902ce00c15fe61dc08981221 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.15 2000/02/04 20:22:21 stelian Exp $";
+       "$Id: main.c,v 1.18 2000/03/02 11:34:51 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -121,8 +121,8 @@ main(int argc, char *argv[])
        ino_t maxino;
 #ifdef __linux__
        errcode_t retval;
-       char directory[NAME_MAX];
-       char pathname[NAME_MAX];
+       char directory[MAXPATHLEN];
+       char pathname[MAXPATHLEN];
 #endif
        time_t tnow;
        char labelstr[LBLSIZE];
@@ -141,10 +141,10 @@ main(int argc, char *argv[])
 #endif
 
        tsize = 0;      /* Default later, based on 'c' option for cart tapes */
+       eot_script = NULL;
        if ((tapeprefix = getenv("TAPE")) == NULL)
                tapeprefix = _PATH_DEFTAPE;
        dumpdates = _PATH_DUMPDATES;
-       temp = _PATH_DTMP;
        strcpy(labelstr, "none");       /* XXX safe strcpy. */
        if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0)
                quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
@@ -155,9 +155,9 @@ main(int argc, char *argv[])
 
        obsolete(&argc, &argv);
 #ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:e:f:h:kL:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw"
 #else
-#define optstring "0123456789aB:b:cd:e:f:h:L:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw"
 #endif
        while ((ch = getopt(argc, argv, optstring)) != -1)
 #undef optstring
@@ -210,6 +210,10 @@ main(int argc, char *argv[])
                        tapeprefix = optarg;
                        break;
 
+               case 'F':               /* end of tape script */
+                       eot_script = optarg;
+                       break;
+
                case 'h':
                        honorlevel = numarg("honor level", 0L, 10L);
                        break;
@@ -284,6 +288,10 @@ main(int argc, char *argv[])
                exit(X_STARTUP);
        }
        disk = *argv++;
+       if (strlen(disk) > MAXPATHLEN) {
+               (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
+               exit(X_STARTUP);
+       }
        argc--;
        if (argc >= 1) {
                (void)fprintf(stderr, "Unknown arguments to dump:");
@@ -419,10 +427,10 @@ main(int argc, char *argv[])
        }
 
        if (Mflag)
-               snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno + 1);
+               snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno + 1);
        else
-               strncpy(tape, tapeprefix, NAME_MAX);
-       tape[NAME_MAX - 1] = '\0';
+               strncpy(tape, tapeprefix, MAXPATHLEN);
+       tape[MAXPATHLEN - 1] = '\0';
 
        if (!sizest) {
 
@@ -652,6 +660,9 @@ main(int argc, char *argv[])
        spcl.c_type = TS_END;
        for (i = 0; i < ntrec; i++)
                writeheader(maxino - 1);
+
+       tnow = trewind();
+
        if (pipeout)
                msg("DUMP: %ld tape blocks\n", spcl.c_tapea);
        else
@@ -666,7 +677,6 @@ main(int argc, char *argv[])
                    tend_writing - tstart_writing,
                    spcl.c_tapea / (tend_writing - tstart_writing));
 
-       tnow = do_stats();
        putdumptime();
 #ifdef __linux__
        msg("DUMP: Date of this level %c dump: %s", level,
@@ -679,7 +689,6 @@ main(int argc, char *argv[])
 
        msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno);
 
-       trewind();
        broadcast("DUMP IS DONE!\7\7\n");
        msg("DUMP IS DONE\n");
        Exit(X_FINOK);
@@ -809,8 +818,11 @@ obsolete(int *argcp, char **argvp[])
                case 'B':
                case 'b':
                case 'd':
+               case 'e':
                case 'f':
+               case 'F':
                case 'h':
+               case 'L':
                case 's':
                case 'T':
                        if (*argv == NULL) {