X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fmain.c;h=98674e4c8fc4c171cbef59a6489e3b436c4160f9;hb=83a6b4df0b7b7aecc0d3940549d0d480adff35a6;hp=eef486af21c879f57c02cb2ceddd82d600b602fd;hpb=fe0e02857a1ff7db4bf8cb28780de7ecf2f24234;p=dump.git

diff --git a/restore/main.c b/restore/main.c
index eef486a..98674e4 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,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.38 2002/02/04 11:18:46 stelian Exp $";
+	"$Id: main.c,v 1.44 2003/03/30 15:40:38 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -83,15 +79,15 @@ static const char rcsid[] =
 
 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;
 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;
@@ -124,6 +120,8 @@ static void obsolete __P((int *, char **[]));
 static void usage __P((void));
 static void use_stdin __P((const char *));
 
+#define FORCED_UMASK (077)
+
 int
 main(int argc, char *argv[])
 {
@@ -134,6 +132,7 @@ 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
@@ -143,7 +142,7 @@ main(int argc, char *argv[])
 #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];
@@ -166,7 +165,7 @@ main(int argc, char *argv[])
 #ifdef KERBEROS
 		"k"
 #endif
-		"lL:mMN"
+		"lL:mMNo"
 #ifdef USE_QFA
 		"P:Q:"
 #endif
@@ -258,6 +257,9 @@ main(int argc, char *argv[])
 		case 'N':
 			Nflag = 1;
 			break;
+		case 'o':
+			oflag = 1;
+			break;
 #ifdef USE_QFA
 		case 'Q':
 			gTapeposfile = optarg;
@@ -530,7 +532,7 @@ main(int argc, char *argv[])
 		}
 		createfiles();
 		createlinks();
-		setdirmodes(0);
+		setdirmodes(oflag ? FORCE : 0);
 		if (dflag)
 			checkrestore();
 #ifdef DEBUG_QFA
@@ -547,14 +549,18 @@ main(int argc, char *argv[])
 #endif
 		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))
+		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);
@@ -617,21 +623,21 @@ usage(void)
 
 	fprintf(stderr,
 		"usage:"
-		"\t%s -C [-c" kerbflag "lMvVy] [-b blocksize] [-D filesystem] [-f file]\n"
+		"\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 [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f file]\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 [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize]\n"
+		"\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 [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+		"\t%s -r [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
 		"\t%s    [-s fileno] [-T directory]\n"
-		"\t%s -R [-c" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
+		"\t%s -R [-cd" kerbflag "lMuvVy] [-b blocksize] [-f file] [-F script]\n"
 		"\t%s    [-s fileno] [-T directory]\n"
-		"\t%s -t [-ch" kerbflag "lMuvVy] [-A file] [-b blocksize] [-f file]\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 [-ach" kerbflag "lmMuvVy] [-A file] [-b blocksize] [-f 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,