Corrected the size estimate.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 553a1e66831f781e0ff628387af11ae68c6c47a0..6b666a6c5364c9d5da64e2352bf5672118859835 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.17 2000/03/01 10:16:05 stelian Exp $";
+       "$Id: main.c,v 1.21 2000/03/03 11:43:35 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -141,6 +141,7 @@ 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;
@@ -154,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
@@ -209,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;
@@ -283,7 +288,7 @@ main(int argc, char *argv[])
                exit(X_STARTUP);
        }
        disk = *argv++;
-       if (strlen(disk) > MAXPATHLEN) {
+       if (strlen(disk) >= MAXPATHLEN) {
                (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
                exit(X_STARTUP);
        }
@@ -388,7 +393,7 @@ main(int argc, char *argv[])
                if (dt != NULL) {
                        char name[MAXPATHLEN];
                        (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
-                       (void)sprintf(name, "%s (dir %s)",
+                       (void)snprintf(name, sizeof(name), "%s (dir %s)",
                                      dt->fs_file, directory);
                        (void)strncpy(spcl.c_filesys, name, NAMELEN);
                        disk = rawname(dt->fs_spec);
@@ -506,7 +511,7 @@ main(int argc, char *argv[])
        usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
        dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char));
        dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
-       tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
+       tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
 
        nonodump = spcl.c_level < honorlevel;
 
@@ -532,12 +537,12 @@ main(int argc, char *argv[])
        }
 
        if (sizest) {
-               printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+               printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
                exit(X_FINOK);
        } /* stop here for size estimate */
 
        if (pipeout || unlimited) {
-               tapesize += 10; /* 10 trailer blocks */
+               tapesize += 11; /* 10 trailer blocks + 1 map header */
                msg("estimated %ld tape blocks.\n", tapesize);
        } else {
                double fetapes;
@@ -655,10 +660,13 @@ 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);
+               msg("%ld tape blocks\n", spcl.c_tapea);
        else
-               msg("DUMP: %ld tape blocks on %d volumes(s)\n",
+               msg("%ld tape blocks on %d volumes(s)\n",
                    spcl.c_tapea, spcl.c_volume);
 
        /* report dump performance, avoid division through zero */
@@ -669,20 +677,18 @@ 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,
+       msg("Date of this level %c dump: %s", level,
                spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
 #else
-       msg("DUMP: Date of this level %c dump: %s", level,
+       msg("Date of this level %c dump: %s", level,
                spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
 #endif
-       msg("DUMP: Date this dump completed:  %s", ctime(&tnow));
+       msg("Date this dump completed:  %s", ctime(&tnow));
 
-       msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno);
+       msg("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);
@@ -812,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) {