X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=60f2bb4b7a4f9d145ac70f89c2addfb14fe6598f;hb=43460f04f3920ae39f345a2fb39d000a890a4283;hp=876ea22e6d6b4cdee8793434901e83ad83c75667;hpb=95cd88019335e29909def7e0ac8794ef01380aac;p=dump.git diff --git a/dump/main.c b/dump/main.c index 876ea22..60f2bb4 100644 --- a/dump/main.c +++ b/dump/main.c @@ -2,7 +2,8 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999-2000 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000 */ /*- @@ -40,17 +41,29 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.28 2000/11/10 13:52:43 stelian Exp $"; + "$Id: main.c,v 1.35 2001/03/19 13:22:48 stelian Exp $"; #endif /* not lint */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #ifdef __linux__ #include +#include +#include #include #include -#else -#ifdef sunos +#elif defined sunos #include #include @@ -59,24 +72,9 @@ static const char rcsid[] = #include #include #endif -#endif #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __linux__ -#include -#endif - #include "dump.h" #include "pathnames.h" #include "bylabel.h" @@ -96,6 +94,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; @@ -156,12 +157,17 @@ main(int argc, char *argv[]) usage(); obsolete(&argc, &argv); + + while ((ch = getopt(argc, argv, + "0123456789aB:b:cd:e:f:F:h:L:" #ifdef KERBEROS -#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw" -#else -#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw" + "k" +#endif + "Mns:ST:uWw" +#ifdef HAVE_ZLIB + "z" #endif - while ((ch = getopt(argc, argv, optstring)) != -1) + )) != -1) #undef optstring switch (ch) { /* dump level */ @@ -211,7 +217,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", @@ -289,6 +295,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(); @@ -302,7 +313,8 @@ main(int argc, char *argv[]) } diskparam = *argv++; if (strlen(diskparam) >= MAXPATHLEN) { - (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", diskparam); + (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", + diskparam); exit(X_STARTUP); } argc--; @@ -377,6 +389,14 @@ main(int argc, char *argv[]) set_operators(); /* /etc/group snarfed */ getfstab(); /* /etc/fstab snarfed */ + /* + * disk may end in / and this can confuse + * fstabsearch. + */ + i = strlen(diskparam) - 1; + if (i > 1 && diskparam[i] == '/') + diskparam[i] = '\0'; + disk = get_device_name(diskparam); if (!disk) { /* null means the disk is some form of LABEL= or UID= but it was not @@ -384,12 +404,6 @@ main(int argc, char *argv[]) msg("Cannot find a disk having %s\n", diskparam); exit(X_STARTUP); } - /* - * disk may end in / and this can confuse - * fstabsearch. - */ - if (strlen(disk) > 1 && disk[strlen(disk) - 1] == '/') - disk[strlen(disk) - 1] = '\0'; /* * disk can be either the full special file name, * the suffix of the special file name, @@ -512,8 +526,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 @@ -742,6 +757,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"); @@ -768,7 +790,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); @@ -818,8 +844,8 @@ sig(int signo) } } -char * -rawname(char *cp) +const char * +rawname(const char *cp) { #ifdef __linux__ return cp; @@ -829,10 +855,8 @@ rawname(char *cp) if (dp == NULL) return (NULL); - *dp = '\0'; - (void)strncpy(rawbuf, cp, MAXPATHLEN - 1); - rawbuf[MAXPATHLEN-1] = '\0'; - *dp = '/'; + (void)strncpy(rawbuf, cp, min(dp-cp, MAXPATHLEN - 1)); + rawbuf[min(dp-cp, MAXPATHLEN-1)] = '\0'; (void)strncat(rawbuf, "/r", MAXPATHLEN - 1 - strlen(rawbuf)); (void)strncat(rawbuf, dp + 1, MAXPATHLEN - 1 - strlen(rawbuf)); return (rawbuf);