* 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@cybercable.fr>, 1999-2000
+ * Stelian Pop <pop@noos.fr>, 1999-2000
+ * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
*/
/*
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.11 2000/03/09 13:12:31 stelian Exp $";
+ "$Id: main.c,v 1.26 2001/07/18 13:12:33 stelian Exp $";
#endif /* not lint */
+#include <config.h>
+#include <compatlfs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
#ifdef __linux__
+#include <sys/time.h>
+#include <time.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
#include <bsdcompat.h>
#include <signal.h>
#include <string.h>
#include "extern.h"
int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
-int hflag = 1, mflag = 1, Nflag = 0;
+int hflag = 1, mflag = 1, Nflag = 0, zflag = 0;
int uflag = 0;
int dokerberos = 0;
char command = '\0';
long ntrec;
char *dumpmap;
char *usedinomap;
-ino_t maxino;
+dump_ino_t maxino;
time_t dumptime;
time_t dumpdate;
FILE *terminal;
char *tmpdir;
int compare_ignore_not_found;
+int compare_errors;
char filesys[NAMELEN];
static const char *stdin_opt = NULL;
+char *bot_script = NULL;
#ifdef __linux__
char *__progname;
main(int argc, char *argv[])
{
int ch;
- ino_t ino;
+ dump_ino_t ino;
char *inputdev = _PATH_DEFTAPE;
char *symtbl = "./restoresymtable";
char *p, name[MAXPATHLEN];
FILE *filelist = NULL;
char fname[MAXPATHLEN];
+#ifdef USE_QFA
+ tapeposflag = 0;
+#endif
+#ifdef USE_QFADEBUG
+ time_t tistart, tiend, titaken;
+#endif
/* Temp files should *not* be readable. We set permissions later. */
(void) umask(077);
for (p = tmpdir + strlen(tmpdir) - 1; p >= tmpdir && *p == '/'; p--)
;
obsolete(&argc, &argv);
+ while ((ch = getopt(argc, argv,
+ "b:CcdD:f:F:hi"
#ifdef KERBEROS
-#define optlist "b:CcdD:f:hikmMNRrs:tT:uvxX:y"
-#else
-#define optlist "b:CcdD:f:himMNRrs:tT:uvxX:y"
+ "k"
+#endif
+ "mMN"
+#ifdef USE_QFA
+ "Q:"
#endif
- while ((ch = getopt(argc, argv, optlist)) != -1)
+ "Rrs:tT:uvxX:y")) != -1)
switch(ch) {
case 'b':
/* Change default tape blocksize. */
use_stdin("-f");
inputdev = optarg;
break;
+ case 'F':
+ bot_script = optarg;
+ break;
case 'h':
hflag = 0;
break;
case 'N':
Nflag = 1;
break;
+#ifdef USE_QFA
+ case 'Q':
+ gTapeposfile = optarg;
+ tapeposflag = 1;
+ break;
+#endif
case 's':
/* Dumpnum (skip to) for multifile dump tapes. */
dumpnum = strtol(optarg, &p, 10);
if (command == '\0')
errx(1, "none of C, i, R, r, t or x options specified");
+#ifdef USE_QFA
+ if (!mflag && tapeposflag)
+ errx(1, "m and Q options are mutually exclusive");
+#endif
+
if (signal(SIGINT, onintr) == SIG_IGN)
(void) signal(SIGINT, SIG_IGN);
if (signal(SIGTERM, onintr) == SIG_IGN)
*--argv = ".";
}
+#ifdef USE_QFA
+ if (tapeposflag) {
+ msg("reading QFA positions from %s\n", gTapeposfile);
+ if ((gTapeposfp = fopen(gTapeposfile, "r")) == NULL)
+ errx(1, "can't open file for reading -- %s",
+ gTapeposfile);
+ /* start reading header info */
+ if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ gTps[strlen(gTps) - 1] = 0; /* delete end of line */
+ if (strcmp(gTps, QFA_MAGIC) != 0)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ gTps[strlen(gTps) - 1] = 0;
+ if (strcmp(gTps, QFA_VERSION) != 0)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ /* read dumpdate */
+ if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ gTps[strlen(gTps) - 1] = 0;
+ /* TODO: check dumpdate from QFA file with current dump file's
+ * dump date */
+ /* if not equal either output warning and continue without QFA
+ * or abort */
+ /* read empty line */
+ if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ gTps[strlen(gTps) - 1] = 0;
+ /* read table header line */
+ if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
+ errx(1, "not requested format of -- %s", gTapeposfile);
+ gTps[strlen(gTps) - 1] = 0;
+ /* end reading header info */
+ /* tape position table starts here */
+ gSeekstart = ftell(gTapeposfp); /* remember for later use */
+}
+#endif /* USE_QFA */
+
switch (command) {
/*
* Compare contents of tape.
*/
case 'C': {
- struct stat stbuf;
+ struct STAT stbuf;
Vprintf(stdout, "Begin compare restore\n");
compare_ignore_not_found = 0;
+ compare_errors = 0;
setup();
printf("filesys = %s\n", filesys);
- if (stat(filesys, &stbuf) < 0)
+ if (STAT(filesys, &stbuf) < 0)
err(1, "cannot stat directory %s", filesys);
if (chdir(filesys) < 0)
err(1, "cannot cd to %s", filesys);
treescan(".", ROOTINO, nodeupdates);
compareleaves();
checkrestore();
+ if (compare_errors) {
+ printf("Some files were modified!\n");
+ exit(2);
+ }
break;
}
* Batch extraction of tape contents.
*/
case 'x':
+#ifdef USE_QFADEBUG
+ tistart = time(NULL);
+#endif
setup();
extractdirs(1);
initsymtable((char *)0);
setdirmodes(0);
if (dflag)
checkrestore();
+#ifdef USE_QFADEBUG
+ tiend = time(NULL);
+ titaken = tiend - tistart;
+ msg("restore took %d:%02d:%02d\n", titaken / 3600,
+ (titaken % 3600) / 60, titaken % 60);
+#endif /* USE_QFADEBUG */
break;
}
exit(0);
static void
usage(void)
{
+#ifdef __linux__
+ const char *ext2ver, *ext2date;
+
+ ext2fs_get_library_version(&ext2ver, &ext2date);
+ (void)fprintf(stderr, "%s %s (using libext2fs %s of %s)\n",
+ __progname, _DUMP_VERSION, ext2ver, ext2date);
+#else
+ (void)fprintf(stderr, "%s %s\n", __progname, _DUMP_VERSION);
+#endif
+
#ifdef KERBEROS
#define kerbflag "k"
#else
#define kerbflag
#endif
- (void)fprintf(stderr,
- "%s %s\n", __progname, _DUMP_VERSION);
+
+#ifdef USE_QFA
+#define qfaflag "[-Q file] "
+#else
+#define qfaflag
+#endif
+
(void)fprintf(stderr,
- "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
- __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno]",
- __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
- __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno]",
- __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]",
- __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]");
+ "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n",
+ __progname, " -C [-c" kerbflag "Mvy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-s fileno]",
+ __progname, " -i [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
+ __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+ __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
+ __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
+ __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
exit(1);
}
case 'b':
case 'D':
case 'f':
+ case 'F':
+ case 'Q':
case 's':
case 'T':
case 'X':
git.wh0rd.org / dump.git / blobdiff