X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fsystem.c;h=e57e6dafb6398e6b65d3a5cfb5e4b11fa5445112;hb=1d79c6734cfbd302e53358760b4c3fe3e7b9be61;hp=ba1d191e0824473a73b72ac2334804b497b6677e;hpb=87ac3207fbc12e3f186f338b36012d1ee40e90c1;p=chaz%2Ftar diff --git a/src/system.c b/src/system.c index ba1d191..e57e6da 100644 --- a/src/system.c +++ b/src/system.c @@ -17,7 +17,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include #include "common.h" #include @@ -773,9 +772,10 @@ sys_exec_info_script (const char **archive_name, int volume_number) char *argv[4]; char uintbuf[UINTMAX_STRSIZE_BOUND]; int p[2]; - + static RETSIGTYPE (*saved_handler) (int sig); + xpipe (p); - pipe_handler = signal (SIGPIPE, SIG_IGN); + saved_handler = signal (SIGPIPE, SIG_IGN); pid = xfork (); @@ -785,7 +785,7 @@ sys_exec_info_script (const char **archive_name, int volume_number) int rc; int status; - char *buf; + char *buf = NULL; size_t size = 0; FILE *fp; @@ -800,10 +800,13 @@ sys_exec_info_script (const char **archive_name, int volume_number) while (waitpid (pid, &status, 0) == -1) if (errno != EINTR) { + signal (SIGPIPE, saved_handler); waitpid_error (info_script_option); return -1; } + signal (SIGPIPE, saved_handler); + if (WIFEXITED (status)) { if (WEXITSTATUS (status) == 0 && rc > 0) @@ -821,6 +824,8 @@ sys_exec_info_script (const char **archive_name, int volume_number) setenv ("TAR_VERSION", PACKAGE_VERSION, 1); setenv ("TAR_ARCHIVE", *archive_name, 1); setenv ("TAR_VOLUME", STRINGIFY_BIGINT (volume_number, uintbuf), 1); + setenv ("TAR_BLOCKING_FACTOR", + STRINGIFY_BIGINT (blocking_factor, uintbuf), 1); setenv ("TAR_SUBCOMMAND", subcommand_string (subcommand_option), 1); setenv ("TAR_FORMAT", archive_format_string (current_format == DEFAULT_FORMAT ? @@ -839,5 +844,51 @@ sys_exec_info_script (const char **archive_name, int volume_number) exec_fatal (info_script_option); } +void +sys_exec_checkpoint_script (const char *script_name, + const char *archive_name, + int checkpoint_number) +{ + pid_t pid; + char *argv[4]; + char uintbuf[UINTMAX_STRSIZE_BOUND]; + + pid = xfork (); + + if (pid != 0) + { + /* Master */ + + int status; + + while (waitpid (pid, &status, 0) == -1) + if (errno != EINTR) + { + waitpid_error (script_name); + break; + } + + return; + } + + /* Child */ + setenv ("TAR_VERSION", PACKAGE_VERSION, 1); + setenv ("TAR_ARCHIVE", archive_name, 1); + setenv ("TAR_CHECKPOINT", STRINGIFY_BIGINT (checkpoint_number, uintbuf), 1); + setenv ("TAR_BLOCKING_FACTOR", + STRINGIFY_BIGINT (blocking_factor, uintbuf), 1); + setenv ("TAR_SUBCOMMAND", subcommand_string (subcommand_option), 1); + setenv ("TAR_FORMAT", + archive_format_string (current_format == DEFAULT_FORMAT ? + archive_format : current_format), 1); + argv[0] = "/bin/sh"; + argv[1] = "-c"; + argv[2] = (char*) script_name; + argv[3] = NULL; + + execv (argv[0], argv); + + exec_fatal (script_name); +} #endif /* not MSDOS */