#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.84 2003/03/30 15:40:36 stelian Exp $";
+ "$Id: main.c,v 1.94 2004/07/05 15:12:45 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <ctype.h>
#include <compaterr.h>
#include <fcntl.h>
+#include <fstab.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
#include <time.h>
#ifdef __linux__
+#include <linux/types.h>
#ifdef HAVE_EXT2FS_EXT2_FS_H
#include <ext2fs/ext2_fs.h>
#else
#include <ext2fs/ext2fs.h>
#include <sys/stat.h>
#include <bsdcompat.h>
+#include <linux/fs.h> /* for definition of BLKFLSBUF */
#elif defined sunos
#include <sys/vnode.h>
#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.
*/
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 */
-int bzipflag; /* compression is done using bzlib */
+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 */
int uflag; /* update flag */
#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[])
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;
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);
if (argc < 2)
usage();
"Q:"
#endif
"s:ST:uvWw"
+#ifdef HAVE_LZO
+ "y"
+#endif
#ifdef HAVE_ZLIB
"z::"
#endif
/* 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 */
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;
#ifdef HAVE_BZLIB
case 'j':
compressed = 2;
- bzipflag = 1;
+ zipflag = COMPRESS_BZLIB;
if (optarg)
compressed = numarg("compress level", 1L, 9L);
break;
exit(X_STARTUP);
}
Tflag = 1;
- lastlevel = '?';
+ lastlevel[0] = '?'; lastlevel[1] = '\0';
break;
case 'u': /* update dumpdates */
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;
}
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');
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
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 |
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,
}
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);
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 */
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;
}
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)
exit(X_STARTUP);
}
#ifdef BLKFLSBUF
- (void)ioctl(diskfd, BLKFLSBUF);
+ (void)ioctl(diskfd, BLKFLSBUF, 0);
#endif
retval = dump_fs_open(disk, &fs);
if (retval) {
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)
} 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
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));
fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
#endif
fprintf(stderr,
- "usage:\t%s [-0123456789ac"
+ "usage:\t%s [-level#] [-ac"
#ifdef KERBEROS
"k"
#endif
"[-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
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)
{
}
/*
- * 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
git.wh0rd.org / dump.git / blobdiff