X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fmain.c;h=fecaad537787602966fe59f2460e6e62d87c6df3;hp=0329554dcc3dc36fd68d9277539f0f5eee8f103d;hb=d93c86b39d80fe7740a61b237333ba0e323604ce;hpb=c3f69f06e7c87a8e39d2bc02396fa3ba8db76e84 diff --git a/restore/main.c b/restore/main.c index 0329554..fecaad5 100644 --- a/restore/main.c +++ b/restore/main.c @@ -18,11 +18,7 @@ * 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. * @@ -41,11 +37,12 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.43 2003/03/26 10:58:22 stelian Exp $"; + "$Id: main.c,v 1.52 2008/04/17 15:26:46 stelian Exp $"; #endif /* not lint */ #include #include +#include #include #include #include @@ -63,7 +60,15 @@ static const char rcsid[] = #include #include #else /* __linux__ */ +#ifdef sunos +#include +#include +#include +#include +#include +#else #include +#endif #endif /* __linux__ */ #include @@ -81,9 +86,13 @@ static const char rcsid[] = #include "restore.h" #include "extern.h" +int abortifconnerr = 1; /* set to 1 if lib dumprmt.o should exit on connection errors + otherwise just print a message using msg */ + 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, oflag = 0; +int ufs2flag = 0; char *Afile = NULL; int dokerberos = 0; char command = '\0'; @@ -103,6 +112,8 @@ char filesys[NAMELEN]; static const char *stdin_opt = NULL; char *bot_script = NULL; dump_ino_t volinfo[TP_NINOS]; +int wdfd; +int dirhash_size = 1; #ifdef USE_QFA FILE *gTapeposfp; @@ -116,6 +127,13 @@ unsigned long qfadumpdate; long long curtapepos; #endif /* USE_QFA */ +#ifdef TRANSSELINUX /*GAN6May06 SELinux MLS */ +int transselinuxflag = 0; +char *transselinuxarg = NULL; +#endif + +long smtc_errno; + #if defined(__linux__) || defined(sunos) char *__progname; #endif @@ -144,6 +162,9 @@ main(int argc, char *argv[]) tapeposflag = 0; createtapeposflag = 0; #endif /* USE_QFA */ +#ifdef TRANSSELINUX /*GAN6May06 SELinux MLS */ + char transselinuxopt; +#endif /* Temp files should *not* be readable. We set permissions later. */ orig_umask = umask(FORCED_UMASK); @@ -165,7 +186,11 @@ main(int argc, char *argv[]) ; obsolete(&argc, &argv); while ((ch = getopt(argc, argv, - "aA:b:CcdD:f:F:hi" + "aA:b:CcdD:" +#ifdef TRANSSELINUX /*GAN6May06 SELinux MLS */ + "eE:" +#endif + "f:F:hH:i" #ifdef KERBEROS "k" #endif @@ -198,6 +223,17 @@ main(int argc, char *argv[]) strncpy(filesys, optarg, NAMELEN); filesys[NAMELEN - 1] = '\0'; break; +#ifdef TRANSSELINUX /*GAN6May06 SELinux MLS */ + case 'e': + transselinuxflag = 1; + transselinuxopt = ch; + break; + case 'E': + transselinuxflag = 1; + transselinuxarg = optarg; + transselinuxopt = ch; + break; +#endif case 'T': tmpdir = optarg; break; @@ -215,6 +251,13 @@ main(int argc, char *argv[]) case 'h': hflag = 0; break; + case 'H': + dirhash_size = strtol(optarg, &p, 10); + if (*p) + errx(1, "illegal hash size -- %s", optarg); + if (dirhash_size < 1) + errx(1, "hash size must be greater than 0"); + break; #ifdef KERBEROS case 'k': dokerberos = 1; @@ -320,6 +363,11 @@ main(int argc, char *argv[]) if (Afile && command != 'i' && command != 'x' && command != 't') errx(1, "A option is not valid for %c command", command); +#ifdef TRANSSELINUX /*GAN6May06 SELinux MLS */ + if (transselinuxflag && !strchr("CirRx", command)) + errx(1, "%c option is not valid for %c command", transselinuxopt, command); +#endif + if (signal(SIGINT, onintr) == SIG_IGN) (void) signal(SIGINT, SIG_IGN); if (signal(SIGTERM, onintr) == SIG_IGN) @@ -345,6 +393,10 @@ main(int argc, char *argv[]) else setinput(inputdev); + wdfd = open(".", O_RDONLY); + if (wdfd < 0) + err(1, "can't get current directory"); + if (argc == 0 && !filelist) { argc = 1; *--argv = "."; @@ -383,6 +435,18 @@ main(int argc, char *argv[]) /* end reading header info */ /* tape position table starts here */ gSeekstart = ftell(gTapeposfp); /* remember for later use */ +#ifdef sunos + if (GetSCSIIDFromPath(inputdev, &scsiid)) { + errx(1, "can't get SCSI-ID for %s\n", inputdev); + } + if (scsiid < 0) { + errx(1, "can't get SCSI-ID for %s\n", inputdev); + } + sprintf(smtcpath, "/dev/rsmtc%ld,0", scsiid); + if ((fdsmtc = open(smtcpath, O_RDWR)) == -1) { + errx(1, "can't open smtc device: %s, %d\n", smtcpath, errno); + } +#endif } #endif /* USE_QFA */ @@ -396,6 +460,8 @@ main(int argc, char *argv[]) Vprintf(stdout, "Begin compare restore\n"); compare_ignore_not_found = 0; compare_errors = 0; + Nflag = 1; + aflag = 1; setup(); printf("filesys = %s\n", filesys); if (STAT(filesys, &stbuf) < 0) @@ -404,12 +470,13 @@ main(int argc, char *argv[]) err(1, "cannot cd to %s", filesys); compare_ignore_not_found = dumptime > 0; initsymtable((char *)0); - extractdirs(0); + extractdirs(1); treescan(".", ROOTINO, nodeupdates); compareleaves(); + comparedirmodes(); checkrestore(); if (compare_errors) { - printf("Some files were modified!\n"); + printf("Some files were modified! %d compare errors\n", compare_errors); exit(2); } break; @@ -539,6 +606,11 @@ main(int argc, char *argv[]) setdirmodes(oflag ? FORCE : 0); if (dflag) checkrestore(); +#ifdef sunos + if (fdsmtc != -1) { + close(fdsmtc); + } +#endif /* sunos */ #ifdef DEBUG_QFA tiend = time(NULL); titaken = tiend - tistart; @@ -551,6 +623,18 @@ main(int argc, char *argv[]) #ifdef DEBUG_QFA tistart = time(NULL); #endif +#ifdef sunos + if (GetSCSIIDFromPath(inputdev, &scsiid)) { + errx(1, "can't get SCSI-ID for %s\n", inputdev); + } + if (scsiid < 0) { + errx(1, "can't get SCSI-ID for %s\n", inputdev); + } + sprintf(smtcpath, "/dev/rsmtc%ld,0", scsiid); + if ((fdsmtc = open(smtcpath, O_RDWR)) == -1) { + errx(1, "can't open smtc device: %s, %d\n", smtcpath, errno); + } +#endif /* sunos */ setup(); msg("writing QFA positions to %s\n", gTapeposfile); (void) umask(orig_umask); @@ -560,7 +644,7 @@ main(int argc, char *argv[]) errx(1, "can't create tapeposfile\n"); (void) umask(FORCED_UMASK); /* print QFA-file header */ - sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION,(unsigned long)spcl.c_date); + sprintf(gTps, "%s\n%s\n%ld\n\n", QFA_MAGIC, QFA_VERSION, (unsigned long)spcl.c_date); if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps)) errx(1, "can't write tapeposfile\n"); sprintf(gTps, "ino\ttapeno\ttapepos\n"); @@ -582,14 +666,19 @@ main(int argc, char *argv[]) treescan(name, ino, addfile); } createfiles(); +#ifdef sunos + if (fdsmtc != -1) { + close(fdsmtc); + } +#endif /* sunos */ #ifdef DEBUG_QFA tiend = time(NULL); titaken = tiend - tistart; - msg("writing QFA positions took %d:%02d:%02d\n", titaken / 3600, + msg("writing QFA positions took %d:%02d:%02d\n", titaken / 3600, (titaken % 3600) / 60, titaken % 60); #endif /* DEBUG_QFA */ break; -#endif /* USE_QFA */ +#endif /* USE_QFA */ } exit(0); /* NOTREACHED */ @@ -625,24 +714,31 @@ usage(void) #define qfaflag #endif +#ifdef TRANSSELINUX /*GAN6May06 SELinux MLS */ +# define tseflag "e" +# define tsEflag "[-E mls] " +#else +# define tseflag +# define tsEflag +#endif 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" + "\t%s -C [-cd" tseflag "H" kerbflag "lMvVy] [-b blocksize] [-D filesystem] " tsEflag"\n" + "\t%s [-f file] [-F script] [-L limit] [-s fileno]\n" + "\t%s -i [-acd" tseflag "hH" kerbflag "lmMouvVy] [-A file] [-b blocksize] " tsEflag"\n" + "\t%s [-f file] [-F script] " qfaflag "[-s fileno]\n" #ifdef USE_QFA - "\t%s -P file [-acdh" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n" + "\t%s -P file [-acdhH" 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", + "\t%s -r [-cd" tseflag "H" kerbflag "lMuvVy] [-b blocksize] " tsEflag"\n" + "\t%s [-f file] [-F script] [-s fileno] [-T directory]\n" + "\t%s -R [-cd" tseflag "H" kerbflag "lMuvVy] [-b blocksize] " tsEflag"\n" + "\t%s [-f file] [-F script] [-s fileno] [-T directory]\n" + "\t%s -t [-cdhH" kerbflag "lMuvVy] [-A file] [-b blocksize]\n" + "\t%s [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n" + "\t%s -x [-acd" tseflag "hH" kerbflag "lmMouvVy] [-A file] [-b blocksize] " tsEflag"\n" + "\t%s [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n", __progname, white, __progname, white, #ifdef USE_QFA @@ -690,6 +786,7 @@ obsolete(int *argcp, char **argvp[]) case 'D': case 'f': case 'F': + case 'H': case 'L': case 'Q': case 's':