mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-04-23 01:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of sub-subprocess returns.

Browse Source 
* src/system.c (wait_for_grandchild): New function.
(sys_child_open_for_compress)
(sys_child_open_for_uncompress): Use wait_for_grandchild
to manage grandchild return.
This commit is contained in:
Sergey Poznyakoff
2009-06-18 12:22:47 +03:00
parent be34933b63
commit af30244849
1 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/system.c
View File

@@ -283,6 +283,29 @@ xdup2 (int from, int into)
}
}
void wait_for_grandchild (pid_t pid) __attribute__ ((__noreturn__));
/* Propagate any failure of the grandchild back to the parent. */
void
wait_for_grandchild (pid_t pid)
{
int wait_status;
while (waitpid (pid, &wait_status, 0) == -1)
if (errno != EINTR)
{
waitpid_error (use_compress_program_option);
break;
}
if (WIFSIGNALED (wait_status))
raise (WTERMSIG (wait_status));
else if (WEXITSTATUS (wait_status) != 0)
exit_status = WEXITSTATUS (wait_status);
exit (exit_status);
}
/* Set ARCHIVE for writing, then compressing an archive. */
pid_t
sys_child_open_for_compress (void)
@@ -291,7 +314,6 @@ sys_child_open_for_compress (void)
int child_pipe[2];
pid_t grandchild_pid;
pid_t child_pid;
int wait_status;
xpipe (parent_pipe);
child_pid = xfork ();
@@ -424,24 +446,7 @@ sys_child_open_for_compress (void)
archive_write_error (status);
}
/* Propagate any failure of the grandchild back to the parent. */
while (waitpid (grandchild_pid, &wait_status, 0) == -1)
if (errno != EINTR)
{
waitpid_error (use_compress_program_option);
break;
}
if (WIFSIGNALED (wait_status))
{
kill (child_pid, WTERMSIG (wait_status));
exit_status = TAREXIT_FAILURE;
}
else if (WEXITSTATUS (wait_status) != 0)
exit_status = WEXITSTATUS (wait_status);
exit (exit_status);
wait_for_grandchild (grandchild_pid);
}
/* Set ARCHIVE for uncompressing, then reading an archive. */
@@ -452,7 +457,6 @@ sys_child_open_for_uncompress (void)
int child_pipe[2];
pid_t grandchild_pid;
pid_t child_pid;
int wait_status;
xpipe (parent_pipe);
child_pid = xfork ();
@@ -562,24 +566,7 @@ sys_child_open_for_uncompress (void)
xclose (STDOUT_FILENO);
/* Propagate any failure of the grandchild back to the parent. */
while (waitpid (grandchild_pid, &wait_status, 0) == -1)
if (errno != EINTR)
{
waitpid_error (use_compress_program_option);
break;
}
if (WIFSIGNALED (wait_status))
{
kill (child_pid, WTERMSIG (wait_status));
exit_status = TAREXIT_FAILURE;
}
else if (WEXITSTATUS (wait_status) != 0)
exit_status = WEXITSTATUS (wait_status);
exit (exit_status);
wait_for_grandchild (grandchild_pid);
}