X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftape.c;h=bd1e2f90c0bde55892a4e4365b1ad0dc1c230984;hb=b3f5553293aa24cb18b0de9a6a3ee86053c23ca2;hp=b44f9e04309405f96f0724111d49774eb23f84d5;hpb=cae88c2de27ac671cc2fea240fd5952a508cab3c;p=dump.git

diff --git a/dump/tape.c b/dump/tape.c
index b44f9e0..bd1e2f9 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.81 2004/03/01 10:52:53 stelian Exp $";
+	"$Id: tape.c,v 1.84 2004/05/25 10:39:29 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -116,8 +116,8 @@ int 	eot_code = 1;
 long long tapea_bytes = 0;	/* bytes_written at start of current volume */
 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));
+static	ssize_t dump_atomic_read __P((int, char *, size_t));
+static	ssize_t dump_atomic_write __P((int, const char *, size_t));
 #ifdef WRITEDEBUG
 static	void doslave __P((int, int, int));
 #else
@@ -573,8 +573,6 @@ close_rewind(void)
 {
 	int eot_code = 1;
 	(void)trewind();
-	if (nexttape || Mflag)
-		return;
 	if (eot_script) {
 		msg("Launching %s\n", eot_script);
 		eot_code = system_command(eot_script, tape, tapeno);
@@ -585,6 +583,8 @@ close_rewind(void)
 	}
 	if (eot_code == 0)
 		return;
+	if (nexttape || Mflag)
+		return;
 	if (!nogripe) {
 		msg("Change Volumes: Mount volume #%d\n", tapeno+1);
 		broadcast("CHANGE DUMP VOLUMES!\7\7\n");
@@ -1087,9 +1087,6 @@ doslave(int cmd,
 	int compresult;
 	volatile int do_compress = !first;
 	unsigned long worklen;
-#ifdef HAVE_BZLIB
-	unsigned int worklen2;
-#endif
 #ifdef HAVE_LZO
 	lzo_align_t __LZO_MMODEL *LZO_WorkMem;
 #endif
@@ -1226,7 +1223,7 @@ doslave(int cmd,
 #endif /* HAVE_ZLIB */
 #ifdef HAVE_BZLIB
 			if (zipflag == COMPRESS_BZLIB) {
-				worklen2 = worklen;
+				unsigned int worklen2 = worklen;
 				compresult = BZ2_bzBuffToBuffCompress(
 						       comp_buf->buf,
 						       &worklen2,
@@ -1244,10 +1241,12 @@ doslave(int cmd,
 #endif /* HAVE_BZLIB */
 #ifdef HAVE_LZO
 			if (zipflag == COMPRESS_LZO) {
+				lzo_uint worklen2 = worklen;
 				compresult = lzo1x_1_compress((char *)slp->tblock[0],writesize,
                                                               comp_buf->buf,
-							      (lzo_uintp)&worklen,
+							      &worklen2,
                                                               LZO_WorkMem);
+				worklen = worklen2;
 				if (compresult == LZO_E_OK)
 					compresult = 1;
 				else
@@ -1382,13 +1381,13 @@ doslave(int cmd,
  * loop until the count is satisfied (or error).
  */
 static ssize_t
-dump_atomic_read(int fd, void *buf, size_t count)
+dump_atomic_read(int fd, char *buf, size_t count)
 {
 	int got, need = count;
 
 	do {
 		while ((got = read(fd, buf, need)) > 0 && (need -= got) > 0)
-			(char *)buf += got;
+			buf += got;
 	} while (got == -1 && errno == EINTR);
 	return (got < 0 ? got : (ssize_t)count - need);
 }
@@ -1399,13 +1398,13 @@ dump_atomic_read(int fd, void *buf, size_t count)
  * loop until the count is satisfied (or error).
  */
 static ssize_t
-dump_atomic_write(int fd, const void *buf, size_t count)
+dump_atomic_write(int fd, const char *buf, size_t count)
 {
 	int got, need = count;
 
 	do {
 		while ((got = write(fd, buf, need)) > 0 && (need -= got) > 0)
-			(char *)buf += got;
+			buf += got;
 	} while (got == -1 && errno == EINTR);
 	return (got < 0 ? got : (ssize_t)count - need);
 }