X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=src%2Fsystem.c;h=d646822c4a6ccc65ae0ad098b1b1f47956db6dd4;hb=22f1eb8bc17e5be72dd23d42d6aaa60196ac22e6;hp=e57e6dafb6398e6b65d3a5cfb5e4b11fa5445112;hpb=138fc7e67e3d9845cd7d81aad0e9c7724784f9b9;p=tar diff --git a/src/system.c b/src/system.c index e57e6da..d646822 100644 --- a/src/system.c +++ b/src/system.c @@ -1,6 +1,7 @@ /* System-dependent calls for tar. - Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, + 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -51,12 +52,7 @@ sys_detect_dev_null_output (void) } void -sys_drain_input_pipe (void) -{ -} - -void -sys_wait_for_child (pid_t child_pid) +sys_wait_for_child (pid_t child_pid, bool eof) { } @@ -160,26 +156,8 @@ sys_detect_dev_null_output (void) && archive_stat.st_ino == dev_null_stat.st_ino)); } -/* Manage to fully drain a pipe we might be reading, so to not break it on - the producer after the EOF block. FIXME: one of these days, GNU tar - might become clever enough to just stop working, once there is no more - work to do, we might have to revise this area in such time. */ - void -sys_drain_input_pipe (void) -{ - size_t r; - - if (access_mode == ACCESS_READ - && ! _isrmt (archive) - && (S_ISFIFO (archive_stat.st_mode) || S_ISSOCK (archive_stat.st_mode))) - while ((r = rmtread (archive, record_start->buffer, record_size)) != 0 - && r != SAFE_READ_ERROR) - continue; -} - -void -sys_wait_for_child (pid_t child_pid) +sys_wait_for_child (pid_t child_pid, bool eof) { if (child_pid) { @@ -193,11 +171,14 @@ sys_wait_for_child (pid_t child_pid) } if (WIFSIGNALED (wait_status)) - ERROR ((0, 0, _("Child died with signal %d"), - WTERMSIG (wait_status))); + { + int sig = WTERMSIG (wait_status); + if (!(!eof && sig == SIGPIPE)) + FATAL_ERROR ((0, 0, _("Child died with signal %d"), sig)); + } else if (WEXITSTATUS (wait_status) != 0) - ERROR ((0, 0, _("Child returned status %d"), - WEXITSTATUS (wait_status))); + FATAL_ERROR ((0, 0, _("Child returned status %d"), + WEXITSTATUS (wait_status))); } } @@ -302,6 +283,30 @@ 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; + int exit_code = 0; + + 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_code = WEXITSTATUS (wait_status); + + exit (exit_code); +} + /* Set ARCHIVE for writing, then compressing an archive. */ pid_t sys_child_open_for_compress (void) @@ -310,7 +315,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 (); @@ -326,8 +330,9 @@ sys_child_open_for_compress (void) /* The new born child tar is here! */ - program_name = _("tar (child)"); - + set_program_name (_("tar (child)")); + signal (SIGPIPE, SIG_DFL); + xdup2 (parent_pipe[PREAD], STDIN_FILENO); xclose (parent_pipe[PWRITE]); @@ -370,7 +375,7 @@ sys_child_open_for_compress (void) { /* The newborn grandchild tar is here! Launch the compressor. */ - program_name = _("tar (grandchild)"); + set_program_name (_("tar (grandchild)")); xdup2 (child_pipe[PWRITE], STDOUT_FILENO); xclose (child_pipe[PREAD]); @@ -443,24 +448,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. */ @@ -471,7 +459,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 (); @@ -487,8 +474,9 @@ sys_child_open_for_uncompress (void) /* The newborn child tar is here! */ - program_name = _("tar (child)"); - + set_program_name (_("tar (child)")); + signal (SIGPIPE, SIG_DFL); + xdup2 (parent_pipe[PWRITE], STDOUT_FILENO); xclose (parent_pipe[PREAD]); @@ -522,7 +510,7 @@ sys_child_open_for_uncompress (void) { /* The newborn grandchild tar is here! Launch the uncompressor. */ - program_name = _("tar (grandchild)"); + set_program_name (_("tar (grandchild)")); xdup2 (child_pipe[PREAD], STDIN_FILENO); xclose (child_pipe[PWRITE]); @@ -581,24 +569,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); } @@ -658,6 +629,12 @@ static void stat_to_env (char *name, char type, struct tar_stat_info *st) { str_to_env ("TAR_VERSION", PACKAGE_VERSION); + str_to_env ("TAR_ARCHIVE", *archive_name_cursor); + dec_to_env ("TAR_VOLUME", archive_name_cursor - archive_name_array + 1); + dec_to_env ("TAR_BLOCKING_FACTOR", blocking_factor); + str_to_env ("TAR_FORMAT", + archive_format_string (current_format == DEFAULT_FORMAT ? + archive_format : current_format)); chr_to_env ("TAR_FILETYPE", type); oct_to_env ("TAR_MODE", st->stat.st_mode); str_to_env ("TAR_FILENAME", name);