64bit and glibc 2.2.2 fixes.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index b981cd8c92aa6f098c5d1b2116254bfe8a3c258e..b2922223de3d51b433602f9f1c30127e8f79903e 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -2,8 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@cybercable.fr>, 1999-2000
- *     Stelian Pop <pop@cybercable.fr> - Alcôve <www.alcove.fr>, 2000
+ *     Stelian Pop <pop@noos.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -41,13 +41,15 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: main.c,v 1.29 2000/11/10 14:42:25 stelian Exp $";
+       "$Id: main.c,v 1.34 2001/02/22 10:57:40 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__
 #include <linux/ext2_fs.h>
+#include <time.h>
 #include <sys/stat.h>
 #include <bsdcompat.h>
 #else
@@ -97,6 +99,9 @@ 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 */
+long long bytes_written = 0; /* total bytes written */
+long   uncomprblks = 0;/* uncompressed blocks written */
 
 #ifdef __linux__
 char   *__progname;
@@ -158,10 +163,18 @@ main(int argc, char *argv[])
 
        obsolete(&argc, &argv);
 #ifdef KERBEROS
+#ifdef HAVE_ZLIB
+#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWwz"
+#else
 #define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw"
+#endif /* HAVE_ZLIB */
+#else
+#ifdef HAVE_ZLIB
+#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWwz"
 #else
 #define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw"
-#endif
+#endif /* HAVE_ZLIB */
+#endif /* KERBEROS */
        while ((ch = getopt(argc, argv, optstring)) != -1)
 #undef optstring
                switch (ch) {
@@ -212,7 +225,7 @@ main(int argc, char *argv[])
                        }
                        iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
                        if (iexclude_list[iexclude_num-1] <= ROOTINO) {
-                               (void)fprintf(stderr, "Cannot exclude inode %ld\n", iexclude_list[iexclude_num-1]);
+                               (void)fprintf(stderr, "Cannot exclude inode %ld\n", (long)iexclude_list[iexclude_num-1]);
                                exit(X_STARTUP);
                        }
                        msg("Added %d to exclude list\n",
@@ -290,6 +303,11 @@ main(int argc, char *argv[])
                case 'w':
                        lastdump(ch);
                        exit(X_FINOK);  /* do nothing else */
+#ifdef HAVE_ZLIB
+               case 'z':
+                       compressed = 1;
+                       break;
+#endif /* HAVE_ZLIB */
 
                default:
                        usage();
@@ -513,8 +531,9 @@ main(int argc, char *argv[])
        }
        /* if no user label specified, use ext2 filesystem label if available */
        if (spcl.c_label[0] == '\0') {
-               if (fs->super->s_volume_name[0] != '\0') {
-                       strncpy(spcl.c_label, fs->super->s_volume_name,LBLSIZE);
+               const char *lbl;
+               if ( (lbl = get_device_label(disk)) != NULL) {
+                       strncpy(spcl.c_label, lbl, LBLSIZE);
                        spcl.c_label[LBLSIZE-1] = '\0';
                }
                else
@@ -743,6 +762,13 @@ main(int argc, char *argv[])
        msg("Date this dump completed:  %s", ctime(&tnow));
 
        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",
+                       spcl.c_tapea, tapekb, rate);
+       }
 
        broadcast("DUMP IS DONE!\7\7\n");
        msg("DUMP IS DONE\n");
@@ -769,7 +795,11 @@ usage(void)
 #ifdef KERBEROS
                "k"
 #endif
-               "MnSu] [-B records] [-b blocksize] [-d density]\n"
+               "MnSu"
+#ifdef HAVE_ZLIB
+               "z"
+#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);
        exit(X_STARTUP);