X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Fmain.c;h=74ca0be0d72aaa9adf9721087bccb1e60f26b5e1;hp=a9a671d0d5b8fe2006cfc51bb83c6a573c64084e;hb=62614cf50e5f719954f23b7a9819a70b2d3ec44c;hpb=e0267986934b9cf6f6c130a7779c999dff096804 diff --git a/dump/main.c b/dump/main.c index a9a671d..74ca0be 100644 --- a/dump/main.c +++ b/dump/main.c @@ -37,7 +37,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.89 2004/01/04 10:48:35 stelian Exp $"; + "$Id: main.c,v 1.96 2009/07/23 09:34:07 stelian Exp $"; #endif /* not lint */ #include @@ -58,6 +58,7 @@ static const char rcsid[] = #include #include #ifdef __linux__ +#include #ifdef HAVE_EXT2FS_EXT2_FS_H #include #else @@ -103,8 +104,8 @@ const char *disk; /* name of the disk file */ char tape[MAXPATHLEN];/* name of the tape file */ char *tapeprefix; /* prefix of the tape file */ char *dumpdates; /* name of the file containing dump date information*/ -char lastlevel; /* dump level of previous dump */ -char level; /* dump level of this dump */ +char lastlevel[NUM_STR_SIZE];/* dump level of previous dump */ +char level[NUM_STR_SIZE];/* dump level of this dump */ int zipflag; /* which compression method */ int Afile = -1; /* archive file descriptor */ int AfileActive = 1;/* Afile flag */ @@ -171,7 +172,7 @@ int tapepos = 0; /* assume no QFA tapeposition needed by user */ #endif /* USE_QFA */ int dokerberos = 0; /* Use Kerberos authentication */ long dev_bsize = 1; /* recalculated below */ -long blocksperfile; /* output blocks per file */ +long *blocksperfiles = NULL; /* output blocks per file(s) */ 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 */ @@ -186,6 +187,7 @@ char *__progname; int maxbsize = 1024*1024; /* XXX MAXBSIZE from sys/param.h */ static long numarg __P((const char *, long, long)); +static long *numlistarg __P((const char *, long, long)); static void obsolete __P((int *, char **[])); static void usage __P((void)); static void do_exclude_from_file __P((char *)); @@ -203,7 +205,7 @@ main(int argc, char *argv[]) struct dinode *dp; struct mntent *dt; char *map; - int ch; + int ch, pch = 0; int i, anydirskipped; int aflag = 0, bflag = 0, Tflag = 0, honorlevel = 1; dump_ino_t maxino; @@ -235,7 +237,10 @@ main(int argc, char *argv[]) dumpdates = _PATH_DUMPDATES; if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0) quit("TP_BSIZE must be a multiple of DEV_BSIZE\n"); - level = '0'; + memset(&lastlevel, 0, NUM_STR_SIZE); + memset(&level, 0, NUM_STR_SIZE); + /* Default dump level is zero. */ + level[0] = '0'; if (argc < 2) usage(); @@ -271,7 +276,11 @@ main(int argc, char *argv[]) /* dump level */ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - level = ch; + if ((pch >= '0') && (pch <= '9') && (strlen(level) < NUM_STR_SIZE)) + level[strlen(level)] = ch; + else + level[0] = ch; + pch = ch; break; case 'A': /* archive file */ @@ -285,7 +294,7 @@ main(int argc, char *argv[]) case 'B': /* blocks per output file */ unlimited = 0; - blocksperfile = numarg("number of blocks per file", + blocksperfiles = numlistarg("number of blocks per file", 1L, 0L); break; @@ -423,7 +432,7 @@ main(int argc, char *argv[]) exit(X_STARTUP); } Tflag = 1; - lastlevel = '?'; + lastlevel[0] = '?'; lastlevel[1] = '\0'; break; case 'u': /* update dumpdates */ @@ -473,7 +482,7 @@ main(int argc, char *argv[]) } argc--; incompat_flags(Tflag && uflag, 'T', 'u'); - incompat_flags(aflag && blocksperfile, 'a', 'B'); + incompat_flags(aflag && blocksperfiles, 'a', 'B'); incompat_flags(aflag && cartridge, 'a', 'c'); incompat_flags(aflag && density, 'a', 'd'); incompat_flags(aflag && tsize, 'a', 's'); @@ -483,8 +492,9 @@ main(int argc, char *argv[]) tapeprefix = "standard output"; } - if (blocksperfile && !compressed) - blocksperfile = blocksperfile / ntrec * ntrec; /* round down */ + if (blocksperfiles && !compressed) + for (i = 1; i <= *blocksperfiles; i++) + blocksperfiles[i] = blocksperfiles[i] / ntrec * ntrec; /* round down */ else if (!unlimited) { /* * Determine how to default tape size and density @@ -533,7 +543,7 @@ main(int argc, char *argv[]) } (void)setuid(getuid()); /* rmthost() is the only reason to be setuid */ - if (Apath && (Afile = open(Apath, O_WRONLY|O_CREAT|O_TRUNC, + if (Apath && (Afile = OPEN(Apath, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) < 0) { msg("Cannot open %s for writing: %s\n", @@ -576,13 +586,9 @@ main(int argc, char *argv[]) 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 - found */ - msg("Cannot find a disk having %s\n", diskparam); - msg("The ENTIRE dump is aborted.\n"); - exit(X_STARTUP); - } + if (!disk) + disk = strdup(diskparam); + /* * disk can be either the full special file name, * the suffix of the special file name, @@ -644,7 +650,7 @@ main(int argc, char *argv[]) } if (directory[0] != 0) { - if (level != '0') { + if (atoi(level) != 0) { msg("Only level 0 dumps are allowed on a subdirectory\n"); msg("The ENTIRE dump is aborted.\n"); exit(X_STARTUP); @@ -659,7 +665,7 @@ main(int argc, char *argv[]) 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_level = atoi(level); spcl.c_type = TS_TAPE; if (!Tflag) getdumptime(uflag); /* dumpdates snarfed */ @@ -667,7 +673,7 @@ main(int argc, char *argv[]) if (spcl.c_ddate == 0 && spcl.c_level) { msg("WARNING: There is no inferior level dump on this filesystem\n"); msg("WARNING: Assuming a level 0 dump by default\n"); - level = '0'; + level[0] = '0'; level[1] = '\0'; spcl.c_level = 0; } @@ -684,13 +690,13 @@ main(int argc, char *argv[]) if (!sizest) { - msg("Date of this level %c dump: %s", level, + msg("Date of this level %s dump: %s", level, ctime4(&spcl.c_date)); #ifdef USE_QFA gThisDumpDate = spcl.c_date; #endif if (spcl.c_ddate) - msg("Date of last level %c dump: %s", lastlevel, + msg("Date of last level %s dump: %s", lastlevel, ctime4(&spcl.c_ddate)); msg("Dumping %s (%s) ", disk, spcl.c_filesys); if (host) @@ -867,9 +873,21 @@ main(int argc, char *argv[]) } else { double fetapes; - if (blocksperfile) - fetapes = (double) tapesize / blocksperfile; - else if (cartridge) { + if (blocksperfiles) { + long tapesize_left; + + tapesize_left = tapesize; + fetapes = 0; + for (i = 1; i < *blocksperfiles && tapesize_left; i++) { + fetapes++; + if (tapesize_left > blocksperfiles[i]) + tapesize_left -= blocksperfiles[i]; + else + tapesize_left = 0; + } + if (tapesize_left) + fetapes += (double)tapesize_left / blocksperfiles[*blocksperfiles]; + } else if (cartridge) { /* Estimate number of tapes, assuming streaming stops at the end of each block written, and not in mid-block. Assume no erroneous blocks; this can be compensated @@ -1032,7 +1050,7 @@ main(int argc, char *argv[]) spcl.c_tapea / (tend_writing - tstart_writing)); putdumptime(); - msg("Date of this level %c dump: %s", level, + msg("Date of this level %s dump: %s", level, spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date)); msg("Date this dump completed: %s", ctime(&tnow)); @@ -1071,7 +1089,7 @@ usage(void) fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION); #endif fprintf(stderr, - "usage:\t%s [-0123456789ac" + "usage:\t%s [-level#] [-ac" #ifdef KERBEROS "k" #endif @@ -1117,6 +1135,37 @@ numarg(const char *meaning, long vmin, long vmax) return (val); } +/* + * The same as numarg, just that it expects a comma separated list of numbers + * and returns an array of longs with the first element containing the number + * values in that array. + */ +static long * +numlistarg(const char *meaning, long vmin, long vmax) +{ + char *p; + long *vals,*curval; + long valnum; + + p = optarg; + vals = NULL; + valnum = 0; + do { + valnum++; + if ( !(vals = realloc(vals, (valnum + 1) * sizeof(*vals))) ) + errx(X_STARTUP, "allocating memory failed"); + curval = vals + valnum; + *curval = strtol(p, &p, 10); + if (*p && *p!=',') + errx(X_STARTUP, "illegal %s -- %s", meaning, optarg); + if (*curval < vmin || (vmax && *curval > vmax)) + errx(X_STARTUP, "%s must be between %ld and %ld", meaning, vmin, vmax); + *vals = valnum; + if (*p) p++; + } while(*p); + return (vals); +} + void sig(int signo) {