X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=1acca2a880898ddbe419c465797417fc16b2401d;hb=ce7243e04b2833c3557f1c97562088349e07f04b;hp=6bf9a53718a1e40abcb6a081376e654b0b08c332;hpb=8c363e9ab52be5c75be5229fdbcbe4ecc79e8d0d;p=dump.git diff --git a/dump/main.c b/dump/main.c index 6bf9a53..1acca2a 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.26 2000/09/26 12:34:52 stelian Exp $"; + "$Id: main.c,v 1.38 2001/03/20 20:15:43 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, compress level 1-9 */ +long long bytes_written = 0; /* total bytes written */ +long uncomprblks = 0;/* uncompressed blocks written */ #ifdef __linux__ char *__progname; @@ -106,35 +107,30 @@ 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]; char pathname[MAXPATHLEN]; #endif time_t tnow; - char labelstr[LBLSIZE]; char *diskparam; - spcl.c_date = 0; -#ifdef __linux__ - (void)time4(&spcl.c_date); -#else - (void)time((time_t *)&spcl.c_date); -#endif + spcl.c_label[0] = '\0'; + spcl.c_date = time(NULL); #ifdef __linux__ __progname = argv[0]; @@ -143,11 +139,11 @@ main(int argc, char *argv[]) #endif tsize = 0; /* Default later, based on 'c' option for cart tapes */ + unlimited = 1; eot_script = NULL; if ((tapeprefix = getenv("TAPE")) == NULL) tapeprefix = _PATH_DEFTAPE; dumpdates = _PATH_DUMPDATES; - strcpy(labelstr, "none"); /* XXX safe strcpy. */ if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0) quit("TP_BSIZE must be a multiple of DEV_BSIZE\n"); level = '0'; @@ -156,12 +152,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 */ @@ -175,6 +176,7 @@ main(int argc, char *argv[]) break; case 'B': /* blocks per output file */ + unlimited = 0; blocksperfile = numarg("number of blocks per file", 1L, 0L); break; @@ -191,10 +193,12 @@ main(int argc, char *argv[]) break; case 'c': /* Tape is cart. not 9-track */ + unlimited = 0; cartridge = 1; break; case 'd': /* density, in bits per inch */ + unlimited = 0; density = numarg("density", 10L, 327670L) / 10; if (density >= 625 && !bflag) ntrec = HIGHDENSITYTREC; @@ -208,7 +212,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", @@ -239,14 +243,14 @@ main(int argc, char *argv[]) * the last must be '\0', so the limit on strlen() * is really LBLSIZE-1. */ - strncpy(labelstr, optarg, LBLSIZE); - labelstr[LBLSIZE-1] = '\0'; + strncpy(spcl.c_label, optarg, LBLSIZE); + spcl.c_label[LBLSIZE-1] = '\0'; if (strlen(optarg) > LBLSIZE-1) { msg( "WARNING Label `%s' is larger than limit of %d characters.\n", optarg, LBLSIZE-1); msg("WARNING: Using truncated label `%s'.\n", - labelstr); + spcl.c_label); } break; @@ -259,6 +263,7 @@ main(int argc, char *argv[]) break; case 's': /* tape size, feet */ + unlimited = 0; tsize = numarg("tape size", 1L, 0L) * 12 * 10; break; @@ -285,6 +290,13 @@ main(int argc, char *argv[]) case 'w': lastdump(ch); exit(X_FINOK); /* do nothing else */ +#ifdef HAVE_ZLIB + case 'z': + compressed = 2; + if (optarg) + compressed = numarg("compress level", 1L, 9L); + break; +#endif /* HAVE_ZLIB */ default: usage(); @@ -298,7 +310,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--; @@ -373,6 +386,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 @@ -380,12 +401,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, @@ -396,8 +411,8 @@ main(int argc, char *argv[]) disk = rawname(dt->fs_spec); (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); -#ifdef __linux__ } else { +#ifdef __linux__ #ifdef HAVE_REALPATH if (realpath(disk, pathname) == NULL) #endif @@ -429,14 +444,12 @@ main(int argc, char *argv[]) NAMELEN); } } - } #else - } else { (void)strncpy(spcl.c_dev, disk, NAMELEN); (void)strncpy(spcl.c_filesys, "an unlisted file system", NAMELEN); - } #endif + } if (directory[0] != 0) { if (level != '0') { @@ -448,10 +461,10 @@ main(int argc, char *argv[]) exit(X_STARTUP); } } - spcl.c_dev[NAMELEN-1]='\0'; - spcl.c_filesys[NAMELEN-1]='\0'; - (void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1); + spcl.c_dev[NAMELEN-1] = '\0'; + spcl.c_filesys[NAMELEN-1] = '\0'; (void)gethostname(spcl.c_host, NAMELEN); + spcl.c_host[NAMELEN-1] = '\0'; spcl.c_level = level - '0'; spcl.c_type = TS_TAPE; if (!Tflag) @@ -473,24 +486,15 @@ 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); else msgtail("to %s\n", tape); - msg("Label: %s\n", labelstr); - } /* end of size estimate */ #ifdef __linux__ @@ -510,6 +514,16 @@ main(int argc, char *argv[]) msg("Cannot open %s\n", disk); exit(X_STARTUP); } + /* if no user label specified, use ext2 filesystem label if available */ + if (spcl.c_label[0] == '\0') { + const char *lbl; + if ( (lbl = get_device_label(disk)) != NULL) { + strncpy(spcl.c_label, lbl, LBLSIZE); + spcl.c_label[LBLSIZE-1] = '\0'; + } + else + strcpy(spcl.c_label, "none"); /* safe strcpy. */ + } sync(); dev_bsize = DEV_BSIZE; dev_bshift = ffs(dev_bsize) - 1; @@ -549,10 +563,17 @@ main(int argc, char *argv[]) usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char)); dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char)); + if (usedinomap == NULL || dumpdirmap == NULL || dumpinomap == NULL) + quit("out of memory allocating inode maps\n"); tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); nonodump = spcl.c_level < honorlevel; + 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 @@ -633,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"); @@ -690,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); @@ -719,16 +732,18 @@ 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); + if (compressed) { + long tapekb = bytes_written / 1024; + double rate = .0005 + (double) spcl.c_tapea / tapekb; + msg("Wrote %ldKB uncompressed, %ldKB compressed," + " %1.3f:1\n", + spcl.c_tapea, tapekb, rate); + } broadcast("DUMP IS DONE!\7\7\n"); msg("DUMP IS DONE\n"); @@ -741,23 +756,32 @@ static void usage(void) { char white[MAXPATHLEN]; - int i; - - strncpy(white, __progname, MAXPATHLEN-1); - white[MAXPATHLEN-1] = '\0'; - for (i=0; i