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

Pass a filename, rather than a file descriptor, to libarchive.

Browse Source 
Submitted by:	Alex Kozlov <spam@rm-rf.kiev.ua>
MFC after:	1 week
This commit is contained in:
des 2012-05-29 09:11:19 +00:00
parent 7d6eef0e81
commit fdd7d585a8
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -865,19 +865,14 @@ unzip(const char *fn)
{
struct archive *a;
struct archive_entry *e;
int fd, ret;
int ret;
uintmax_t total_size, file_count, error_count;
if (strcmp(fn, "-") == 0)
fd = STDIN_FILENO;
else if ((fd = open(fn, O_RDONLY)) < 0)
error("%s", fn);
if ((a = archive_read_new()) == NULL)
error("archive_read_new failed");
ac(archive_read_support_format_zip(a));
ac(archive_read_open_fd(a, fd, 8192));
ac(archive_read_open_filename(a, fn, 8192));
if (!zipinfo_mode) {
if (!p_opt && !q_opt)
@ -933,9 +928,6 @@ unzip(const char *fn)
ac(archive_read_close(a));
(void)archive_read_finish(a);
if (fd != STDIN_FILENO && close(fd) != 0)
error("%s", fn);
if (t_opt) {
if (error_count > 0) {
errorx("%d checksum error(s) found.", error_count);
@ -1061,6 +1053,9 @@ main(int argc, char *argv[])
usage();
zipfile = argv[nopts++];
if (strcmp(zipfile, "-") == 0)
zipfile = NULL; /* STDIN */
while (nopts < argc && *argv[nopts] != '-')
add_pattern(&include, argv[nopts++]);