From: Rob Landley <rob@landley.net>
Date: Fri, 16 Dec 2005 21:33:10 +0000 (-0000)
Subject: Bug 601: When we fork an archiver and feed stuff to it through a pipe, if
X-Git-Tag: 1_1_0~402
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a78103306e149321c6509514ea350c822815f3f;p=oweals%2Fbusybox.git

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().
---

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,
 	 * but that isn't necessary for GNU tar interoperability, and
 	 * so is considered a waste of space */
 
+	/* Close so the child process (if any) will exit */
+	close(tbInfo.tarFd);
+
 	/* Hang up the tools, close up shop, head home */
-	if (ENABLE_FEATURE_CLEAN_UP) {
-		close(tbInfo.tarFd);
+	if (ENABLE_FEATURE_CLEAN_UP)
 		freeHardLinkInfo(&tbInfo.hlInfoHead);
-	}
 
 	if (errorFlag)
 		bb_error_msg("Error exit delayed from previous errors");