X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=cd844ae52cf97db163fe3b0463772a0522ca2f7a;hb=960c1264ff3c6074d6ec91439eff9afd4640e56c;hp=806de5efe278b990f2844d9f994f9b39d02b7cb1;hpb=20c345aa6780d2b021ce6cdbd812e4f021273640;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index 806de5e..cd844ae 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.15 2000/02/04 20:22:21 stelian Exp $";
+	"$Id: main.c,v 1.20 2000/03/02 13:52:52 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -121,8 +121,8 @@ main(int argc, char *argv[])
 	ino_t maxino;
 #ifdef	__linux__
 	errcode_t retval;
-	char directory[NAME_MAX];
-	char pathname[NAME_MAX];
+	char directory[MAXPATHLEN];
+	char pathname[MAXPATHLEN];
 #endif
 	time_t tnow;
 	char labelstr[LBLSIZE];
@@ -141,10 +141,10 @@ main(int argc, char *argv[])
 #endif
 
 	tsize = 0;	/* Default later, based on 'c' option for cart tapes */
+	eot_script = NULL;
 	if ((tapeprefix = getenv("TAPE")) == NULL)
 		tapeprefix = _PATH_DEFTAPE;
 	dumpdates = _PATH_DUMPDATES;
-	temp = _PATH_DTMP;
 	strcpy(labelstr, "none");	/* XXX safe strcpy. */
 	if (TP_BSIZE / DEV_BSIZE == 0 || TP_BSIZE % DEV_BSIZE != 0)
 		quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
@@ -155,9 +155,9 @@ main(int argc, char *argv[])
 
 	obsolete(&argc, &argv);
 #ifdef KERBEROS
-#define optstring "0123456789aB:b:cd:e:f:h:kL:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:F:h:kL:Mns:ST:uWw"
 #else
-#define optstring "0123456789aB:b:cd:e:f:h:L:Mns:ST:uWw"
+#define optstring "0123456789aB:b:cd:e:f:F:h:L:Mns:ST:uWw"
 #endif
 	while ((ch = getopt(argc, argv, optstring)) != -1)
 #undef optstring
@@ -210,6 +210,10 @@ main(int argc, char *argv[])
 			tapeprefix = optarg;
 			break;
 
+		case 'F':		/* end of tape script */
+			eot_script = optarg;
+			break;
+
 		case 'h':
 			honorlevel = numarg("honor level", 0L, 10L);
 			break;
@@ -284,6 +288,10 @@ main(int argc, char *argv[])
 		exit(X_STARTUP);
 	}
 	disk = *argv++;
+	if (strlen(disk) >= MAXPATHLEN) {
+		(void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
+		exit(X_STARTUP);
+	}
 	argc--;
 	if (argc >= 1) {
 		(void)fprintf(stderr, "Unknown arguments to dump:");
@@ -385,7 +393,7 @@ main(int argc, char *argv[])
 		if (dt != NULL) {
 			char name[MAXPATHLEN];
 			(void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
-			(void)sprintf(name, "%s (dir %s)",
+			(void)snprintf(name, sizeof(name), "%s (dir %s)",
 				      dt->fs_file, directory);
 			(void)strncpy(spcl.c_filesys, name, NAMELEN);
 			disk = rawname(dt->fs_spec);
@@ -419,10 +427,10 @@ main(int argc, char *argv[])
 	}
 
 	if (Mflag)
-		snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno + 1);
+		snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno + 1);
 	else
-		strncpy(tape, tapeprefix, NAME_MAX);
-	tape[NAME_MAX - 1] = '\0';
+		strncpy(tape, tapeprefix, MAXPATHLEN);
+	tape[MAXPATHLEN - 1] = '\0';
 
 	if (!sizest) {
 
@@ -652,10 +660,13 @@ main(int argc, char *argv[])
 	spcl.c_type = TS_END;
 	for (i = 0; i < ntrec; i++)
 		writeheader(maxino - 1);
+
+	tnow = trewind();
+
 	if (pipeout)
-		msg("DUMP: %ld tape blocks\n", spcl.c_tapea);
+		msg("%ld tape blocks\n", spcl.c_tapea);
 	else
-		msg("DUMP: %ld tape blocks on %d volumes(s)\n",
+		msg("%ld tape blocks on %d volumes(s)\n",
 		    spcl.c_tapea, spcl.c_volume);
 
 	/* report dump performance, avoid division through zero */
@@ -666,20 +677,18 @@ main(int argc, char *argv[])
 		    tend_writing - tstart_writing,
 		    spcl.c_tapea / (tend_writing - tstart_writing));
 
-	tnow = do_stats();
 	putdumptime();
 #ifdef __linux__
-	msg("DUMP: Date of this level %c dump: %s", level,
+	msg("Date of this level %c dump: %s", level,
 		spcl.c_date == 0 ? "the epoch\n" : ctime4(&spcl.c_date));
 #else
-	msg("DUMP: Date of this level %c dump: %s", level,
+	msg("Date of this level %c dump: %s", level,
 		spcl.c_date == 0 ? "the epoch\n" : ctime(&spcl.c_date));
 #endif
-	msg("DUMP: Date this dump completed:  %s", ctime(&tnow));
+	msg("Date this dump completed:  %s", ctime(&tnow));
 
-	msg("DUMP: Average transfer rate: %ld KB/s\n", xferrate / tapeno);
+	msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno);
 
-	trewind();
 	broadcast("DUMP IS DONE!\7\7\n");
 	msg("DUMP IS DONE\n");
 	Exit(X_FINOK);
@@ -809,8 +818,11 @@ obsolete(int *argcp, char **argvp[])
 		case 'B':
 		case 'b':
 		case 'd':
+		case 'e':
 		case 'f':
+		case 'F':
 		case 'h':
+		case 'L':
 		case 's':
 		case 'T':
 			if (*argv == NULL) {