X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystem.c;h=9dfffcfa4f68b1f77af6d058135318c64cd38674;hb=cd7bdd4076ca154575bbef85eb2157e59befcfe2;hp=f8c3ec1e28e98d784dde4bc63564661680aa22cb;hpb=34795cedb7db68babf7eae672ba47fd486555be8;p=chaz%2Ftar diff --git a/src/system.c b/src/system.c index f8c3ec1..9dfffcf 100644 --- a/src/system.c +++ b/src/system.c @@ -1,7 +1,6 @@ /* System-dependent calls for tar. - Copyright (C) 2003, 2004, 2005, 2006, 2007, - 2008 Free Software Foundation, Inc. + Copyright 2003-2008, 2010, 2013 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 @@ -14,12 +13,12 @@ Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + with this program. If not, see . */ #include #include "common.h" +#include #include #include @@ -192,6 +191,7 @@ sys_spawn_shell (void) child = xfork (); if (child == 0) { + priv_set_restore_linkdir (); execlp (shell, "-sh", "-i", (char *) 0); exec_fatal (shell); } @@ -362,6 +362,7 @@ sys_child_open_for_compress (void) } xdup2 (archive, STDOUT_FILENO); } + priv_set_restore_linkdir (); execlp (use_compress_program_option, use_compress_program_option, NULL); exec_fatal (use_compress_program_option); } @@ -379,6 +380,7 @@ sys_child_open_for_compress (void) xdup2 (child_pipe[PWRITE], STDOUT_FILENO); xclose (child_pipe[PREAD]); + priv_set_restore_linkdir (); execlp (use_compress_program_option, use_compress_program_option, (char *) 0); exec_fatal (use_compress_program_option); @@ -451,6 +453,29 @@ sys_child_open_for_compress (void) wait_for_grandchild (grandchild_pid); } +static void +run_decompress_program (void) +{ + int i; + const char *p, *prog = NULL; + + for (p = first_decompress_program (&i); p; p = next_decompress_program (&i)) + { + if (prog) + { + WARNOPT (WARN_DECOMPRESS_PROGRAM, + (0, errno, _("cannot run %s"), prog)); + WARNOPT (WARN_DECOMPRESS_PROGRAM, + (0, 0, _("trying %s"), p)); + } + prog = p; + execlp (p, p, "-d", NULL); + } + if (!prog) + FATAL_ERROR ((0, 0, _("unable to run decompression program"))); + exec_fatal (prog); +} + /* Set ARCHIVE for uncompressing, then reading an archive. */ pid_t sys_child_open_for_uncompress (void) @@ -496,9 +521,8 @@ sys_child_open_for_uncompress (void) if (archive < 0) open_fatal (archive_name_array[0]); xdup2 (archive, STDIN_FILENO); - execlp (use_compress_program_option, use_compress_program_option, - "-d", (char *) 0); - exec_fatal (use_compress_program_option); + priv_set_restore_linkdir (); + run_decompress_program (); } /* We do need a grandchild tar. */ @@ -514,9 +538,8 @@ sys_child_open_for_uncompress (void) xdup2 (child_pipe[PREAD], STDIN_FILENO); xclose (child_pipe[PWRITE]); - execlp (use_compress_program_option, use_compress_program_option, - "-d", (char *) 0); - exec_fatal (use_compress_program_option); + priv_set_restore_linkdir (); + run_decompress_program (); } /* The child tar is still here! */ @@ -697,11 +720,12 @@ sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st) stat_to_env (file_name, typechar, st); - argv[0] = "/bin/sh"; - argv[1] = "-c"; + argv[0] = (char *) "/bin/sh"; + argv[1] = (char *) "-c"; argv[2] = to_command_option; argv[3] = NULL; + priv_set_restore_linkdir (); execv ("/bin/sh", argv); exec_fatal (file_name); @@ -811,11 +835,12 @@ sys_exec_info_script (const char **archive_name, int volume_number) xclose (p[PREAD]); - argv[0] = "/bin/sh"; - argv[1] = "-c"; + argv[0] = (char *) "/bin/sh"; + argv[1] = (char *) "-c"; argv[2] = (char *) info_script_option; argv[3] = NULL; + priv_set_restore_linkdir (); execv (argv[0], argv); exec_fatal (info_script_option); @@ -858,11 +883,12 @@ sys_exec_checkpoint_script (const char *script_name, setenv ("TAR_FORMAT", archive_format_string (current_format == DEFAULT_FORMAT ? archive_format : current_format), 1); - argv[0] = "/bin/sh"; - argv[1] = "-c"; + argv[0] = (char *) "/bin/sh"; + argv[1] = (char *) "-c"; argv[2] = (char *) script_name; argv[3] = NULL; + priv_set_restore_linkdir (); execv (argv[0], argv); exec_fatal (script_name);