Let the user give the dumpdates path as an argument to dump (-D)

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 57ab0033f0bc4bb6a67b788ebaf4503d3efbcc0c..45e525bbd165632c3de8f9d34fcd363b0504df0c 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.79 2003/01/10 10:31:10 stelian Exp $";
+       "$Id: main.c,v 1.81 2003/01/21 10:42:27 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -163,7 +163,7 @@ int notify = 0;     /* notify operator flag */
 int    blockswritten = 0;      /* number of blocks written on current tape */
 int    tapeno = 0;     /* current tape number */
 int    density = 0;    /* density in bytes/0.1" " <- this is for hilit19 */
-int    ntrec = NTREC;  /* # tape blocks in each tape record */
+int    ntrec = NTREC;  /* # blocks in each tape record */
 int    cartridge = 0;  /* Assume non-cartridge tape */
 #ifdef USE_QFA
 int    tapepos = 0;    /* assume no QFA tapeposition needed by user */
@@ -244,7 +244,7 @@ main(int argc, char *argv[])
 #endif /* USE_QFA */
 
        while ((ch = getopt(argc, argv,
-                           "0123456789A:aB:b:cd:e:E:f:F:h:I:"
+                           "0123456789A:aB:b:cd:D:e:E:f:F:h:I:"
 #ifdef HAVE_BZLIB
                            "j::"
 #endif
@@ -313,6 +313,10 @@ main(int argc, char *argv[])
                        density = numarg("density", 10L, 327670L) / 10;
                        if (density >= 625 && !bflag)
                                ntrec = HIGHDENSITYTREC;
+                       break;
+
+               case 'D':               /* path of dumpdates file */
+                       dumpdates = optarg;
                        break;
                        
                                        /* 04-Feb-00 ILC */
@@ -750,6 +754,8 @@ main(int argc, char *argv[])
 
        if (!sizest) {
                msg("Label: %s\n", spcl.c_label);
+               
+               msg("Writing %d Kilobyte records\n", ntrec);
 
                if (compressed)
                        msg("Compressing output at compression level %d (%s)\n", 
@@ -827,7 +833,7 @@ main(int argc, char *argv[])
 
        if (pipeout || unlimited) {
                tapesize += 1 + ntrec;  /* 1 map header + trailer blocks */
-               msg("estimated %ld tape blocks.\n", tapesize);
+               msg("estimated %ld blocks.\n", tapesize);
        } else {
                double fetapes;
 
@@ -867,7 +873,7 @@ main(int argc, char *argv[])
                tapesize += (etapes - 1) *
                        (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
                tapesize += etapes + ntrec;     /* headers + trailer blks */
-               msg("estimated %ld tape blocks on %3.2f tape(s).\n",
+               msg("estimated %ld blocks on %3.2f tape(s).\n",
                    tapesize, fetapes);
        }
 
@@ -976,10 +982,10 @@ main(int argc, char *argv[])
        tnow = trewind();
 
        if (pipeout || fifoout)
-               msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea,
+               msg("%ld blocks (%.2fMB)\n", spcl.c_tapea,
                        ((double)spcl.c_tapea * TP_BSIZE / 1048576));
        else
-               msg("%ld tape blocks (%.2fMB) on %d volume(s)\n",
+               msg("%ld blocks (%.2fMB) on %d volume(s)\n",
                    spcl.c_tapea, 
                    ((double)spcl.c_tapea * TP_BSIZE / 1048576),
                    spcl.c_volume);
@@ -1038,8 +1044,8 @@ usage(void)
 #endif
                "mMnqSuv"
                "] [-A file] [-B records] [-b blocksize]\n"
-               "\t%s [-d density] [-e inode#,inode#,...] [-E file] [-f file]\n"
-               "\t%s [-h level] [-I nr errors] "
+               "\t%s [-d density] [-D file] [-e inode#,inode#,...] [-E file]\n"
+               "\t%s [-f file] [-h level] [-I nr errors] "
 #ifdef HAVE_BZLIB
                "[-j zlevel] "
 #endif
@@ -1154,6 +1160,7 @@ obsolete(int *argcp, char **argvp[])
                case 'B':
                case 'b':
                case 'd':
+               case 'D':
                case 'e':
                case 'E':
                case 'f':