Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix signed/unsigned mismatch reported by Christian Biere in PR#31180 

using his provided patch.
This commit is contained in:
mrg 2005-09-15 09:11:30 +00:00
parent e6f32f6f02
commit 5c0ab9e0af
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/gzip/gzip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gzip.c,v 1.73 2005/08/28 10:17:50 mrg Exp $ */
/* $NetBSD: gzip.c,v 1.74 2005/09/15 09:11:30 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004 Matthew R. Green
@ -32,7 +32,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004 Matthew R. Green\n\
All rights reserved.\n");
__RCSID("$NetBSD: gzip.c,v 1.73 2005/08/28 10:17:50 mrg Exp $");
__RCSID("$NetBSD: gzip.c,v 1.74 2005/09/15 09:11:30 mrg Exp $");
#endif /* not lint */
/*
@ -200,7 +200,7 @@ static ssize_t read_retry(int, void *, size_t);
#else
static off_t cat_fd(unsigned char *, size_t, off_t *, int fd);
static void prepend_gzip(char *, int *, char ***);
static void handle_dir(char *, struct stat *);
static void handle_dir(char *);
static void print_verbage(const char *, const char *, off_t, off_t);
static void print_test(const char *, int);
static void copymodes(const char *, struct stat *);
@ -549,7 +549,7 @@ gz_compress(int in, int out, off_t *gsizep, const char *origname, uint32_t mtime
z.avail_out = BUFLEN - i;
error = deflateInit2(&z, numflag, Z_DEFLATED,
-MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
(-MAX_WBITS), 8, Z_DEFAULT_STRATEGY);
if (error != Z_OK) {
maybe_warnx("deflateInit2 failed");
in_tot = -1;
@ -1489,7 +1489,6 @@ static off_t
cat_fd(unsigned char * prepend, size_t count, off_t *gsizep, int fd)
{
char buf[BUFLEN];
size_t rv;
off_t in_tot;
in_tot = count;
@ -1498,6 +1497,8 @@ cat_fd(unsigned char * prepend, size_t count, off_t *gsizep, int fd)
return -1;
}
for (;;) {
ssize_t rv;
rv = read(fd, buf, sizeof buf);
if (rv == 0)
break;
@ -1683,7 +1684,7 @@ retry:
if (S_ISDIR(sb.st_mode)) {
#ifndef SMALL
if (rflag)
handle_dir(path, &sb);
handle_dir(path);
else
#endif
maybe_warnx("%s is a directory", path);
@ -1730,7 +1731,7 @@ handle_file(char *file, struct stat *sbp)
#ifndef SMALL
/* this is used with -r to recursively descend directories */
static void
handle_dir(char *dir, struct stat *sbp)
handle_dir(char *dir)
{
char *path_argv[2];
FTS *fts;

9
usr.bin/gzip/unbzip2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: unbzip2.c,v 1.7 2005/06/02 01:51:58 lukem Exp $ */
/* $NetBSD: unbzip2.c,v 1.8 2005/09/15 09:11:30 mrg Exp $ */
/* This file is #included by gzip.c */
@ -6,7 +6,6 @@ static off_t
unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
{
int ret, end_of_file;
size_t n = 0;
off_t bytes_out = 0;
bz_stream bzs;
static char *inbuf, *outbuf;
@ -36,6 +35,8 @@ unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
while (ret != BZ_STREAM_END) {
if (bzs.avail_in == 0 && !end_of_file) {
ssize_t n;
n = read(in, inbuf, BUFLEN);
if (n < 0)
maybe_err("read");
@ -57,11 +58,13 @@ unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
if (ret == BZ_OK && end_of_file)
maybe_err("read");
if (!tflag) {
ssize_t n;
n = write(out, outbuf, BUFLEN - bzs.avail_out);
if (n < 0)
maybe_err("write");
bytes_out += n;
}
bytes_out += n;
break;
case BZ_DATA_ERROR: