diff options
author | Rob Landley <rob@landley.net> | 2005-12-16 21:33:10 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2005-12-16 21:33:10 +0000 |
commit | 1a78103306e149321c6509514ea350c822815f3f (patch) | |
tree | 702ca9b29df658fd8b531346cc69a81892078dc8 | |
parent | ef1f7b5058c100990ec2e20484db39658b7b8343 (diff) | |
download | busybox-w32-1a78103306e149321c6509514ea350c822815f3f.tar.gz busybox-w32-1a78103306e149321c6509514ea350c822815f3f.tar.bz2 busybox-w32-1a78103306e149321c6509514ea350c822815f3f.zip |
Bug 601: When we fork an archiver and feed stuff to it through a pipe, if
we don't close the pipe the child process won't exit, and we'll hang in
waitpid().
-rw-r--r-- | archival/tar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/archival/tar.c b/archival/tar.c index b2967463e..cd89a7566 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -513,11 +513,12 @@ static inline int writeTarFile(const int tar_fd, const int verboseFlag, | |||
513 | * but that isn't necessary for GNU tar interoperability, and | 513 | * but that isn't necessary for GNU tar interoperability, and |
514 | * so is considered a waste of space */ | 514 | * so is considered a waste of space */ |
515 | 515 | ||
516 | /* Close so the child process (if any) will exit */ | ||
517 | close(tbInfo.tarFd); | ||
518 | |||
516 | /* Hang up the tools, close up shop, head home */ | 519 | /* Hang up the tools, close up shop, head home */ |
517 | if (ENABLE_FEATURE_CLEAN_UP) { | 520 | if (ENABLE_FEATURE_CLEAN_UP) |
518 | close(tbInfo.tarFd); | ||
519 | freeHardLinkInfo(&tbInfo.hlInfoHead); | 521 | freeHardLinkInfo(&tbInfo.hlInfoHead); |
520 | } | ||
521 | 522 | ||
522 | if (errorFlag) | 523 | if (errorFlag) |
523 | bb_error_msg("Error exit delayed from previous errors"); | 524 | bb_error_msg("Error exit delayed from previous errors"); |