X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Fmain.c;h=ae3e3caa6ee64f3c12ebdcc47390db0a5bb628b4;hb=f0ab1ab5331f9ed387ade32d96b24285b0cd5282;hp=cecaaae79be572f16462083c3fa62479850f876b;hpb=28ba5caee0ed25d3b38da769967173e5710bc10c;p=dump.git

diff --git a/dump/main.c b/dump/main.c
index cecaaae..ae3e3ca 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.92 2004/04/21 08:55:51 stelian Exp $";
+	"$Id: main.c,v 1.97 2010/04/28 09:29:50 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -58,6 +58,7 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <time.h>
 #ifdef __linux__
+#include <linux/types.h>
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
@@ -122,7 +123,7 @@ int	fifoout;	/* true => output to fifo */
 dump_ino_t curino;	/* current inumber; used globally */
 int	newtape;	/* new tape flag */
 int	density;	/* density in 0.1" units */
-long	tapesize;	/* estimated tape size, blocks */
+long long tapesize;	/* estimated tape size, blocks */
 long	tsize;		/* tape size in 0.1" units */
 long	asize;		/* number of 0.1" units written on current tape */
 int	etapes;		/* estimated number of tapes */
@@ -238,6 +239,8 @@ main(int argc, char *argv[])
 		quit("TP_BSIZE must be a multiple of DEV_BSIZE\n");
 	memset(&lastlevel, 0, NUM_STR_SIZE);
 	memset(&level, 0, NUM_STR_SIZE);
+	/* Default dump level is zero. */
+	level[0] = '0';
 
 	if (argc < 2)
 		usage();
@@ -540,7 +543,7 @@ main(int argc, char *argv[])
 	}
 
 	(void)setuid(getuid()); /* rmthost() is the only reason to be setuid */
-	if (Apath && (Afile = open(Apath, O_WRONLY|O_CREAT|O_TRUNC,
+	if (Apath && (Afile = OPEN(Apath, O_WRONLY|O_CREAT|O_TRUNC,
 				   S_IRUSR | S_IWUSR | S_IRGRP |
 				   S_IWGRP | S_IROTH | S_IWOTH)) < 0) {
 		msg("Cannot open %s for writing: %s\n",
@@ -583,13 +586,9 @@ main(int argc, char *argv[])
 			diskparam[i] = '\0';
 
 	disk = get_device_name(diskparam);
-	if (!disk) {		/* null means the disk is some form
-				   of LABEL= or UID= but it was not
-				   found */
-		msg("Cannot find a disk having %s\n", diskparam);
-		msg("The ENTIRE dump is aborted.\n");
-		exit(X_STARTUP);
-	}
+	if (!disk)
+		disk = strdup(diskparam);
+
 	/*
 	 *	disk can be either the full special file name,
 	 *	the suffix of the special file name,
@@ -870,12 +869,12 @@ main(int argc, char *argv[])
 
 	if (pipeout || unlimited) {
 		tapesize += 1 + ntrec;	/* 1 map header + trailer blocks */
-		msg("estimated %ld blocks.\n", tapesize);
+		msg("estimated %lld blocks.\n", tapesize);
 	} else {
 		double fetapes;
 
 		if (blocksperfiles) {
-			long tapesize_left;
+			long long tapesize_left;
 
 			tapesize_left = tapesize;
 			fetapes = 0;
@@ -922,7 +921,7 @@ main(int argc, char *argv[])
 		tapesize += (etapes - 1) *
 			(howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
 		tapesize += etapes + ntrec;	/* headers + trailer blks */
-		msg("estimated %ld blocks on %3.2f tape(s).\n",
+		msg("estimated %lld blocks on %3.2f tape(s).\n",
 		    tapesize, fetapes);
 	}