X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=342d4b6a513c68a926f9695b0ff22be9156ac6ef;hb=d435f57f01229cd9fa358abe32c4a93077d9090d;hp=d1e8c5f59e58547a11714d0d979771ad9f60561c;hpb=c3f69f06e7c87a8e39d2bc02396fa3ba8db76e84;p=dump.git diff --git a/dump/main.c b/dump/main.c index d1e8c5f..342d4b6 100644 --- a/dump/main.c +++ b/dump/main.c @@ -18,11 +18,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.83 2003/03/26 10:58:22 stelian Exp $"; + "$Id: main.c,v 1.90 2004/01/27 10:37:29 stelian Exp $"; #endif /* not lint */ #include @@ -49,6 +45,7 @@ static const char rcsid[] = #include #include #include +#include #include #include #include @@ -69,6 +66,7 @@ static const char rcsid[] = #include #include #include +#include /* for definition of BLKFLSBUF */ #elif defined sunos #include @@ -89,6 +87,8 @@ static const char rcsid[] = #define SBOFF (SBLOCK * DEV_BSIZE) #endif +int abortifconnerr = 1; /* set to 1 if lib dumprmt.o should exit on connection errors + otherwise just print a message using msg */ /* * Dump maps used to describe what is to be dumped. */ @@ -105,7 +105,7 @@ 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 */ -int bzipflag; /* compression is done using bzlib */ +int zipflag; /* which compression method */ int Afile = -1; /* archive file descriptor */ int AfileActive = 1;/* Afile flag */ int uflag; /* update flag */ @@ -171,27 +171,30 @@ 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 */ long long bytes_written = 0; /* total bytes written */ long uncomprblks = 0;/* uncompressed blocks written */ +long smtc_errno; + #ifdef __linux__ char *__progname; #endif 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 *)); static void do_exclude_ino_str __P((char *)); static void incompat_flags __P((int, char, char)); -static dump_ino_t iexclude_list[IEXCLUDE_MAXNUM];/* the inode exclude list */ -static int iexclude_num = 0; /* number of elements in the list */ +static char* iexclude_bitmap = NULL; /* the inode exclude bitmap */ +static unsigned int iexclude_bitmap_bytes = 0; /* size of bitmap in bytes */ int main(int argc, char *argv[]) @@ -258,6 +261,9 @@ main(int argc, char *argv[]) "Q:" #endif "s:ST:uvWw" +#ifdef HAVE_LZO + "y" +#endif #ifdef HAVE_ZLIB "z::" #endif @@ -280,7 +286,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; @@ -344,7 +350,7 @@ main(int argc, char *argv[]) #ifdef HAVE_BZLIB case 'j': compressed = 2; - bzipflag = 1; + zipflag = COMPRESS_BZLIB; if (optarg) compressed = numarg("compress level", 1L, 9L); break; @@ -433,9 +439,17 @@ main(int argc, char *argv[]) case 'w': lastdump(ch); exit(X_FINOK); /* do nothing else */ +#ifdef HAVE_LZO + case 'y': + compressed = 2; + zipflag = COMPRESS_LZO; + break; +#endif /* HAVE_LZO */ + #ifdef HAVE_ZLIB case 'z': compressed = 2; + zipflag = COMPRESS_ZLIB; if (optarg) compressed = numarg("compress level", 1L, 9L); break; @@ -460,7 +474,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'); @@ -470,8 +484,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 @@ -489,24 +504,36 @@ main(int argc, char *argv[]) tsize = cartridge ? 1700L*120L : 2300L*120L; } - if (strchr(tapeprefix, ':')) { - host = tapeprefix; - tapeprefix = strchr(host, ':'); - *tapeprefix++ = '\0'; + { + int i; + char *n; + + if ((n = strchr(tapeprefix, ':'))) { + for (i = 0; i < (n - tapeprefix); i++) { + if (tapeprefix[i] == '/') + break; + } + if (tapeprefix[i] != '/') { + host = tapeprefix; + tapeprefix = strchr(host, ':'); + *tapeprefix++ = '\0'; #ifdef RDUMP - if (index(tapeprefix, '\n')) { - msg("invalid characters in tape\n"); - msg("The ENTIRE dump is aborted.\n"); - exit(X_STARTUP); - } - if (rmthost(host) == 0) - exit(X_STARTUP); + if (index(tapeprefix, '\n')) { + msg("invalid characters in tape\n"); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); + } + if (rmthost(host) == 0) + exit(X_STARTUP); #else - msg("remote dump not enabled\n"); - msg("The ENTIRE dump is aborted.\n"); - exit(X_STARTUP); + msg("remote dump not enabled\n"); + msg("The ENTIRE dump is aborted.\n"); + exit(X_STARTUP); #endif + } + } } + (void)setuid(getuid()); /* rmthost() is the only reason to be setuid */ if (Apath && (Afile = open(Apath, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | @@ -681,7 +708,7 @@ main(int argc, char *argv[]) exit(X_STARTUP); } #ifdef BLKFLSBUF - (void)ioctl(diskfd, BLKFLSBUF); + (void)ioctl(diskfd, BLKFLSBUF, 0); #endif retval = dump_fs_open(disk, &fs); if (retval) { @@ -758,9 +785,13 @@ main(int argc, char *argv[]) msg("Writing %d Kilobyte records\n", ntrec); - if (compressed) - msg("Compressing output at compression level %d (%s)\n", - compressed, bzipflag ? "bzlib" : "zlib"); + if (compressed) { + if (zipflag == COMPRESS_LZO) + msg("Compressing output (lzo)\n"); + else + msg("Compressing output at compression level %d (%s)\n", + compressed, zipflag == COMPRESS_ZLIB ? "zlib" : "bzlib"); + } } #if defined(SIGINFO) @@ -838,9 +869,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 @@ -1054,10 +1097,13 @@ usage(void) "[-j zlevel] " #endif #ifdef USE_QFA - "[-Q file] " + "[-Q file]\n" +#endif + "\t%s [-s feet] " + "[-T date] " +#ifdef HAVE_LZO + "[-y] " #endif - "[-s feet]\n" - "\t%s [-T date] " #ifdef HAVE_ZLIB "[-z zlevel] " #endif @@ -1085,6 +1131,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) { @@ -1210,40 +1287,66 @@ obsolete(int *argcp, char **argvp[]) } /* - * This tests whether an inode is in the exclude list + * This tests whether an inode is in the exclude bitmap */ int exclude_ino(dump_ino_t ino) { - /* 04-Feb-00 ILC */ - if (iexclude_num) { /* if there are inodes in the exclude list */ - int idx; /* then check this inode against it */ - for (idx = 0; idx < iexclude_num; idx++) - if (ino == iexclude_list[idx]) - return 1; + /* if the inode exclude bitmap exists and covers given inode */ + if (iexclude_bitmap && iexclude_bitmap_bytes > ino / 8) { + /* then check this inode against it */ + int idx = iexclude_bitmap[ino / 8]; + if (idx & (1 << (ino % 8))) + return 1; } return 0; } /* - * This tests adds an inode to the exclusion list if it isn't already there + * This adds an inode to the exclusion bitmap if it isn't already there */ void do_exclude_ino(dump_ino_t ino, const char *reason) { - if (!exclude_ino(ino)) { - if (iexclude_num == IEXCLUDE_MAXNUM) { - msg("Too many exclude options\n"); - msg("The ENTIRE dump is aborted.\n"); - exit(X_STARTUP); - } + if (exclude_ino(ino)) + return; + + if (vflag) { if (reason) - msg("Excluding inode %u (%s) from dump\n", - ino, reason); + msg("Excluding inode %u (%s) from dump\n", ino, reason); else msg("Excluding inode %u from dump\n", ino); - iexclude_list[iexclude_num++] = ino; } + + /* check for enough mem; initialize */ + if ((ino/8 + 1) > iexclude_bitmap_bytes) { + if (iexclude_bitmap_bytes == 0) { + unsigned int j; + iexclude_bitmap_bytes = 2 * (ino/8 + 1); + iexclude_bitmap = (char*) malloc(iexclude_bitmap_bytes); + if (iexclude_bitmap == NULL) { + msg("allocating memory failed\n"); + exit(X_STARTUP); + } + for (j = 0; j < iexclude_bitmap_bytes; j++) + iexclude_bitmap[j] = 0; + } + else { + unsigned int oldsize = iexclude_bitmap_bytes; + iexclude_bitmap_bytes *= + (ino / 8 + 1) / iexclude_bitmap_bytes + 1; + iexclude_bitmap = (char*) realloc(iexclude_bitmap, + iexclude_bitmap_bytes); + if (iexclude_bitmap == NULL) { + msg("allocating memory failed\n"); + exit(X_STARTUP); + } + for( ; oldsize < iexclude_bitmap_bytes; oldsize++) + iexclude_bitmap[oldsize] = 0; + } + } + + iexclude_bitmap[ino / 8] |= 1 << (ino % 8); } static void