/* System-dependent calls for tar.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 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
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.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "system.h"
+#include <system.h>
#include "common.h"
-#include "rmt.h"
+#include <rmt.h>
#include <signal.h>
#if MSDOS
bool
-sys_get_archive_stat ()
+sys_get_archive_stat (void)
{
return 0;
}
}
void
-sys_save_archive_dev_ino ()
+sys_save_archive_dev_ino (void)
{
}
void
-sys_detect_dev_null_output ()
+sys_detect_dev_null_output (void)
{
static char const dev_null[] = "nul";
}
void
-sys_drain_input_pipe ()
+sys_drain_input_pipe (void)
{
}
}
void
-sys_spawn_shell ()
+sys_spawn_shell (void)
{
spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
}
return write (fd, "", 0);
}
-void
-sys_reset_uid_gid ()
-{
-}
-
-ssize_t
+size_t
sys_write_archive_buffer (void)
{
- ssize_t status;
- ssize_t written = 0;
-
- while (0 <= (status = full_write (archive, record_start->buffer + written,
- record_size - written)))
- {
- written += status;
- if (written == record_size)
- break;
- }
-
- return written ? written : status;
+ return full_write (archive, record_start->buffer, record_size);
}
/* Set ARCHIVE for writing, then compressing an archive. */
static struct stat archive_stat; /* stat block for archive file */
bool
-sys_get_archive_stat ()
+sys_get_archive_stat (void)
{
return fstat (archive, &archive_stat) == 0;
}
-
+
bool
sys_file_is_archive (struct tar_stat_info *p)
{
/* Save archive file inode and device numbers */
void
-sys_save_archive_dev_ino ()
+sys_save_archive_dev_ino (void)
{
if (!_isrmt (archive) && S_ISREG (archive_stat.st_mode))
{
/* Detect if outputting to "/dev/null". */
void
-sys_detect_dev_null_output ()
+sys_detect_dev_null_output (void)
{
static char const dev_null[] = "/dev/null";
struct stat dev_null_stat;
work to do, we might have to revise this area in such time. */
void
-sys_drain_input_pipe ()
+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 (rmtread (archive, record_start->buffer, record_size) > 0)
+ while ((r = rmtread (archive, record_start->buffer, record_size)) != 0
+ && r != SAFE_READ_ERROR)
continue;
}
}
void
-sys_spawn_shell ()
+sys_spawn_shell (void)
{
pid_t child;
const char *shell = getenv ("SHELL");
return pos < 0 ? -1 : ftruncate (fd, pos);
}
-void
-sys_reset_uid_gid ()
-{
- setuid (getuid ());
- setgid (getgid ());
-}
-
/* Return nonzero if NAME is the name of a regular file, or if the file
does not exist (so it would be created as a regular file). */
static int
return errno == ENOENT;
}
-ssize_t
+size_t
sys_write_archive_buffer (void)
{
- ssize_t status;
- ssize_t written = 0;
-
- while (0 <= (status = rmtwrite (archive, record_start->buffer + written,
- record_size - written)))
- {
- written += status;
- if (written == record_size
- || _isrmt (archive)
- || ! (S_ISFIFO (archive_stat.st_mode)
- || S_ISSOCK (archive_stat.st_mode)))
- break;
- }
-
- return written ? written : status;
+ return rmtwrite (archive, record_start->buffer, record_size);
}
#define PREAD 0 /* read file descriptor from pipe() */
while (1)
{
- ssize_t status = 0;
+ size_t status = 0;
char *cursor;
size_t length;
size_t size = record_size - length;
status = safe_read (STDIN_FILENO, cursor, size);
- if (status <= 0)
+ if (status == SAFE_READ_ERROR)
+ read_fatal (use_compress_program_option);
+ if (status == 0)
break;
}
- if (status < 0)
- read_fatal (use_compress_program_option);
-
/* Copy the record. */
if (status == 0)
{
/* The parent tar is still here! Just clean up. */
- read_full_records_option = 1;
archive = parent_pipe[PREAD];
xclose (parent_pipe[PWRITE]);
return child_pid;
char *cursor;
size_t maximum;
size_t count;
- ssize_t status;
+ size_t status;
clear_read_error_count ();
error_loop:
status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
+ if (status == SAFE_READ_ERROR)
{
archive_read_error ();
goto error_loop;
exit (exit_status);
}
-#endif /* not MSDOS */
+\f
+
+static void
+dec_to_env (char *envar, uintmax_t num)
+{
+ char buf[UINTMAX_STRSIZE_BOUND];
+ char *numstr;
+
+ numstr = STRINGIFY_BIGINT (num, buf);
+ setenv (envar, numstr, 1);
+}
+
+static void
+oct_to_env (char *envar, unsigned long num)
+{
+ char buf[1+1+(sizeof(unsigned long)*CHAR_BIT+2)/3];
+
+ snprintf (buf, sizeof buf, "0%lo", num);
+ setenv (envar, buf, 1);
+}
+
+static void
+str_to_env (char *envar, char const *str)
+{
+ if (str)
+ setenv (envar, str, 1);
+ else
+ unsetenv (envar);
+}
+
+static void
+chr_to_env (char *envar, char c)
+{
+ char buf[2];
+ buf[0] = c;
+ buf[1] = 0;
+ setenv (envar, buf, 1);
+}
+
+static void
+stat_to_env (char *name, char type, struct tar_stat_info *st)
+{
+ chr_to_env ("TAR_FILETYPE", type);
+ oct_to_env ("TAR_MODE", st->stat.st_mode);
+ str_to_env ("TAR_FILENAME", name);
+ str_to_env ("TAR_REALNAME", st->file_name);
+ str_to_env ("TAR_UNAME", st->uname);
+ str_to_env ("TAR_GNAME", st->gname);
+ dec_to_env ("TAR_MTIME", st->stat.st_mtime);
+ dec_to_env ("TAR_ATIME", st->stat.st_atime);
+ dec_to_env ("TAR_CTIME", st->stat.st_ctime);
+ dec_to_env ("TAR_SIZE", st->stat.st_size);
+ dec_to_env ("TAR_UID", st->stat.st_uid);
+ dec_to_env ("TAR_GID", st->stat.st_gid);
+
+ switch (type)
+ {
+ case 'b':
+ case 'c':
+ dec_to_env ("TAR_MINOR", minor (st->stat.st_rdev));
+ dec_to_env ("TAR_MAJOR", major (st->stat.st_rdev));
+ unsetenv ("TAR_LINKNAME");
+ break;
+
+ case 'l':
+ case 'h':
+ unsetenv ("TAR_MINOR");
+ unsetenv ("TAR_MAJOR");
+ str_to_env ("TAR_LINKNAME", st->link_name);
+ break;
+
+ default:
+ unsetenv ("TAR_MINOR");
+ unsetenv ("TAR_MAJOR");
+ unsetenv ("TAR_LINKNAME");
+ break;
+ }
+}
+
+static pid_t pid;
+static RETSIGTYPE (*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);
+ pid = xfork ();
+
+ if (pid != 0)
+ {
+ xclose (p[PREAD]);
+ return p[PWRITE];
+ }
+
+ /* Child */
+ xdup2 (p[PREAD], STDIN_FILENO);
+ xclose (p[PWRITE]);
+
+ 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);
+}
+
+void
+sys_wait_command (void)
+{
+ int status;
+
+ if (pid < 0)
+ return;
+
+ signal (SIGPIPE, pipe_handler);
+ while (waitpid (pid, &status, 0) == -1)
+ if (errno != EINTR)
+ {
+ pid = -1;
+ waitpid_error (to_command_option);
+ return;
+ }
+
+ if (WIFEXITED (status))
+ {
+ if (!ignore_command_error_option && WEXITSTATUS (status))
+ ERROR ((0, 0, _("%lu: Child returned status %d"),
+ (unsigned long) pid, WEXITSTATUS (status)));
+ }
+ else if (WIFSIGNALED (status))
+ {
+ WARN ((0, 0, _("%lu: Child terminated on signal %d"),
+ (unsigned long) pid, WTERMSIG (status)));
+ }
+ else
+ ERROR ((0, 0, _("%lu: Child terminated on unknown reason"),
+ (unsigned long) pid));
+
+ pid = -1;
+}
+
+#endif /* not MSDOS */
projects / chaz / tar / blobdiff