* 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.
*
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.39 2002/06/05 13:29:15 stelian Exp $";
+ "$Id: main.c,v 1.50 2005/07/07 09:16:08 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <compatlfs.h>
+#include <sys/types.h>
#include <fcntl.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <signal.h>
#include <string.h>
#else /* __linux__ */
+#ifdef sunos
+#include <signal.h>
+#include <string.h>
+#include <sys/fcntl.h>
+#include <bsdcompat.h>
+#include <sys/mtio.h>
+#else
#include <ufs/ufs/dinode.h>
+#endif
#endif /* __linux__ */
#include <protocols/dumprestore.h>
#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;
+int uflag = 0, lflag = 0, Lflag = 0, oflag = 0;
+int ufs2flag = 0;
char *Afile = NULL;
int dokerberos = 0;
char command = '\0';
long dumpnum = 1;
long volno = 0;
long ntrec;
-char *dumpmap;
-char *usedinomap;
+char *dumpmap = NULL;
+char *usedinomap = NULL;
dump_ino_t maxino;
time_t dumptime;
time_t dumpdate;
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;
long long curtapepos;
#endif /* USE_QFA */
+long smtc_errno;
+
#if defined(__linux__) || defined(sunos)
char *__progname;
#endif
static void usage __P((void));
static void use_stdin __P((const char *));
+#define FORCED_UMASK (077)
+
int
main(int argc, char *argv[])
{
char *p, name[MAXPATHLEN];
FILE *filelist = NULL;
char fname[MAXPATHLEN];
+ mode_t orig_umask;
#ifdef DEBUG_QFA
time_t tistart, tiend, titaken;
#endif
#endif /* USE_QFA */
/* Temp files should *not* be readable. We set permissions later. */
- (void) umask(077);
+ orig_umask = umask(FORCED_UMASK);
filesys[0] = '\0';
#if defined(__linux__) || defined(sunos)
__progname = argv[0];
;
obsolete(&argc, &argv);
while ((ch = getopt(argc, argv,
- "aA:b:CcdD:f:F:hi"
+ "aA:b:CcdD:f:F:hH:i"
#ifdef KERBEROS
"k"
#endif
- "lL:mMN"
+ "lL:mMNo"
#ifdef USE_QFA
"P:Q:"
#endif
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;
case 'N':
Nflag = 1;
break;
+ case 'o':
+ oflag = 1;
+ break;
#ifdef USE_QFA
case 'Q':
gTapeposfile = optarg;
else
setinput(inputdev);
+ wdfd = open(".", O_RDONLY);
+ if (wdfd < 0)
+ err(1, "can't get current directory");
+
if (argc == 0 && !filelist) {
argc = 1;
*--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 */
Vprintf(stdout, "Begin compare restore\n");
compare_ignore_not_found = 0;
compare_errors = 0;
+ Nflag = 1;
setup();
printf("filesys = %s\n", filesys);
if (STAT(filesys, &stbuf) < 0)
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");
}
createfiles();
createlinks();
- setdirmodes(0);
+ 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;
#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);
- if ((gTapeposfd = open(gTapeposfile, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0)
+ (void) umask(orig_umask);
+ if ((gTapeposfd = open(gTapeposfile, O_WRONLY|O_CREAT|O_TRUNC,
+ S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP
+ |S_IROTH|S_IWOTH)) < 0)
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);
- if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ 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");
- if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+ if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
errx(1, "can't write tapeposfile\n");
extractdirs(1);
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 */
fprintf(stderr,
"usage:"
- "\t%s -C [-cd" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
+ "\t%s -C [-cdH" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
"\t%s [-F script] [-L limit] [-s fileno]\n"
- "\t%s -i [-acdh" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s -i [-acdhH" 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 -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 -r [-cdH" 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 -R [-cdH" 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 -t [-cdhH" 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 "lmMuvVy] [-A file] [-b blocksize] [-f file]\n"
+ "\t%s -x [-acdhH" kerbflag "lmMouvVy] [-A file] [-b blocksize] [-f file]\n"
"\t%s [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
__progname, white,
__progname, white,
case 'D':
case 'f':
case 'F':
+ case 'H':
case 'L':
case 'Q':
case 's':
git.wh0rd.org / dump.git / blobdiff