X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftape.c;h=08c6f7948633fb8d2d9f4ba8648a870ee599e30a;hp=54b387eac62559d092a687ab18eca75d7a36a479;hb=3211c85bf71bbbe784de3f4fa01a8c0f96a060d6;hpb=88ac410d747e12ed2c1edd1ed0fdab994de71cf9

diff --git a/dump/tape.c b/dump/tape.c
index 54b387e..08c6f79 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.68 2002/05/21 15:48:46 stelian Exp $";
+	"$Id: tape.c,v 1.71 2002/07/29 12:00:33 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -116,7 +116,11 @@ static int magtapeout;		/* output is really a tape */
 
 static	ssize_t dump_atomic_read __P((int, void *, size_t));
 static	ssize_t dump_atomic_write __P((int, const void *, size_t));
+#ifdef WRITEDEBUG
 static	void doslave __P((int, int, int));
+#else
+static	void doslave __P((int, int));
+#endif
 static	void enslave __P((void));
 static	void flushtape __P((void));
 static	void killall __P((void));
@@ -311,7 +315,7 @@ tperror(int errnum)
 }
 
 static void
-sigpipe(int signo)
+sigpipe(UNUSED(int signo))
 {
 
 	quit("Broken pipe\n");
@@ -479,7 +483,7 @@ flushtape(void)
 	blocksthisvol += ntrec;
 	if (!pipeout && !unlimited) {
 		if (blocksperfile) {
-			if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= blocksperfile * 1024
+			if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= (((long long)blocksperfile) * 1024)
 					: blocksthisvol >= blocksperfile ) {
 				close_rewind();
 				startnewtape(0);
@@ -542,7 +546,7 @@ trewind(void)
 #ifdef RDUMP
 		if (host) {
 			rmtclose();
-			while (rmtopen(tape, "O_RDONLY") < 0)
+			while (rmtopen(tape, O_RDONLY) < 0)
 				sleep(10);
 			rmtclose();
 		}
@@ -864,7 +868,7 @@ restore_check_point:
 			msg("Dumping volume %d on %s\n", tapeno, tape);
 		}
 #ifdef RDUMP
-		while ((tapefd = (host ? rmtopen(tape, "O_WRONLY|O_CREAT|O_TRUNC") : pipeout ? 
+		while ((tapefd = (host ? rmtopen(tape, O_WRONLY|O_CREAT|O_TRUNC) : pipeout ? 
 			fileno(stdout) : 
 			OPEN(tape, O_WRONLY|O_CREAT|O_TRUNC, 0666))) < 0)
 #else
@@ -914,13 +918,13 @@ restore_check_point:
 		if (tapeno > 1)
 			msg("Volume %d begins with blocks from inode %d\n",
 				tapeno, slp->inode);
-		if (tapeno < TP_NINOS)
+		if (tapeno < (int)TP_NINOS)
 			volinfo[tapeno] = slp->inode;
 	}
 }
 
 void
-dumpabort(int signo)
+dumpabort(UNUSED(int signo))
 {
 
 	if (master != 0 && master != getpid())
@@ -950,7 +954,7 @@ Exit(int status)
  * proceed - handler for SIGUSR2, used to synchronize IO between the slaves.
  */
 static void
-proceed(int signo)
+proceed(UNUSED(int signo))
 {
 	if (ready)
 		siglongjmp(jmpbuf, 1);
@@ -1011,7 +1015,11 @@ enslave(void)
 			    != sizeof i)
 				quit("master/slave protocol botched 3\n");
 #endif
-			doslave(cmd[0], i, (slaves[i].pid == slp->pid));
+			doslave(cmd[0], 
+#ifdef WRITEDEBUG
+				i, 
+#endif
+				(slaves[i].pid == slp->pid));
 			Exit(X_FINOK);
 		}
 		else
@@ -1057,15 +1065,20 @@ killall(void)
  * slaves.
  */
 static void
-doslave(int cmd, int slave_number, int first)
+doslave(int cmd, 
+#ifdef WRITEDEBUG
+	int slave_number, 
+#endif
+	int first)
 {
 	int nread;
-	int nextslave, size, eot_count, bufsize;
-	volatile int wrote = 0;
-	char *buffer;
+	int nextslave;
+	volatile int wrote = 0, size, eot_count, bufsize;
+	char * volatile buffer;
 #if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
-	struct tapebuf *comp_buf = NULL;
-	int compresult, do_compress = !first;
+	struct tapebuf * volatile comp_buf = NULL;
+	int compresult;
+	volatile int do_compress = !first;
 	unsigned long worklen;
 #ifdef HAVE_BZLIB
 	unsigned int worklen2;
@@ -1200,7 +1213,7 @@ doslave(int cmd, int slave_number, int first)
 			}
 
 #endif /* HAVE_BZLIB */
-			if (compresult && worklen <= (writesize - 16)) {
+			if (compresult && worklen <= ((unsigned long)writesize - 16)) {
 				/* write the compressed buffer */
 				comp_buf->length = worklen;
 				comp_buf->compressed = 1;
@@ -1323,7 +1336,7 @@ dump_atomic_read(int fd, void *buf, size_t count)
 		while ((got = read(fd, buf, need)) > 0 && (need -= got) > 0)
 			(char *)buf += got;
 	} while (got == -1 && errno == EINTR);
-	return (got < 0 ? got : count - need);
+	return (got < 0 ? got : (ssize_t)count - need);
 }
 
 /*
@@ -1340,7 +1353,7 @@ dump_atomic_write(int fd, const void *buf, size_t count)
 		while ((got = write(fd, buf, need)) > 0 && (need -= got) > 0)
 			(char *)buf += got;
 	} while (got == -1 && errno == EINTR);
-	return (got < 0 ? got : count - need);
+	return (got < 0 ? got : (ssize_t)count - need);
 }
 
 
@@ -1393,7 +1406,7 @@ MkTapeString(struct s_spcl *spclptr, long long curtapepos) {
 		 tapeno, 
 		 curtapepos);
 	gTps[sizeof(gTps) - 1] = '\0';
-	if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps)) {
+	if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps)) {
       		warn("error writing tapepos file.\n");
 	}
 }