* Ported to Linux's Second Extended File System as part of the
* dump and restore backup suit
* Remy Card <card@Linux.EU.Org>, 1994-1997
- * Stelian Pop <pop@noos.fr>, 1999-2000
- * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ * Stelian Pop <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
*/
/*-
* 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.
*
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.56 2001/08/13 16:17:52 stelian Exp $";
+ "$Id: main.c,v 1.94 2004/07/05 15:12:45 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <errno.h>
+#include <mntent.h>
#include <sys/param.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 *usedinomap; /* map of allocated inodes */
char *dumpdirmap; /* map of directories to be dumped */
char *dumpinomap; /* map of files to be dumped */
+char *metainomap; /* which of the inodes in dumpinomap will get
+ only their metadata dumped */
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 */
int uflag; /* update flag */
+int mflag; /* dump metadata only if possible */
int Mflag; /* multi-volume flag */
+int qflag; /* quit on errors flag */
+int vflag; /* verbose flag */
+int breademax = 32; /* maximum number of bread errors before we quit */
char *eot_script; /* end of volume script fiag */
int diskfd; /* disk file descriptor */
int tapefd; /* tape file descriptor */
long dev_bsize; /* block size of underlying disk device */
int dev_bshift; /* log2(dev_bsize) */
int tp_bshift; /* log2(TP_BSIZE) */
+dump_ino_t volinfo[TP_NINOS];/* which inode on which volume archive info */
#ifdef USE_QFA
int gTapeposfd;
int blockswritten = 0; /* number of blocks written on current tape */
int tapeno = 0; /* current tape number */
int density = 0; /* density in bytes/0.1" " <- this is for hilit19 */
-int ntrec = NTREC; /* # tape blocks in each tape record */
+int ntrec = NTREC; /* # blocks in each tape record */
int cartridge = 0; /* Assume non-cartridge tape */
#ifdef USE_QFA
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 = 64*1024; /* XXX MAXBSIZE from sys/param.h */
+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[])
{
- 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;
+ dump_ino_t ino;
+ int dirty;
+ struct dinode *dp;
+ struct mntent *dt;
+ char *map;
+ int ch, pch = 0;
+ int i, anydirskipped;
+ int aflag = 0, bflag = 0, Tflag = 0, honorlevel = 1;
dump_ino_t maxino;
struct STAT statbuf;
dev_t filedev = 0;
#endif
time_t tnow;
char *diskparam;
+ char *Apath = NULL;
spcl.c_label[0] = '\0';
spcl.c_date = time(NULL);
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();
#endif /* USE_QFA */
while ((ch = getopt(argc, argv,
- "0123456789aB:b:cd:e:E:f:F:h:L:"
+ "0123456789A:aB:b:cd:D:e:E:f:F:h:I:"
+#ifdef HAVE_BZLIB
+ "j::"
+#endif
+ "L:"
#ifdef KERBEROS
"k"
#endif
- "Mn"
+ "mMnq"
#ifdef USE_QFA
"Q:"
#endif
- "s:ST:uWw"
+ "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 */
+ Apath = optarg;
break;
case 'a': /* `auto-size', Write to EOM. */
unlimited = 1;
+ aflag = 1;
break;
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;
case 'b': /* blocks per tape write */
ntrec = numarg("number of blocks per write",
- 1L, 1000L);
+ 1L, 1048576L);
if (ntrec > maxbsize/1024) {
msg("Please choose a blocksize <= %dkB\n",
maxbsize/1024);
density = numarg("density", 10L, 327670L) / 10;
if (density >= 625 && !bflag)
ntrec = HIGHDENSITYTREC;
+ break;
+
+ case 'D': /* path of dumpdates file */
+ dumpdates = optarg;
break;
/* 04-Feb-00 ILC */
honorlevel = numarg("honor level", 0L, 10L);
break;
+#ifdef HAVE_BZLIB
+ case 'j':
+ compressed = 2;
+ zipflag = COMPRESS_BZLIB;
+ if (optarg)
+ compressed = numarg("compress level", 1L, 9L);
+ break;
+#endif /* HAVE_BZLIB */
+
+ case 'I':
+ breademax =
+ numarg ("number of errors to ignore", 0L, 0L);
+ break;
+
#ifdef KERBEROS
case 'k':
dokerberos = 1;
}
break;
+ case 'm': /* metadata only flag */
+ mflag = 1;
+ break;
+
case 'M': /* multi-volume flag */
Mflag = 1;
break;
notify = 1;
break;
+ case 'q':
+ qflag = 1;
+ break;
+
#ifdef USE_QFA
case 'Q': /* create tapeposfile */
gTapeposfile = optarg;
exit(X_STARTUP);
}
Tflag = 1;
- lastlevel = '?';
+ lastlevel[0] = '?'; lastlevel[1] = '\0';
break;
case 'u': /* update dumpdates */
uflag = 1;
break;
+ case 'v': /* verbose */
+ vflag = 1;
+ break;
+
case 'W': /* what to do */
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;
exit(X_STARTUP);
}
argc--;
- if (Tflag && uflag) {
- msg("You cannot use the T and u flags together.\n");
- msg("The ENTIRE dump is aborted.\n");
- exit(X_STARTUP);
- }
+ incompat_flags(Tflag && uflag, 'T', 'u');
+ incompat_flags(aflag && blocksperfiles, 'a', 'B');
+ incompat_flags(aflag && cartridge, 'a', 'c');
+ incompat_flags(aflag && density, 'a', 'd');
+ incompat_flags(aflag && tsize, 'a', 's');
+
if (strcmp(tapeprefix, "-") == 0) {
pipeout++;
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 |
+ S_IWGRP | S_IROTH | S_IWOTH)) < 0) {
+ msg("Cannot open %s for writing: %s\n",
+ optarg, strerror(errno));
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
signal(SIGHUP, sig);
signal(SIGTERM, sig);
if (signal(SIGINT, interrupt) == SIG_IGN)
signal(SIGINT, SIG_IGN);
+#ifdef SIGXCPU
+ signal(SIGXCPU, SIG_IGN);
+#endif /* SIGXCPU */
+#ifdef SIGXFSZ
+ signal(SIGXFSZ, SIG_IGN);
+#endif /* SIGXFSZ */
+
set_operators(); /* /etc/group snarfed */
getfstab(); /* /etc/fstab snarfed */
*/
i = strlen(diskparam) - 1;
if (i > 1 && diskparam[i] == '/')
- diskparam[i] = '\0';
+ if (!(i == 6 && !strcmp(diskparam, "LABEL=/")))
+ 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,
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
- disk = rawname(dt->fs_spec);
- (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
- (void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
+ disk = rawname(dt->mnt_fsname);
+ (void)strncpy(spcl.c_dev, dt->mnt_fsname, NAMELEN);
+ (void)strncpy(spcl.c_filesys, dt->mnt_dir, NAMELEN);
} else {
#ifdef __linux__
#ifdef HAVE_REALPATH
* 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);
+ disk = rawname(dt->mnt_fsname);
+ (void)strncpy(spcl.c_dev, dt->mnt_fsname, NAMELEN);
+ (void)strncpy(spcl.c_filesys, dt->mnt_dir, NAMELEN);
} else {
/*
* The argument was not found in the fstab
dt = fstabsearchdir(pathname, directory);
if (dt != NULL) {
char name[MAXPATHLEN];
- (void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
+ (void)strncpy(spcl.c_dev, dt->mnt_fsname, NAMELEN);
(void)snprintf(name, sizeof(name), "%s (dir %s)",
- dt->fs_file, directory);
+ dt->mnt_dir, directory);
(void)strncpy(spcl.c_filesys, name, NAMELEN);
- disk = rawname(dt->fs_spec);
+ disk = rawname(dt->mnt_fsname);
} else {
(void)strncpy(spcl.c_dev, disk, NAMELEN);
(void)strncpy(spcl.c_filesys, "an unlisted file system",
}
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)
} /* end of size estimate */
#ifdef __linux__
+ if ((diskfd = OPEN(disk, O_RDONLY)) < 0) {
+ msg("Cannot open %s\n", disk);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+#ifdef BLKFLSBUF
+ (void)ioctl(diskfd, BLKFLSBUF, 0);
+#endif
retval = dump_fs_open(disk, &fs);
if (retval) {
com_err(disk, retval, "while opening filesystem");
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
- if ((diskfd = OPEN(disk, O_RDONLY)) < 0) {
- msg("Cannot open %s\n", disk);
- msg("The ENTIRE dump is aborted.\n");
- exit(X_STARTUP);
- }
/* if no user label specified, use ext2 filesystem label if available */
if (spcl.c_label[0] == '\0') {
const char *lbl;
tp_bshift = ffs(TP_BSIZE) - 1;
if (TP_BSIZE != (1 << tp_bshift))
quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE);
- maxino = fs->super->s_inodes_count;
-#if 0
+ maxino = fs->super->s_inodes_count + 1;
spcl.c_flags |= DR_NEWINODEFMT;
-#endif
#else /* __linux __*/
if ((diskfd = open(disk, O_RDONLY)) < 0) {
msg("Cannot open %s\n", disk);
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)
+ metainomap = (char *)calloc((unsigned) mapsize, sizeof(char));
+ if (usedinomap == NULL || dumpdirmap == NULL ||
+ dumpinomap == NULL || metainomap == NULL)
quit("out of memory allocating inode maps\n");
tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
if (!sizest) {
msg("Label: %s\n", spcl.c_label);
-
- if (compressed)
- msg("Compressing output at compression level %d\n",
- compressed);
+
+ msg("Writing %d Kilobyte records\n", ntrec);
+
+ 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)
if (directory[0] == 0)
anydirskipped = mapfiles(maxino, &tapesize);
else {
- if (STAT(pathname, &statbuf) == -1) {
+ if (LSTAT(pathname, &statbuf) == -1) {
msg("File cannot be accessed (%s).\n", pathname);
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
int anydirskipped2;
char *p = *argv;
/* check if file is available */
- if (STAT(p, &statbuf) == -1) {
+ if (LSTAT(p, &statbuf) == -1) {
msg("File cannot be accessed (%s).\n", p);
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
/* check if file is a directory */
if (!(statbuf.st_mode & S_IFDIR))
anydirskipped2 = maponefile(maxino, &tapesize,
- p+strlen(dt->fs_file));
+ p+strlen(dt->mnt_dir));
else
/* read directory inodes.
* NOTE: nested directories are not recognized
* so inodes may be umped twice!
*/
anydirskipped2 = mapfilesfromdir(maxino, &tapesize,
- p+strlen(dt->fs_file));
+ p+strlen(dt->mnt_dir));
if (!anydirskipped)
anydirskipped = anydirskipped2;
argv++;
if (pipeout || unlimited) {
tapesize += 1 + ntrec; /* 1 map header + trailer blocks */
- msg("estimated %ld tape blocks.\n", tapesize);
+ msg("estimated %ld blocks.\n", tapesize);
} 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
tapesize += (etapes - 1) *
(howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
tapesize += etapes + ntrec; /* headers + trailer blks */
- msg("estimated %ld tape blocks on %3.2f tape(s).\n",
+ msg("estimated %ld blocks on %3.2f tape(s).\n",
tapesize, fetapes);
}
#ifdef USE_QFA
if (tapepos) {
msg("writing QFA positions to %s\n", gTapeposfile);
- if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT, S_IRUSR | S_IWUSR)) < 0)
+ if ((gTapeposfd = open(gTapeposfile,
+ O_WRONLY|O_CREAT|O_TRUNC,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
+ | S_IROTH | S_IWOTH)) < 0)
quit("can't open tapeposfile\n");
/* print QFA-file header */
- sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
- if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ snprintf(gTps, sizeof(gTps), "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date);
+ gTps[sizeof(gTps) - 1] = '\0';
+ if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
quit("can't write tapeposfile\n");
sprintf(gTps, "ino\ttapeno\ttapepos\n");
- if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
quit("can't write tapeposfile\n");
}
#endif /* USE_QFA */
*/
if (dp->di_nlink == 0 || dp->di_dtime != 0)
continue;
+ if (vflag)
+ msg("dumping directory inode %lu\n", ino);
(void)dumpdirino(dp, ino);
#else
(void)dumpino(dp, ino);
* inodes since this is done in dumpino().
*/
#endif
- (void)dumpino(dp, ino);
+ if (vflag) {
+ if (mflag && TSTINO(ino, metainomap))
+ msg("dumping regular inode %lu (meta only)\n", ino);
+ else
+ msg("dumping regular inode %lu\n", ino);
+ }
+ (void)dumpino(dp, ino, mflag && TSTINO(ino, metainomap));
}
tend_writing = time(NULL);
spcl.c_type = TS_END;
+
+ if (Afile >= 0) {
+ volinfo[1] = ROOTINO;
+ memcpy(spcl.c_inos, volinfo, TP_NINOS * sizeof(dump_ino_t));
+ spcl.c_flags |= DR_INODEINFO;
+ }
+
/*
* Finish off the current tape record with trailer blocks, to ensure
* at least the data in the last partial record makes it to tape.
tnow = trewind();
if (pipeout || fifoout)
- msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea,
+ msg("%ld blocks (%.2fMB)\n", spcl.c_tapea,
((double)spcl.c_tapea * TP_BSIZE / 1048576));
else
- msg("%ld tape blocks (%.2fMB) on %d volume(s)\n",
+ msg("%ld blocks (%.2fMB) on %d volume(s)\n",
spcl.c_tapea,
((double)spcl.c_tapea * TP_BSIZE / 1048576),
spcl.c_volume);
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));
spcl.c_tapea, tapekb, rate);
}
+ if (Afile >= 0)
+ msg("Archiving dump to %s\n", Apath);
+
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
Exit(X_FINOK);
fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
#endif
fprintf(stderr,
- "usage:\t%s [-0123456789ac"
+ "usage:\t%s [-level#] [-ac"
#ifdef KERBEROS
"k"
#endif
- "MnSu"
- "] [-B records] [-b blocksize] [-d density]\n"
- "\t%s [-e inode#,inode#,...] [-E file] [-f file] [-h level] "
+ "mMnqSuv"
+ "] [-A file] [-B records] [-b blocksize]\n"
+ "\t%s [-d density] [-D file] [-e inode#,inode#,...] [-E file]\n"
+ "\t%s [-f file] [-h level] [-I nr errors] "
+#ifdef HAVE_BZLIB
+ "[-j zlevel] "
+#endif
#ifdef USE_QFA
- "[-Q file] "
+ "[-Q file]\n"
+#endif
+ "\t%s [-s feet] "
+ "[-T date] "
+#ifdef HAVE_LZO
+ "[-y] "
#endif
- "\n\t%s [-s feet] [-T date] "
#ifdef HAVE_ZLIB
"[-z zlevel] "
#endif
"filesystem\n"
"\t%s [-W | -w]\n",
- __progname, white, white, __progname);
+ __progname, white, white, white, __progname);
exit(X_STARTUP);
}
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)
{
for (flags = 0; *ap; ++ap) {
switch (*ap) {
+ case 'A':
case 'B':
case 'b':
case 'd':
+ case 'D':
case 'e':
case 'E':
case 'f':
}
/*
- * 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("Added inode %u to exclude list (%s)\n",
- ino, reason);
+ msg("Excluding inode %u (%s) from dump\n", ino, reason);
else
- msg("Added inode %u to exclude list\n", ino);
- iexclude_list[iexclude_num++] = ino;
+ msg("Excluding inode %u from dump\n", 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
unsigned long inod;
inod = strtoul(ino, &r, 10);
- if (*r != '\0' || inod <= ROOTINO) {
+ if (( *r != '\0' && !isspace(*r) ) || inod <= ROOTINO) {
msg("Invalid inode argument %s\n", ino);
msg("The ENTIRE dump is aborted.\n");
exit(X_STARTUP);
}
fclose(f);
}
+
+static void incompat_flags(int cond, char flag1, char flag2) {
+ if (cond) {
+ msg("You cannot use the %c and %c flags together.\n",
+ flag1, flag2);
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+}
git.wh0rd.org / dump.git / blobdiff