X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystem.c;h=94142336ef6d021868836cf94a97720ee9d20429;hb=9df17e6005e7a333399e3dc21a7afec75565c767;hp=7df8122bb41e50c382bc1936c17c99de6a979b46;hpb=0d8e3249123ecf0175b60c7b43056ac811eb6921;p=chaz%2Ftar
diff --git a/src/system.c b/src/system.c
index 7df8122..9414233 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-2014 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,14 +13,28 @@
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
+#include
+
+static _Noreturn void
+xexec (const char *cmd)
+{
+ struct wordsplit ws;
+
+ ws.ws_env = (const char **) environ;
+ if (wordsplit (cmd, &ws, (WRDSF_DEFFLAGS | WRDSF_ENV) & ~WRDSF_NOVAR))
+ FATAL_ERROR ((0, 0, _("cannot split string '%s': %s"),
+ cmd, wordsplit_strerror (&ws)));
+ execvp (ws.ws_wordv[0], ws.ws_wordv);
+ exec_fatal (cmd);
+}
#if MSDOS
@@ -174,11 +187,11 @@ sys_wait_for_child (pid_t child_pid, bool eof)
{
int sig = WTERMSIG (wait_status);
if (!(!eof && sig == SIGPIPE))
- ERROR ((0, 0, _("Child died with signal %d"), sig));
+ 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)));
}
}
@@ -192,7 +205,8 @@ sys_spawn_shell (void)
child = xfork ();
if (child == 0)
{
- execlp (shell, "-sh", "-i", (char *) 0);
+ priv_set_restore_linkdir ();
+ execlp (shell, "-sh", "-i", NULL);
exec_fatal (shell);
}
else
@@ -283,15 +297,15 @@ xdup2 (int from, int into)
}
}
-void wait_for_grandchild (pid_t pid) __attribute__ ((__noreturn__));
+static void wait_for_grandchild (pid_t pid) __attribute__ ((__noreturn__));
/* Propagate any failure of the grandchild back to the parent. */
-void
+static void
wait_for_grandchild (pid_t pid)
{
int wait_status;
int exit_code = 0;
-
+
while (waitpid (pid, &wait_status, 0) == -1)
if (errno != EINTR)
{
@@ -303,7 +317,7 @@ wait_for_grandchild (pid_t pid)
raise (WTERMSIG (wait_status));
else if (WEXITSTATUS (wait_status) != 0)
exit_code = WEXITSTATUS (wait_status);
-
+
exit (exit_code);
}
@@ -330,7 +344,8 @@ 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]);
@@ -361,8 +376,8 @@ sys_child_open_for_compress (void)
}
xdup2 (archive, STDOUT_FILENO);
}
- execlp (use_compress_program_option, use_compress_program_option, NULL);
- exec_fatal (use_compress_program_option);
+ priv_set_restore_linkdir ();
+ xexec (use_compress_program_option);
}
/* We do need a grandchild tar. */
@@ -374,13 +389,12 @@ 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]);
- execlp (use_compress_program_option, use_compress_program_option,
- (char *) 0);
- exec_fatal (use_compress_program_option);
+ priv_set_restore_linkdir ();
+ xexec (use_compress_program_option);
}
/* The child tar is still here! */
@@ -450,6 +464,42 @@ sys_child_open_for_compress (void)
wait_for_grandchild (grandchild_pid);
}
+static void
+run_decompress_program (void)
+{
+ int i;
+ const char *p, *prog = NULL;
+ struct wordsplit ws;
+ int wsflags = (WRDSF_DEFFLAGS | WRDSF_ENV | WRDSF_DOOFFS) & ~WRDSF_NOVAR;
+
+ ws.ws_env = (const char **) environ;
+ ws.ws_offs = 1;
+
+ 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));
+ }
+ if (wordsplit (p, &ws, wsflags))
+ FATAL_ERROR ((0, 0, _("cannot split string '%s': %s"),
+ p, wordsplit_strerror (&ws)));
+ wsflags |= WRDSF_REUSE;
+ memmove(ws.ws_wordv, ws.ws_wordv + ws.ws_offs,
+ sizeof(ws.ws_wordv[0])*ws.ws_wordc);
+ ws.ws_wordv[ws.ws_wordc] = (char *) "-d";
+ prog = p;
+ execvp (ws.ws_wordv[0], ws.ws_wordv);
+ ws.ws_wordv[ws.ws_wordc] = 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)
@@ -473,7 +523,8 @@ 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]);
@@ -494,9 +545,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. */
@@ -508,13 +558,12 @@ 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]);
- 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! */
@@ -573,7 +622,7 @@ sys_child_open_for_uncompress (void)
static void
-dec_to_env (char *envar, uintmax_t num)
+dec_to_env (char const *envar, uintmax_t num)
{
char buf[UINTMAX_STRSIZE_BOUND];
char *numstr;
@@ -584,7 +633,7 @@ dec_to_env (char *envar, uintmax_t num)
}
static void
-time_to_env (char *envar, struct timespec t)
+time_to_env (char const *envar, struct timespec t)
{
char buf[TIMESPEC_STRSIZE_BOUND];
if (setenv (envar, code_timespec (t, buf), 1) != 0)
@@ -592,7 +641,7 @@ time_to_env (char *envar, struct timespec t)
}
static void
-oct_to_env (char *envar, unsigned long num)
+oct_to_env (char const *envar, unsigned long num)
{
char buf[1+1+(sizeof(unsigned long)*CHAR_BIT+2)/3];
@@ -602,7 +651,7 @@ oct_to_env (char *envar, unsigned long num)
}
static void
-str_to_env (char *envar, char const *str)
+str_to_env (char const *envar, char const *str)
{
if (str)
{
@@ -614,7 +663,7 @@ str_to_env (char *envar, char const *str)
}
static void
-chr_to_env (char *envar, char c)
+chr_to_env (char const *envar, char c)
{
char buf[2];
buf[0] = c;
@@ -627,6 +676,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);
@@ -665,13 +720,12 @@ stat_to_env (char *name, char type, struct tar_stat_info *st)
}
static pid_t global_pid;
-static RETSIGTYPE (*pipe_handler) (int sig);
+static void (*pipe_handler) (int sig);
int
sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st)
{
int p[2];
- char *argv[4];
xpipe (p);
pipe_handler = signal (SIGPIPE, SIG_IGN);
@@ -689,14 +743,8 @@ 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[2] = to_command_option;
- argv[3] = NULL;
-
- execv ("/bin/sh", argv);
-
- exec_fatal (file_name);
+ priv_set_restore_linkdir ();
+ xexec (to_command_option);
}
void
@@ -738,11 +786,10 @@ int
sys_exec_info_script (const char **archive_name, int volume_number)
{
pid_t pid;
- char *argv[4];
char uintbuf[UINTMAX_STRSIZE_BOUND];
int p[2];
- static RETSIGTYPE (*saved_handler) (int sig);
-
+ static void (*saved_handler) (int sig);
+
xpipe (p);
saved_handler = signal (SIGPIPE, SIG_IGN);
@@ -775,7 +822,7 @@ sys_exec_info_script (const char **archive_name, int volume_number)
}
signal (SIGPIPE, saved_handler);
-
+
if (WIFEXITED (status))
{
if (WEXITSTATUS (status) == 0 && rc > 0)
@@ -803,14 +850,8 @@ sys_exec_info_script (const char **archive_name, int volume_number)
xclose (p[PREAD]);
- argv[0] = "/bin/sh";
- argv[1] = "-c";
- argv[2] = (char*) info_script_option;
- argv[3] = NULL;
-
- execv (argv[0], argv);
-
- exec_fatal (info_script_option);
+ priv_set_restore_linkdir ();
+ xexec (info_script_option);
}
void
@@ -819,7 +860,6 @@ sys_exec_checkpoint_script (const char *script_name,
int checkpoint_number)
{
pid_t pid;
- char *argv[4];
char uintbuf[UINTMAX_STRSIZE_BOUND];
pid = xfork ();
@@ -850,14 +890,8 @@ 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[2] = (char*) script_name;
- argv[3] = NULL;
-
- execv (argv[0], argv);
-
- exec_fatal (script_name);
+ priv_set_restore_linkdir ();
+ xexec (script_name);
}
#endif /* not MSDOS */