d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test output when gzip is run with -tlv

Browse Source 
When run with test, verbose and list we need to parse the file otherwise
the test output is "NOT OK" even for the file is valid.

Reviewed by:	kevans, allanjude, imp
Sponsored by:	Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D34046
This commit is contained in:
Tom Jones 2022-01-27 17:17:13 +00:00
parent f0ec0fda01
commit 21c966a6b9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1655,10 +1655,13 @@ file_uncompress(char *file, char *outfile, size_t outsize)
case FT_XZ:
if (lflag) {
size = unxz_len(fd);
print_list_out(in_size, size, file);
return -1;
}
size = unxz(fd, zfd, NULL, 0, NULL);
if (!tflag) {
print_list_out(in_size, size, file);
close(fd);
return -1;
}
} else
size = unxz(fd, zfd, NULL, 0, NULL);
break;
#endif
@ -1683,8 +1686,10 @@ file_uncompress(char *file, char *outfile, size_t outsize)
default:
if (lflag) {
print_list(fd, in_size, outfile, isb.st_mtime);
close(fd);
return -1; /* XXX */
if (!tflag) {
close(fd);
return -1; /* XXX */
}
}
size = gz_uncompress(fd, zfd, NULL, 0, NULL, file);