#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.65 2002/01/16 09:32:14 stelian Exp $";
+ "$Id: main.c,v 1.77 2002/11/15 09:49:40 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <errno.h>
#include <sys/param.h>
#include <sys/time.h>
#include <time.h>
#ifdef __linux__
-#include <linux/fs.h>
#ifdef HAVE_EXT2FS_EXT2_FS_H
#include <ext2fs/ext2_fs.h>
#else
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 lastlevel; /* dump level of previous dump */
char level; /* dump level of this dump */
int bzipflag; /* compression is done using bzlib */
+int Afile = 0; /* archive file descriptor */
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 */
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;
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 void obsolete __P((int *, char **[]));
static void usage __P((void));
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;
+ dump_ino_t ino;
+ int dirty;
+ struct dinode *dp;
+ struct fstab *dt;
+ char *map;
+ int ch;
int i, anydirskipped;
int aflag = 0, bflag = 0, Tflag = 0, honorlevel = 1;
dump_ino_t maxino;
#endif
time_t tnow;
char *diskparam;
+ char *Apath = NULL;
spcl.c_label[0] = '\0';
spcl.c_date = time(NULL);
#endif /* USE_QFA */
while ((ch = getopt(argc, argv,
- "0123456789aB:b:cd:e:E:f:F:h:I:"
+ "0123456789A:aB:b:cd:e:E:f:F:h:I:"
#ifdef HAVE_BZLIB
"j::"
#endif
#ifdef KERBEROS
"k"
#endif
- "Mnq"
+ "mMnq"
#ifdef USE_QFA
"Q:"
#endif
- "s:ST:uWw"
+ "s:ST:uvWw"
#ifdef HAVE_ZLIB
"z::"
#endif
level = ch;
break;
+ case 'A': /* archive file */
+ Apath = optarg;
+ if ((Afile = open(Apath, O_RDWR|O_CREAT|O_TRUNC,
+ S_IRUSR | S_IWUSR)) < 0) {
+ msg("Cannot open %s for writing: %s\n",
+ optarg, strerror(errno));
+ msg("The ENTIRE dump is aborted.\n");
+ exit(X_STARTUP);
+ }
+ memset(volinfo, 0, TP_NINOS * sizeof(dump_ino_t));
+ break;
+
case 'a': /* `auto-size', Write to EOM. */
unlimited = 1;
aflag = 1;
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);
}
break;
+ case 'm': /* metadata only flag */
+ mflag = 1;
+ break;
+
case 'M': /* multi-volume flag */
Mflag = 1;
break;
uflag = 1;
break;
+ case 'v': /* verbose */
+ vflag = 1;
+ break;
+
case 'W': /* what to do */
case 'w':
lastdump(ch);
*/
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
if (TP_BSIZE != (1 << tp_bshift))
quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE);
maxino = fs->super->s_inodes_count + 1;
-#if 0
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);
#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_RDWR|O_CREAT|O_TRUNC, S_IRUSR | S_IWUSR)) < 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) {
+ 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.
spcl.c_tapea, tapekb, rate);
}
+ if (Afile)
+ msg("Archiving dump to %s\n", Apath);
+
broadcast("DUMP IS DONE!\7\7\n");
msg("DUMP IS DONE\n");
Exit(X_FINOK);
#ifdef KERBEROS
"k"
#endif
- "MnqSu"
- "] [-B records] [-b blocksize] [-d density]\n"
- "\t%s [-e inode#,inode#,...] [-E file] [-f file] [-h level]\n"
- "\t%s [-I nr errors] "
+ "mMnqSuv"
+ "] [-A file] [-B records] [-b blocksize]\n"
+ "\t%s [-d density] [-e inode#,inode#,...] [-E file] [-f file]\n"
+ "\t%s [-h level] [-I nr errors] "
#ifdef HAVE_BZLIB
"[-j zlevel] "
#endif
#ifdef USE_QFA
"[-Q file] "
#endif
- "[-s feet] [-T date] "
+ "[-s feet]\n"
+ "\t%s [-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);
}
for (flags = 0; *ap; ++ap) {
switch (*ap) {
+ case 'A':
case 'B':
case 'b':
case 'd':
exit(X_STARTUP);
}
if (reason)
- msg("Added inode %u to exclude list (%s)\n",
+ msg("Excluding inode %u (%s) from dump\n",
ino, reason);
else
- msg("Added inode %u to exclude list\n", ino);
+ msg("Excluding inode %u from dump\n", ino);
iexclude_list[iexclude_num++] = ino;
}
}
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);
git.wh0rd.org / dump.git / blobdiff