X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fmain.c;h=8911d2069475a9366848a7644d17324f7db88d88;hb=cfa03414886424d1dcc4ca41210c26d54204c444;hp=f0f4d7cf12dd459dd9b2595f19f28ad752b0667d;hpb=109e9e1d1a904627eeae4d519a0f694795b2892c;p=dump.git diff --git a/restore/main.c b/restore/main.c index f0f4d7c..8911d20 100644 --- a/restore/main.c +++ b/restore/main.c @@ -41,15 +41,20 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.14 2000/12/04 15:43:17 stelian Exp $"; + "$Id: main.c,v 1.20 2001/04/10 12:46:53 stelian Exp $"; #endif /* not lint */ +#include #include #include #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #include @@ -73,7 +78,7 @@ static const char rcsid[] = #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'; @@ -82,7 +87,7 @@ long volno = 0; long ntrec; char *dumpmap; char *usedinomap; -ino_t maxino; +dump_ino_t maxino; time_t dumptime; time_t dumpdate; FILE *terminal; @@ -104,12 +109,16 @@ int 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 + time_t tistart, tiend, titaken; + tapeposflag = 0; +#endif /* Temp files should *not* be readable. We set permissions later. */ (void) umask(077); @@ -130,12 +139,16 @@ main(int argc, char *argv[]) for (p = tmpdir + strlen(tmpdir) - 1; p >= tmpdir && *p == '/'; p--) ; obsolete(&argc, &argv); + while ((ch = getopt(argc, argv, + "b:CcdD: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 - while ((ch = getopt(argc, argv, optlist)) != -1) + "mMN" +#ifdef USE_QFA + "Q:" +#endif + "Rrs:tT:uvxX:y")) != -1) switch(ch) { case 'b': /* Change default tape blocksize. */ @@ -193,6 +206,12 @@ main(int argc, char *argv[]) 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); @@ -243,6 +262,45 @@ main(int argc, char *argv[]) *--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. @@ -370,6 +428,9 @@ main(int argc, char *argv[]) * Batch extraction of tape contents. */ case 'x': +#ifdef USE_QFA + tistart = time(NULL); +#endif setup(); extractdirs(1); initsymtable((char *)0); @@ -390,6 +451,14 @@ main(int argc, char *argv[]) setdirmodes(0); if (dflag) checkrestore(); +#ifdef USE_QFA + tiend = time(NULL); + titaken = tiend - tistart; +#ifdef USE_QFA + msg("restore took %d:%02d:%02d\n", titaken / 3600, + (titaken % 3600) / 60, titaken % 60); +#endif +#endif break; } exit(0); @@ -400,20 +469,29 @@ main(int argc, char *argv[]) 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); (void)fprintf(stderr, - "usage:\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n\t%s%s\n", + "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] [-s fileno]", __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 ...]"); + __progname, " -r [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]", + __progname, " -R [-c" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-T directory]", + __progname, " -t [-ch" kerbflag "Muvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]", + __progname, " -x [-ch" kerbflag "mMuvy] [-b blocksize] [-f file] [-s fileno] [-X filelist] [file ...]"); exit(1); } @@ -450,6 +528,7 @@ obsolete(int *argcp, char **argvp[]) case 'b': case 'D': case 'f': + case 'Q': case 's': case 'T': case 'X':