-z usage info only if ZLIB defined

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 60f2bb4b7a4f9d145ac70f89c2addfb14fe6598f..32375a3a07892eea9d78eec15d7f9fb9dcd55ec3 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.35 2001/03/19 13:22:48 stelian Exp $";
+       "$Id: main.c,v 1.39 2001/03/20 20:46:08 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];
@@ -130,12 +130,7 @@ main(int argc, char *argv[])
        char *diskparam;
 
        spcl.c_label[0] = '\0';
-       spcl.c_date = 0;
-#ifdef __linux__
-       (void)time4(&spcl.c_date);
-#else
-       (void)time((time_t *)&spcl.c_date);
-#endif
+       spcl.c_date = time(NULL);
 
 #ifdef __linux__
        __progname = argv[0];
@@ -165,7 +160,7 @@ main(int argc, char *argv[])
 #endif
                            "Mns:ST:uWw"
 #ifdef HAVE_ZLIB
-                           "z"
+                           "z::"
 #endif
                            )) != -1)
 #undef optstring
@@ -297,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 */
 
@@ -489,17 +486,10 @@ main(int argc, char *argv[])
        if (!sizest) {
 
                msg("Date of this level %c dump: %s", level,
-#ifdef __linux__
-                       spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
-#else
-                       spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
-#endif
-               msg("Date of last level %c dump: %s", lastlevel,
-#ifdef __linux__
-                       spcl.c_ddate == 0 ? "the epoch\n" : ctime4(&spcl.c_ddate));
-#else
-                       spcl.c_ddate == 0 ? "the epoch\n" : ctime(&spcl.c_ddate));
-#endif
+                   ctime4(&spcl.c_date));
+               if (spcl.c_ddate)
+                       msg("Date of last level %c dump: %s", lastlevel,
+                           ctime4(&spcl.c_ddate));
                msg("Dumping %s (%s) ", disk, spcl.c_filesys);
                if (host)
                        msgtail("to %s on host %s\n", tape, host);
@@ -581,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
@@ -661,11 +654,7 @@ main(int argc, char *argv[])
        "can't allocate tape buffers - try a smaller blocking factor.\n");
 
        startnewtape(1);
-#ifdef __linux__
-       (void)time4(&(tstart_writing));
-#else
-       (void)time((time_t *)&(tstart_writing));
-#endif
+       tstart_writing = time(NULL);
        dumpmap(usedinomap, TS_CLRI, maxino - 1);
 
        msg("dumping (Pass III) [directories]\n");
@@ -718,11 +707,7 @@ main(int argc, char *argv[])
                (void)dumpino(dp, ino);
        }
 
-#ifdef __linux__
-       (void)time4(&(tend_writing));
-#else
-       (void)time((time_t *)&(tend_writing));
-#endif
+       tend_writing = time(NULL);
        spcl.c_type = TS_END;
        for (i = 0; i < ntrec; i++)
                writeheader(maxino - 1);
@@ -747,13 +732,8 @@ main(int argc, char *argv[])
                    spcl.c_tapea / (tend_writing - tstart_writing));
 
        putdumptime();
-#ifdef __linux__
        msg("Date of this level %c dump: %s", level,
                spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
-#else
-       msg("Date of this level %c dump: %s", level,
-               spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
-#endif
        msg("Date this dump completed:  %s", ctime(&tnow));
 
        msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno);
@@ -761,7 +741,7 @@ main(int argc, char *argv[])
                long tapekb = bytes_written / 1024;
                double rate = .0005 + (double) spcl.c_tapea / tapekb;
                msg("Wrote %ldKB uncompressed, %ldKB compressed,"
-                       " compression ratio %1.3f\n",
+                       " %1.3f:1\n",
                        spcl.c_tapea, tapekb, rate);
        }
 
@@ -776,27 +756,33 @@ static void
 usage(void)
 {
        char white[MAXPATHLEN];
-       int i;
-       
-       strncpy(white, __progname, MAXPATHLEN-1);
-       white[MAXPATHLEN-1] = '\0';
-       for (i=0; i<MAXPATHLEN; ++i)
-               if (white[i] != '\0') white[i] = ' ';
+       const char *ext2ver, *ext2date;
 
-       fprintf(stderr,
-               "%s %s\n", __progname, _DUMP_VERSION);
+       memset(white, ' ', MAXPATHLEN);
+       white[MIN(strlen(__progname), MAXPATHLEN - 1)] = '\0';
+
+#ifdef __linux__
+       ext2fs_get_library_version(&ext2ver, &ext2date);
+       fprintf(stderr, "%s %s (using libext2fs %s of %s)\n",
+               __progname, _DUMP_VERSION, ext2ver, ext2date);
+#else
+       fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
+#endif
        fprintf(stderr,
                "usage:\t%s [-0123456789ac"
 #ifdef KERBEROS
                "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);
 }