From: Antoine Leca <Antoine.Leca.1@gmail.com>
Date: Mon, 7 Jan 2013 11:07:29 +0000 (+0000)
Subject: gzip: fix warning messages with off_t
X-Git-Tag: v3.2.1~133
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/nslookup.html?a=commitdiff_plain;h=715aecd7e88561e86b5fa7cfa540ae0ec0d68c77;p=minix.git

gzip: fix warning messages with off_t

NetBSD assumes off_t is 64-bit, but on MINIX it is still 32-bit.
So cast the calls to use big_off_t, as stat(2) uses.
Only used in warning messages, was not a real production bug.
---

diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 886ff5b27..00cbd82d2 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -1278,7 +1278,11 @@ file_compress(char *file, char *outfile, size_t outsize)
 	if (osb.st_size != size) {
 		maybe_warnx("output file: %s wrong size (%" PRIdOFF
 				" != %" PRIdOFF "), deleting",
+#ifndef __minix
 				outfile, osb.st_size, size);
+#else
+				outfile, osb.st_size, (big_off_t)size);
+#endif
 		goto bad_outfile;
 	}
 
@@ -1557,7 +1561,11 @@ file_uncompress(char *file, char *outfile, size_t outsize)
 	if (osb.st_size != size) {
 		maybe_warnx("stat gave different size: %" PRIdOFF
 				" != %" PRIdOFF " (leaving original)",
+#ifndef __minix
 				size, osb.st_size);
+#else
+				(big_off_t)size, osb.st_size);
+#endif
 		close(ofd);
 		unlink(outfile);
 		return -1;