X-Git-Url: https://git.gag.com/?p=debian%2Fdump;a=blobdiff_plain;f=dump%2Fmain.c;h=ae3e3caa6ee64f3c12ebdcc47390db0a5bb628b4;hp=b3bbf7d4a45058bb38a815112b8430f6fb2fe3f1;hb=9a0f7d31d8848683face512dcabfc03949c78fb2;hpb=3c2c604b3b2a51fa1717a2212b5fed9145b51cd1

diff --git a/dump/main.c b/dump/main.c
index b3bbf7d..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.95 2009/06/18 09:35:14 stelian Exp $";
+	"$Id: main.c,v 1.97 2010/04/28 09:29:50 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -123,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 */
@@ -543,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",
@@ -869,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;
@@ -921,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);
 	}