* 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
*/
/*
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.33 2002/01/11 08:54:14 stelian Exp $";
+ "$Id: main.c,v 1.40 2002/06/08 07:10:37 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <compatlfs.h>
+#include <fcntl.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
#include "restore.h"
#include "extern.h"
-int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
+int aflag = 0, bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
int hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, Vflag = 0, zflag = 0;
-int uflag = 0, lflag = 0, Lflag = 0;
+int uflag = 0, lflag = 0, Lflag = 0, oflag = 0;
+char *Afile = NULL;
int dokerberos = 0;
char command = '\0';
long dumpnum = 1;
char filesys[NAMELEN];
static const char *stdin_opt = NULL;
char *bot_script = NULL;
+dump_ino_t volinfo[TP_NINOS];
#ifdef USE_QFA
FILE *gTapeposfp;
char gTps[255];
long gSeekstart;
int tapeposflag;
+int gTapeposfd;
+int createtapeposflag;
+unsigned long qfadumpdate;
+long long curtapepos;
#endif /* USE_QFA */
-#ifdef __linux__
+#if defined(__linux__) || defined(sunos)
char *__progname;
#endif
char *p, name[MAXPATHLEN];
FILE *filelist = NULL;
char fname[MAXPATHLEN];
-#ifdef USE_QFA
- tapeposflag = 0;
-#endif
-#ifdef USE_QFADEBUG
+#ifdef DEBUG_QFA
time_t tistart, tiend, titaken;
#endif
+#ifdef USE_QFA
+ tapeposflag = 0;
+ createtapeposflag = 0;
+#endif /* USE_QFA */
/* Temp files should *not* be readable. We set permissions later. */
(void) umask(077);
filesys[0] = '\0';
-#ifdef __linux__
+#if defined(__linux__) || defined(sunos)
__progname = argv[0];
#endif
;
obsolete(&argc, &argv);
while ((ch = getopt(argc, argv,
- "b:CcdD:f:F:hi"
+ "aA:b:CcdD:f:F:hi"
#ifdef KERBEROS
"k"
#endif
- "lL:mMN"
+ "lL:mMNo"
#ifdef USE_QFA
- "Q:"
+ "P:Q:"
#endif
"Rrs:tT:uvVxX:y")) != -1)
switch(ch) {
+ case 'a':
+ aflag = 1;
+ break;
+ case 'A':
+ Afile = optarg;
+ aflag = 1;
+ break;
case 'b':
/* Change default tape blocksize. */
bflag = 1;
#endif
case 'C':
case 'i':
+#ifdef USE_QFA
+ case 'P':
+#endif
case 'R':
case 'r':
case 't':
"%c and %c options are mutually exclusive",
ch, command);
command = ch;
+#ifdef USE_QFA
+ if (ch == 'P') {
+ gTapeposfile = optarg;
+ createtapeposflag = 1;
+ }
+#endif
+
break;
case 'l':
lflag = 1;
case 'N':
Nflag = 1;
break;
+ case 'o':
+ oflag = 1;
+ break;
#ifdef USE_QFA
case 'Q':
gTapeposfile = optarg;
tapeposflag = 1;
+ aflag = 1;
break;
#endif
case 's':
#ifdef USE_QFA
if (!mflag && tapeposflag)
errx(1, "m and Q options are mutually exclusive");
+
+ if (tapeposflag && command != 'i' && command != 'x' && command != 't')
+ errx(1, "Q option is not valid for %c command", command);
#endif
+
+ if (Afile && command != 'i' && command != 'x' && command != 't')
+ errx(1, "A option is not valid for %c command", command);
if (signal(SIGINT, onintr) == SIG_IGN)
(void) signal(SIGINT, SIG_IGN);
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 */
+ qfadumpdate = atol(gTps);
/* read empty line */
if (fgets(gTps, sizeof(gTps), gTapeposfp) == NULL)
errx(1, "not requested format of -- %s", gTapeposfile);
/* end reading header info */
/* tape position table starts here */
gSeekstart = ftell(gTapeposfp); /* remember for later use */
-}
+ }
#endif /* USE_QFA */
switch (command) {
* Incremental restoration of a file system.
*/
case 'r':
+ aflag = 1; /* in -r or -R mode, -a is default */
setup();
if (dumptime > 0) {
/*
* Resume an incremental file system restoration.
*/
case 'R':
+ aflag = 1; /* in -r or -R mode, -a is default */
initsymtable(symtbl);
skipmaps();
skipdirs();
setup();
extractdirs(0);
initsymtable((char *)0);
+ printvolinfo();
for (;;) {
NEXTFILE(p);
if (!p)
* Batch extraction of tape contents.
*/
case 'x':
-#ifdef USE_QFADEBUG
+#ifdef DEBUG_QFA
tistart = time(NULL);
#endif
setup();
}
createfiles();
createlinks();
- setdirmodes(0);
+ setdirmodes(oflag ? FORCE : 0);
if (dflag)
checkrestore();
-#ifdef USE_QFADEBUG
+#ifdef DEBUG_QFA
tiend = time(NULL);
titaken = tiend - tistart;
msg("restore took %d:%02d:%02d\n", titaken / 3600,
(titaken % 3600) / 60, titaken % 60);
-#endif /* USE_QFADEBUG */
+#endif /* DEBUG_QFA */
break;
+#ifdef USE_QFA
+ case 'P':
+#ifdef DEBUG_QFA
+ tistart = time(NULL);
+#endif
+ setup();
+ msg("writing QFA positions to %s\n", gTapeposfile);
+ if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0)
+ errx(1, "can't create 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))
+ errx(1, "can't write tapeposfile\n");
+ sprintf(gTps, "ino\ttapeno\ttapepos\n");
+ if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ errx(1, "can't write tapeposfile\n");
+
+ extractdirs(1);
+ initsymtable((char *)0);
+ for (;;) {
+ NEXTFILE(p);
+ if (!p)
+ break;
+ canon(p, name, sizeof(name));
+ ino = dirlookup(name);
+ if (ino == 0)
+ continue;
+ if (mflag)
+ pathcheck(name);
+ treescan(name, ino, addfile);
+ }
+ createfiles();
+#ifdef DEBUG_QFA
+ tiend = time(NULL);
+ titaken = tiend - tistart;
+ msg("writing QFA positions took %d:%02d:%02d\n", titaken / 3600,
+ (titaken % 3600) / 60, titaken % 60);
+#endif /* DEBUG_QFA */
+ break;
+#endif /* USE_QFA */
}
exit(0);
/* NOTREACHED */
static void
usage(void)
{
-#ifdef __linux__
+ char white[MAXPATHLEN];
const char *ext2ver, *ext2date;
+ memset(white, ' ', MAXPATHLEN);
+ white[MIN(strlen(__progname), MAXPATHLEN - 1)] = '\0';
+
+#ifdef __linux__
ext2fs_get_library_version(&ext2ver, &ext2date);
(void)fprintf(stderr, "%s %s (using libext2fs %s of %s)\n",
__progname, _DUMP_VERSION, ext2ver, ext2date);
#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\t%s%s\n",
- __progname, " -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file] [-F script] [-L limit] [-s fileno]",
- __progname, " -i [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno]",
- __progname, " -r [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
- __progname, " -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] [-s fileno] [-T directory]",
- __progname, " -t [-ch" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]",
- __progname, " -x [-ch" kerbflag "lmMuvVy] [-b blocksize] [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]");
+ fprintf(stderr,
+ "usage:"
+ "\t%s -C [-cd" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
+ "\t%s [-F script] [-L limit] [-s fileno]\n"
+ "\t%s -i [-acdh" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s [-F script] " qfaflag "[-s fileno]\n"
+#ifdef USE_QFA
+ "\t%s -P file [-acdh" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+ "\t%s [-f file] [-F script] [-s fileno] [-X filelist] [file ...]\n"
+#endif
+ "\t%s -r [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+ "\t%s [-s fileno] [-T directory]\n"
+ "\t%s -R [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+ "\t%s [-s fileno] [-T directory]\n"
+ "\t%s -t [-cdh" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n"
+ "\t%s -x [-acdh" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
+ __progname, white,
+ __progname, white,
+#ifdef USE_QFA
+ __progname, white,
+#endif
+ __progname, white,
+ __progname, white,
+ __progname, white,
+ __progname, white);
exit(1);
}
for (flags = 0; *ap; ++ap) {
switch (*ap) {
+ case 'A':
case 'b':
case 'D':
case 'f':