Fixed 'tape blocks' -> 'blocks'

Added 'Writing XX Kilobyte records' message.

diff --git a/CHANGES b/CHANGES
index 5410011a82a118a8113e0c423a07d254a68641c7..0a2e60335c750fc062965528ef27de94674415ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.204 2003/01/10 10:31:06 stelian Exp $
+$Id: CHANGES,v 1.205 2003/01/10 10:52:48 stelian Exp $

 
 Changes between versions 0.4b32 and 0.4b33 (released ?????????????????)
 =======================================================================
 
 Changes between versions 0.4b32 and 0.4b33 (released ?????????????????)
 =======================================================================


@@ -27,6 +27,13 @@ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????)
        dump from unattended sessions (like cron jobs). Thanks to
        John I Wang <jiwang@users.sourceforge.net> for the suggestion.
 
        dump from unattended sessions (like cron jobs). Thanks to
        John I Wang <jiwang@users.sourceforge.net> for the suggestion.
 

+6.     Fixed the output of dump to indicate 'blocks' instead of
+       'tape blocks' in the various messages (blocks are always
+       1 Kilobyte, tape blocks are 1 BK * '-b' argument), and 
+       made it clearly print the current blocksize at the start of
+       a dump. Thanks to Michal Szymanski <msz@astrouw.edu.pl> for
+       the suggestions.
+

 Changes between versions 0.4b31 and 0.4b32 (released November 15, 2002)
 =======================================================================
 
 Changes between versions 0.4b31 and 0.4b32 (released November 15, 2002)
 =======================================================================
 

diff --git a/THANKS b/THANKS
index eaeb111ac0e422bfc8378890834a99671cb5bb0b..c9e8c49ca23e82716e2754f579072e0c622f5cfa 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.73 2003/01/10 10:31:07 stelian Exp $
+$Id: THANKS,v 1.74 2003/01/10 10:52:48 stelian Exp $

 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.


@@ -95,6 +95,7 @@ Bob Snyder            rsnyder@janet.advsys.com
 Jeffrey Sofferin       sofferin@users.sourceforge.net
 Gabriel Somlo          somlo@cs.colostate.edu
 Clemens Stiglechner    a9401816@unet.univie.ac.at
 Jeffrey Sofferin       sofferin@users.sourceforge.net
 Gabriel Somlo          somlo@cs.colostate.edu
 Clemens Stiglechner    a9401816@unet.univie.ac.at

+Michal Szymanski       msz@astrouw.edu.pl

 Matti Taskinen         mkt@rni.helsinki.fi
 Jason L Tibbitts III   tibbs@math.uh.edu
 Mike Tibor             tibor@lib.uaa.alaska.edu
 Matti Taskinen         mkt@rni.helsinki.fi
 Jason L Tibbitts III   tibbs@math.uh.edu
 Mike Tibor             tibor@lib.uaa.alaska.edu

diff --git a/dump/main.c b/dump/main.c
index 57ab0033f0bc4bb6a67b788ebaf4503d3efbcc0c..573414989c94d395353f7254ae017cb9151b805b 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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.80 2003/01/10 10:52:48 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #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    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 */
 int    cartridge = 0;  /* Assume non-cartridge tape */
 #ifdef USE_QFA
 int    tapepos = 0;    /* assume no QFA tapeposition needed by user */


@@ -750,6 +750,8 @@ main(int argc, char *argv[])
 
        if (!sizest) {
                msg("Label: %s\n", spcl.c_label);
 
        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", 
 
                if (compressed)
                        msg("Compressing output at compression level %d (%s)\n", 


@@ -827,7 +829,7 @@ main(int argc, char *argv[])
 
        if (pipeout || unlimited) {
                tapesize += 1 + ntrec;  /* 1 map header + trailer blocks */
 
        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;
 
        } else {
                double fetapes;
 


@@ -867,7 +869,7 @@ main(int argc, char *argv[])
                tapesize += (etapes - 1) *
                        (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
                tapesize += etapes + ntrec;     /* headers + trailer blks */
                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);
        }
 
                    tapesize, fetapes);
        }
 


@@ -976,10 +978,10 @@ main(int argc, char *argv[])
        tnow = trewind();
 
        if (pipeout || fifoout)
        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
                        ((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);
                    spcl.c_tapea, 
                    ((double)spcl.c_tapea * TP_BSIZE / 1048576),
                    spcl.c_volume);

diff --git a/dump/tape.c b/dump/tape.c
index 08c6f7948633fb8d2d9f4ba8648a870ee599e30a..a9e3c52bc2cab2e47d9b7b189137f16f5def2703 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.71 2002/07/29 12:00:33 stelian Exp $";
+       "$Id: tape.c,v 1.72 2003/01/10 10:52:48 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -336,7 +336,7 @@ do_stats(void)
        blocks = spcl.c_tapea - tapea_volume;
        msg("Volume %d completed at: %s", tapeno, ctime(&tnow));
        if (! compressed)
        blocks = spcl.c_tapea - tapea_volume;
        msg("Volume %d completed at: %s", tapeno, ctime(&tnow));
        if (! compressed)

-               msg("Volume %d %ld tape blocks (%.2fMB)\n", tapeno, 
+               msg("Volume %d %ld blocks (%.2fMB)\n", tapeno, 

                        blocks, ((double)blocks * TP_BSIZE / 1048576));
        if (ttaken > 0) {
                long volkb = (bytes_written - tapea_bytes) / 1024;
                        blocks, ((double)blocks * TP_BSIZE / 1048576));
        if (ttaken > 0) {
                long volkb = (bytes_written - tapea_bytes) / 1024;