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.
This commit is contained in:
		
							parent
							
								
									017ce5a503
								
							
						
					
					
						commit
						715aecd7e8
					
				@ -1278,7 +1278,11 @@ file_compress(char *file, char *outfile, size_t outsize)
 | 
				
			|||||||
	if (osb.st_size != size) {
 | 
						if (osb.st_size != size) {
 | 
				
			||||||
		maybe_warnx("output file: %s wrong size (%" PRIdOFF
 | 
							maybe_warnx("output file: %s wrong size (%" PRIdOFF
 | 
				
			||||||
				" != %" PRIdOFF "), deleting",
 | 
									" != %" PRIdOFF "), deleting",
 | 
				
			||||||
 | 
					#ifndef __minix
 | 
				
			||||||
				outfile, osb.st_size, size);
 | 
									outfile, osb.st_size, size);
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
									outfile, osb.st_size, (big_off_t)size);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
		goto bad_outfile;
 | 
							goto bad_outfile;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -1557,7 +1561,11 @@ file_uncompress(char *file, char *outfile, size_t outsize)
 | 
				
			|||||||
	if (osb.st_size != size) {
 | 
						if (osb.st_size != size) {
 | 
				
			||||||
		maybe_warnx("stat gave different size: %" PRIdOFF
 | 
							maybe_warnx("stat gave different size: %" PRIdOFF
 | 
				
			||||||
				" != %" PRIdOFF " (leaving original)",
 | 
									" != %" PRIdOFF " (leaving original)",
 | 
				
			||||||
 | 
					#ifndef __minix
 | 
				
			||||||
				size, osb.st_size);
 | 
									size, osb.st_size);
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
									(big_off_t)size, osb.st_size);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
		close(ofd);
 | 
							close(ofd);
 | 
				
			||||||
		unlink(outfile);
 | 
							unlink(outfile);
 | 
				
			||||||
		return -1;
 | 
							return -1;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user