X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=b2922223de3d51b433602f9f1c30127e8f79903e;hb=401a4d13e4c30d46074531c6c26efefcaf3bbdaf;hp=806de5efe278b990f2844d9f994f9b39d02b7cb1;hpb=20c345aa6780d2b021ce6cdbd812e4f021273640;p=dump.git diff --git a/dump/main.c b/dump/main.c index 806de5e..b292222 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,13 +41,15 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.15 2000/02/04 20:22:21 stelian Exp $"; + "$Id: main.c,v 1.34 2001/02/22 10:57:40 stelian Exp $"; #endif /* not lint */ +#include #include #include #ifdef __linux__ #include +#include #include #include #else @@ -79,6 +82,7 @@ static const char rcsid[] = #include "dump.h" #include "pathnames.h" +#include "bylabel.h" #ifndef SBOFF #define SBOFF (SBLOCK * DEV_BSIZE) @@ -95,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; @@ -121,12 +128,13 @@ main(int argc, char *argv[]) ino_t maxino; #ifdef __linux__ errcode_t retval; - char directory[NAME_MAX]; - char pathname[NAME_MAX]; + char directory[MAXPATHLEN]; + char pathname[MAXPATHLEN]; #endif time_t tnow; - char labelstr[LBLSIZE]; + char *diskparam; + spcl.c_label[0] = '\0'; spcl.c_date = 0; #ifdef __linux__ (void)time4(&spcl.c_date); @@ -141,11 +149,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; - temp = _PATH_DTMP; - 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'; @@ -155,10 +163,18 @@ main(int argc, char *argv[]) obsolete(&argc, &argv); #ifdef KERBEROS -#define optstring "0123456789aB:b:cd:e:f:h:kL:Mns:ST:uWw" +#ifdef HAVE_ZLIB +#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWwz" #else -#define optstring "0123456789aB:b:cd:e:f:h:L:Mns:ST:uWw" -#endif +#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 /* HAVE_ZLIB */ +#endif /* KERBEROS */ while ((ch = getopt(argc, argv, optstring)) != -1) #undef optstring switch (ch) { @@ -173,6 +189,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; @@ -189,10 +206,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; @@ -200,8 +219,15 @@ main(int argc, char *argv[]) /* 04-Feb-00 ILC */ case 'e': /* exclude an inode */ - iexclude_list[iexclude_num++] = - numarg("inode to exclude",0L,0L); + if (iexclude_num == IEXCLUDE_MAXNUM) { + (void)fprintf(stderr, "Too many -e options\n"); + exit(X_STARTUP); + } + 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", (long)iexclude_list[iexclude_num-1]); + exit(X_STARTUP); + } msg("Added %d to exclude list\n", iexclude_list[iexclude_num-1]); break; @@ -210,6 +236,10 @@ main(int argc, char *argv[]) tapeprefix = optarg; break; + case 'F': /* end of tape script */ + eot_script = optarg; + break; + case 'h': honorlevel = numarg("honor level", 0L, 10L); break; @@ -226,14 +256,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; @@ -246,6 +276,7 @@ main(int argc, char *argv[]) break; case 's': /* tape size, feet */ + unlimited = 0; tsize = numarg("tape size", 1L, 0L) * 12 * 10; break; @@ -272,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(); @@ -283,7 +319,11 @@ main(int argc, char *argv[]) (void)fprintf(stderr, "Must specify disk or filesystem\n"); exit(X_STARTUP); } - disk = *argv++; + diskparam = *argv++; + if (strlen(diskparam) >= MAXPATHLEN) { + (void)fprintf(stderr, "Disk or filesystem name too long: %s\n", diskparam); + exit(X_STARTUP); + } argc--; if (argc >= 1) { (void)fprintf(stderr, "Unknown arguments to dump:"); @@ -355,12 +395,20 @@ main(int argc, char *argv[]) signal(SIGINT, SIG_IGN); set_operators(); /* /etc/group snarfed */ getfstab(); /* /etc/fstab snarfed */ + + disk = get_device_name(diskparam); + if (!disk) { /* null means the disk is some form + of LABEL= or UID= but it was not + found */ + 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[strlen(disk) - 1] = '\0'; /* * disk can be either the full special file name, * the suffix of the special file name, @@ -371,41 +419,60 @@ 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 { - /* - * The argument was not found in the fstab - * assume that this is a subtree and search for it - */ +#ifdef __linux__ #ifdef HAVE_REALPATH if (realpath(disk, pathname) == NULL) #endif strcpy(pathname, disk); - dt = fstabsearchdir(pathname, directory); - if (dt != NULL) { - char name[MAXPATHLEN]; - (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); - (void)sprintf(name, "%s (dir %s)", - dt->fs_file, directory); - (void)strncpy(spcl.c_filesys, name, NAMELEN); + /* + * The argument could be now a mountpoint of + * a filesystem specified in fstab. Search for it. + */ + if ((dt = fstabsearch(pathname)) != NULL) { disk = rawname(dt->fs_spec); + (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); + (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN); } else { - (void)strncpy(spcl.c_dev, disk, NAMELEN); - (void)strncpy(spcl.c_filesys, "an unlisted file system", - NAMELEN); + /* + * The argument was not found in the fstab + * assume that this is a subtree and search for it + */ + dt = fstabsearchdir(pathname, directory); + if (dt != NULL) { + char name[MAXPATHLEN]; + (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN); + (void)snprintf(name, sizeof(name), "%s (dir %s)", + dt->fs_file, directory); + (void)strncpy(spcl.c_filesys, name, NAMELEN); + disk = rawname(dt->fs_spec); + } else { + (void)strncpy(spcl.c_dev, disk, NAMELEN); + (void)strncpy(spcl.c_filesys, "an unlisted file system", + NAMELEN); + } } - } #else - } else { (void)strncpy(spcl.c_dev, disk, NAMELEN); (void)strncpy(spcl.c_filesys, "an unlisted file system", NAMELEN); - } #endif - spcl.c_dev[NAMELEN-1]='\0'; - spcl.c_filesys[NAMELEN-1]='\0'; - (void)strncpy(spcl.c_label, labelstr, sizeof(spcl.c_label) - 1); + } + + if (directory[0] != 0) { + if (level != '0') { + (void)fprintf(stderr, "Only level 0 dumps are allowed on a subdirectory\n"); + exit(X_STARTUP); + } + if (uflag) { + (void)fprintf(stderr, "You can't update the dumpdates file when dumping a subdirectory\n"); + exit(X_STARTUP); + } + } + 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) @@ -419,10 +486,10 @@ main(int argc, char *argv[]) } if (Mflag) - snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno + 1); + snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno + 1); else - strncpy(tape, tapeprefix, NAME_MAX); - tape[NAME_MAX - 1] = '\0'; + strncpy(tape, tapeprefix, MAXPATHLEN); + tape[MAXPATHLEN - 1] = '\0'; if (!sizest) { @@ -443,8 +510,6 @@ main(int argc, char *argv[]) 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__ @@ -464,6 +529,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; @@ -503,10 +578,14 @@ 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)); - tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); + 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 defined(SIGINFO) (void)signal(SIGINFO, statussig); #endif @@ -529,12 +608,12 @@ main(int argc, char *argv[]) } if (sizest) { - printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE); + printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE); exit(X_FINOK); } /* stop here for size estimate */ if (pipeout || unlimited) { - tapesize += 10; /* 10 trailer blocks */ + tapesize += 11; /* 10 trailer blocks + 1 map header */ msg("estimated %ld tape blocks.\n", tapesize); } else { double fetapes; @@ -652,11 +731,17 @@ main(int argc, char *argv[]) spcl.c_type = TS_END; for (i = 0; i < ntrec; i++) writeheader(maxino - 1); + + tnow = trewind(); + if (pipeout) - msg("DUMP: %ld tape blocks\n", spcl.c_tapea); + msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea, + ((double)spcl.c_tapea * TP_BSIZE / 1048576)); else - msg("DUMP: %ld tape blocks on %d volumes(s)\n", - spcl.c_tapea, spcl.c_volume); + msg("%ld tape blocks (%.2fMB) on %d volume(s)\n", + spcl.c_tapea, + ((double)spcl.c_tapea * TP_BSIZE / 1048576), + spcl.c_volume); /* report dump performance, avoid division through zero */ if (tend_writing - tstart_writing == 0) @@ -666,20 +751,25 @@ main(int argc, char *argv[]) tend_writing - tstart_writing, spcl.c_tapea / (tend_writing - tstart_writing)); - tnow = do_stats(); putdumptime(); #ifdef __linux__ - msg("DUMP: Date of this level %c dump: %s", level, + msg("Date of this level %c dump: %s", level, spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); #else - msg("DUMP: Date of this level %c dump: %s", level, + msg("Date of this level %c dump: %s", level, spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date)); #endif - msg("DUMP: Date this dump completed: %s", ctime(&tnow)); - - msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno); + 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); + } - trewind(); broadcast("DUMP IS DONE!\7\7\n"); msg("DUMP IS DONE\n"); Exit(X_FINOK); @@ -705,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); @@ -809,8 +903,11 @@ obsolete(int *argcp, char **argvp[]) case 'B': case 'b': case 'd': + case 'e': case 'f': + case 'F': case 'h': + case 'L': case 's': case 'T': if (*argv == NULL) {