Get the install paths from configure.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 04ec6f033e6bd7a7a8e62672f12d32dc013ec0e1..b032334d22ebd824dfb19d88d5455cc716877c9d 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.36 2001/03/20 09:14:58 stelian Exp $";
+       "$Id: main.c,v 1.41 2001/03/28 12:59:48 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -94,7 +94,7 @@ long  dev_bsize = 1;  /* recalculated below */
 long   blocksperfile;  /* output blocks per file */
 char   *host = NULL;   /* remote host (if any) */
 int    sizest = 0;     /* return size estimate only */
-int    compressed = 0; /* use zlib to compress the output */
+int    compressed = 0; /* use zlib to compress the output, compress level 1-9 */
 long long bytes_written = 0; /* total bytes written */
 long   uncomprblks = 0;/* uncompressed blocks written */
 
@@ -107,20 +107,20 @@ static long numarg __P((const char *, long, long));
 static void obsolete __P((int *, char **[]));
 static void usage __P((void));
 
-ino_t iexclude_list[IEXCLUDE_MAXNUM];  /* the inode exclude list */
+dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */
 int iexclude_num = 0;                  /* number of elements in the list */
 
 int
 main(int argc, char *argv[])
 {
-       register ino_t ino;
+       register dump_ino_t ino;
        register int dirty;
        register struct dinode *dp;
        register struct fstab *dt;
        register char *map;
        register int ch;
        int i, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1;
-       ino_t maxino;
+       dump_ino_t maxino;
 #ifdef __linux__
        errcode_t retval;
        char directory[MAXPATHLEN];
@@ -160,7 +160,7 @@ main(int argc, char *argv[])
 #endif
                            "Mns:ST:uWw"
 #ifdef HAVE_ZLIB
-                           "z"
+                           "z::"
 #endif
                            )) != -1)
 #undef optstring
@@ -185,7 +185,7 @@ main(int argc, char *argv[])
                        ntrec = numarg("number of blocks per write",
                            1L, 1000L);
                        if (ntrec > maxbsize/1024) {
-                               msg("Please choose a blocksize <= %dKB\n",
+                               msg("Please choose a blocksize <= %dkB\n",
                                        maxbsize/1024);
                                exit(X_STARTUP);
                        }
@@ -292,7 +292,9 @@ main(int argc, char *argv[])
                        exit(X_FINOK);  /* do nothing else */
 #ifdef HAVE_ZLIB
                case 'z':
-                       compressed = 1;
+                       compressed = 2;
+                       if (optarg)
+                               compressed = numarg("compress level", 1L, 9L);
                        break;
 #endif /* HAVE_ZLIB */
 
@@ -569,6 +571,9 @@ main(int argc, char *argv[])
 
        msg("Label: %s\n", spcl.c_label);
 
+       if (compressed)
+               msg("Compressing output at compression level %d\n", compressed);
+
 #if defined(SIGINFO)
        (void)signal(SIGINFO, statussig);
 #endif
@@ -591,12 +596,12 @@ main(int argc, char *argv[])
        }
 
        if (sizest) {
-               printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
+               printf("%.0f\n", ((double)tapesize + 1 + ntrec) * TP_BSIZE);
                exit(X_FINOK);
        } /* stop here for size estimate */
 
        if (pipeout || unlimited) {
-               tapesize += 11; /* 10 trailer blocks + 1 map header */
+               tapesize += 1 + ntrec;  /* 1 map header + trailer blocks */
                msg("estimated %ld tape blocks.\n", tapesize);
        } else {
                double fetapes;
@@ -636,7 +641,7 @@ main(int argc, char *argv[])
                /* count the dumped inodes map on each additional tape */
                tapesize += (etapes - 1) *
                        (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
-               tapesize += etapes + 10;        /* headers + 10 trailer blks */
+               tapesize += etapes + ntrec;     /* headers + trailer blks */
                msg("estimated %ld tape blocks on %3.2f tape(s).\n",
                    tapesize, fetapes);
        }
@@ -695,8 +700,8 @@ main(int argc, char *argv[])
                        continue;
 #ifdef __linux__
                /*
-                * No need to check here for deleted and not yes reallocated inodes
-                * since this is done in dumpino().
+                * No need to check here for deleted and not yet reallocated
+                * inodes since this is done in dumpino().
                 */
 #endif
                (void)dumpino(dp, ino);
@@ -704,7 +709,12 @@ main(int argc, char *argv[])
 
        tend_writing = time(NULL);
        spcl.c_type = TS_END;
-       for (i = 0; i < ntrec; i++)
+       /*
+        * Finish off the current tape record with trailer blocks, to ensure
+        * at least the data in the last partial record makes it to tape.
+        * Also make sure we write at least 1 trailer block.
+        */
+       for (i = ntrec - (spcl.c_tapea % ntrec); i; --i)
                writeheader(maxino - 1);
 
        tnow = trewind();
@@ -718,11 +728,11 @@ main(int argc, char *argv[])
                    ((double)spcl.c_tapea * TP_BSIZE / 1048576),
                    spcl.c_volume);
 
-       /* report dump performance, avoid division through zero */
+       /* report dump performance, avoid division by zero */
        if (tend_writing - tstart_writing == 0)
                msg("finished in less than a second\n");
        else
-               msg("finished in %d seconds, throughput %d KBytes/sec\n",
+               msg("finished in %d seconds, throughput %d kBytes/sec\n",
                    tend_writing - tstart_writing,
                    spcl.c_tapea / (tend_writing - tstart_writing));
 
@@ -731,12 +741,11 @@ main(int argc, char *argv[])
                spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
        msg("Date this dump completed:  %s", ctime(&tnow));
 
-       msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno);
+       msg("Average transfer rate: %ld kB/s\n", xferrate / tapeno);
        if (compressed) {
                long tapekb = bytes_written / 1024;
                double rate = .0005 + (double) spcl.c_tapea / tapekb;
-               msg("Wrote %ldKB uncompressed, %ldKB compressed,"
-                       " compression ratio %1.3f\n",
+               msg("Wrote %ldkB uncompressed, %ldkB compressed, %1.3f:1\n",
                        spcl.c_tapea, tapekb, rate);
        }
 
@@ -769,12 +778,15 @@ usage(void)
                "k"
 #endif
                "MnSu"
+               "] [-B records] [-b blocksize]\n"
+               "\t%s [-d density] [-e inode#] [-f file] [-h level] [-s feet]\n"
+               "\t%s [-T date] "
 #ifdef HAVE_ZLIB
-               "z"
+               "[-z zlevel] "
 #endif
-               "] [-B records] [-b blocksize] [-d density]\n"
-               "\t%s [-e inode#] [-f file] [-h level] [-s feet] [-T date] filesystem\n"
-               "\t%s [-W | -w]\n", __progname, white, __progname);
+               "filesystem\n"
+               "\t%s [-W | -w]\n", 
+               __progname, white, white, __progname);
        exit(X_STARTUP);
 }