X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=0890d409105e919d5115acce22642bbbf2313351;hb=cbc942390a1f6fc8ed82ddb096132e49b647d97e;hp=277e422cc97737a6902ce00c15fe61dc08981221;hpb=0d7af9c5f2cc7d4a97e934692ea8665e09fd5500;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index 277e422..0890d40 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.18 2000/03/02 11:34:51 stelian Exp $";
+	"$Id: main.c,v 1.22 2000/03/08 10:51:29 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -288,7 +288,7 @@ main(int argc, char *argv[])
 		exit(X_STARTUP);
 	}
 	disk = *argv++;
-	if (strlen(disk) > MAXPATHLEN) {
+	if (strlen(disk) >= MAXPATHLEN) {
 		(void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
 		exit(X_STARTUP);
 	}
@@ -393,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);
@@ -511,7 +511,7 @@ main(int argc, char *argv[])
 	usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
 	dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char));
 	dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
-	tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
+	tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
 
 	nonodump = spcl.c_level < honorlevel;
 
@@ -537,12 +537,12 @@ main(int argc, char *argv[])
 	}
 
 	if (sizest) {
-		printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+		printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
 		exit(X_FINOK);
 	} /* stop here for size estimate */
 
 	if (pipeout || unlimited) {
-		tapesize += 10;	/* 10 trailer blocks */
+		tapesize += 11;	/* 10 trailer blocks + 1 map header */
 		msg("estimated %ld tape blocks.\n", tapesize);
 	} else {
 		double fetapes;
@@ -664,10 +664,13 @@ main(int argc, char *argv[])
 	tnow = trewind();
 
 	if (pipeout)
-		msg("DUMP: %ld tape blocks\n", spcl.c_tapea);
+		msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea,
+			((double)spcl.c_tapea * TP_BSIZE / 1048576));
 	else
-		msg("DUMP: %ld tape blocks on %d volumes(s)\n",
-		    spcl.c_tapea, spcl.c_volume);
+		msg("%ld tape blocks (%.2fMB) on %d volume(s)\n",
+		    spcl.c_tapea, 
+		    ((double)spcl.c_tapea * TP_BSIZE / 1048576),
+		    spcl.c_volume);
 
 	/* report dump performance, avoid division through zero */
 	if (tend_writing - tstart_writing == 0)
@@ -679,15 +682,15 @@ main(int argc, char *argv[])
 
 	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);
 
 	broadcast("DUMP IS DONE!\7\7\n");
 	msg("DUMP IS DONE\n");