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

When unpacking compressed archive check exit status of the child (gzip or bzip)

Browse Source 
and exit with error code if that status != 0.

PR:		30876
Submitted by:	Simon Gerraty <sig@juniper.net>
This commit is contained in:
Maxim Sobolev 2002-02-07 10:38:16 +00:00
parent e0ee6f5629
commit 12397b2bad
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/usr.bin/tar/buffer.c
View File

@ -1256,6 +1256,21 @@ close_archive ()
if (f_verify)
verify_volume ();
#ifndef __MSDOS__
/*
* Closing the child's pipe before reading EOF guarantees that it
* will be unhappy - SIGPIPE, or exit 1.
* Either way it can screw us, so play nice.
*/
if (childpid && ar_reading)
{
char buf[BUFSIZ];
while ((c = read(archive, buf, sizeof(buf))) > 0)
;
}
#endif
if ((c = rmtclose (archive)) < 0)
msg_perror ("Warning: can't close %s(%d,%d)", ar_files[cur_ar_file], archive, c);
@ -1294,8 +1309,11 @@ close_archive ()
/* Do nothing. */
}
else if (WEXITSTATUS (status))
msg ("child returned status %d",
WEXITSTATUS (status));
{
msg ("child returned status %d",
WEXITSTATUS (status));
exit (EX_BADARCH);
}
}
}
}