/* Buffer management for tar.
- Copyright 1988, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc.
+
+ Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
+ 2003, 2004 Free Software Foundation, Inc.
+
Written by John Gilmore, on 1985-08-25.
This program is free software; you can redistribute it and/or modify it
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Enable GNU extensions in fnmatch.h. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
#include "system.h"
#include <signal.h>
-#include <time.h>
-#ifndef time
-time_t time ();
-#endif
-
-#if MSDOS
-# include <process.h>
-#endif
-
-#if XENIX
-# include <sys/inode.h>
-#endif
#include <fnmatch.h>
#include <human.h>
#include "common.h"
#include "rmt.h"
-#define PREAD 0 /* read file descriptor from pipe() */
-#define PWRITE 1 /* write file descriptor from pipe() */
-
/* Number of retries before giving up on read. */
#define READ_ERROR_MAX 10
static tarlong prev_written; /* bytes written on previous volumes */
static tarlong bytes_written; /* bytes written on this volume */
-/* FIXME: The following four variables should ideally be static to this
- module. However, this cannot be done yet, as update.c uses the first
- three a lot, and compare.c uses the fourth. The cleanup continues! */
+/* FIXME: The following variables should ideally be static to this
+ module. However, this cannot be done yet. The cleanup continues! */
union block *record_start; /* start of record of archive */
union block *record_end; /* last+1 block of archive record */
union block *current_block; /* current block of archive */
enum access_mode access_mode; /* how do we handle the archive */
-static struct stat archive_stat; /* stat block for archive file */
+off_t records_read; /* number of records read from this archive */
+off_t records_written; /* likewise, for records written */
static off_t record_start_block; /* block ordinal at record_start */
-/* Where we write list messages (not errors, not interactions) to. Stdout
- unless we're writing a pipe, in which case stderr. */
+/* Where we write list messages (not errors, not interactions) to. */
FILE *stdlis;
-static void backspace_output PARAMS ((void));
-static int new_volume PARAMS ((enum access_mode));
-static void archive_write_error PARAMS ((ssize_t));
-static void archive_read_error PARAMS ((void));
-
-#if !MSDOS
-/* Obnoxious test to see if dimwit is trying to dump the archive. */
-dev_t ar_dev;
-ino_t ar_ino;
-#endif
+static void backspace_output (void);
+static bool new_volume (enum access_mode);
/* PID of child program, if compress_option or remote archive access. */
static pid_t child_pid;
/* Checkpointing counter */
static int checkpoint;
-/* We're reading, but we just read the last block and its time to update. */
-/* As least EXTERN like this one as possible. FIXME! */
-extern int time_to_start_writing;
+/* We're reading, but we just read the last block and it's time to update.
+ Declared in update.c
-int file_to_switch_to = -1; /* if remote update, close archive, and use
- this descriptor to write to */
+ As least EXTERN like this one as possible. (?? --gray)
+ FIXME: Either eliminate it or move it to common.h.
+*/
+extern bool time_to_start_writing;
static int volno = 1; /* which volume of a multi-volume tape we're
on */
off_t save_sizeleft; /* where we are in the file we are writing,
only valid if save_name is nonzero */
-int write_archive_to_stdout;
+bool write_archive_to_stdout;
/* Used by flush_read and flush_write to store the real info about saved
names. */
\f
/* Functions. */
+void
+clear_read_error_count (void)
+{
+ read_error_count = 0;
+}
+
void
print_total_written (void)
{
char abbr[LONGEST_HUMAN_READABLE + 1];
char rate[LONGEST_HUMAN_READABLE + 1];
double seconds;
+ int human_opts = human_autoscale | human_base_1024 | human_SI | human_B;
#if HAVE_CLOCK_GETTIME
struct timespec now;
sprintf (bytes, TARLONG_FORMAT, written);
/* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */
- fprintf (stderr, _("Total bytes written: %s (%sB, %sB/s)\n"), bytes,
- human_readable ((uintmax_t) written, abbr, 1, -1024),
+ fprintf (stderr, _("Total bytes written: %s (%s, %s/s)\n"), bytes,
+ human_readable (written, abbr, human_opts, 1, 1),
(0 < seconds && written / seconds < (uintmax_t) -1
- ? human_readable ((uintmax_t) (written / seconds), rate, 1, -1024)
+ ? human_readable (written / seconds, rate, human_opts, 1, 1)
: "?"));
}
-/*--------------------------------------------------------.
-| Compute and return the block ordinal at current_block. |
-`--------------------------------------------------------*/
-
+/* Compute and return the block ordinal at current_block. */
off_t
current_block_ordinal (void)
{
return record_start_block + (current_block - record_start);
}
-/*------------------------------------------------------------------.
-| If the EOF flag is set, reset it, as well as current_block, etc. |
-`------------------------------------------------------------------*/
-
+/* If the EOF flag is set, reset it, as well as current_block, etc. */
void
reset_eof (void)
{
}
}
-/*-------------------------------------------------------------------------.
-| Return the location of the next available input or output block. |
-| Return zero for EOF. Once we have returned zero, we just keep returning |
-| it, to avoid accidentally going on to the next file on the tape. |
-`-------------------------------------------------------------------------*/
-
+/* Return the location of the next available input or output block.
+ Return zero for EOF. Once we have returned zero, we just keep returning
+ it, to avoid accidentally going on to the next file on the tape. */
union block *
find_next_block (void)
{
return current_block;
}
-/*------------------------------------------------------.
-| Indicate that we have used all blocks up thru BLOCK. |
-| |
-| FIXME: should the arg have an off-by-1? |
-`------------------------------------------------------*/
-
+/* Indicate that we have used all blocks up thru BLOCK. */
void
set_next_block_after (union block *block)
{
abort ();
}
-/*------------------------------------------------------------------------.
-| Return the number of bytes comprising the space between POINTER through |
-| the end of the current buffer of blocks. This space is available for |
-| filling with data, or taking data from. POINTER is usually (but not |
-| always) the result previous find_next_block call. |
-`------------------------------------------------------------------------*/
-
+/* Return the number of bytes comprising the space between POINTER
+ through the end of the current buffer of blocks. This space is
+ available for filling with data, or taking data from. POINTER is
+ usually (but not always) the result of previous find_next_block call. */
size_t
available_space_after (union block *pointer)
{
return record_end->buffer - pointer->buffer;
}
-/*------------------------------------------------------------------.
-| Close file having descriptor FD, and abort if close unsuccessful. |
-`------------------------------------------------------------------*/
-
-static void
+/* Close file having descriptor FD, and abort if close unsuccessful. */
+void
xclose (int fd)
{
- if (close (fd) < 0)
- {
- int e = errno;
- FATAL_ERROR ((0, e, _("Cannot close file #%d"), fd));
- }
-}
-
-/*-----------------------------------------------------------------------.
-| Duplicate file descriptor FROM into becoming INTO, or else, issue |
-| MESSAGE. INTO is closed first and has to be the next available slot. |
-`-----------------------------------------------------------------------*/
-
-static void
-xdup2 (int from, int into, const char *message)
-{
- if (from != into)
- {
- int status = close (into);
-
- if (status != 0 && errno != EBADF)
- {
- int e = errno;
- FATAL_ERROR ((0, e, _("Cannot close file descriptor")));
- }
- status = dup (from);
- if (status != into)
- {
- int e = status < 0 ? errno : 0;
- FATAL_ERROR ((0, e, _("Cannot properly duplicate %s"), message));
- }
- xclose (from);
- }
-}
-
-#if MSDOS
-
-/*-------------------------------------------------------.
-| Set ARCHIVE for writing, then compressing an archive. |
-`-------------------------------------------------------*/
-
-static void
-child_open_for_compress (void)
-{
- FATAL_ERROR ((0, 0, _("Cannot use compressed or remote archives")));
-}
-
-/*---------------------------------------------------------.
-| Set ARCHIVE for uncompressing, then reading an archive. |
-`---------------------------------------------------------*/
-
-static void
-child_open_for_uncompress (void)
-{
- FATAL_ERROR ((0, 0, _("Cannot use compressed or remote archives")));
-}
-
-#else /* not MSDOS */
-
-/*---------------------------------------------------------------------.
-| 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
-is_regular_file (const char *name)
-{
- struct stat stbuf;
-
- if (stat (name, &stbuf) == 0)
- return S_ISREG (stbuf.st_mode);
- else
- return errno == ENOENT;
-}
-
-static ssize_t
-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))
- break;
- }
-
- return written ? written : status;
-}
-
-/*-------------------------------------------------------.
-| Set ARCHIVE for writing, then compressing an archive. |
-`-------------------------------------------------------*/
-
-static void
-child_open_for_compress (void)
-{
- int parent_pipe[2];
- int child_pipe[2];
- pid_t grandchild_pid;
-
- xpipe (parent_pipe);
- child_pid = xfork ();
-
- if (child_pid > 0)
- {
- /* The parent tar is still here! Just clean up. */
-
- archive = parent_pipe[PWRITE];
- xclose (parent_pipe[PREAD]);
- return;
- }
-
- /* The new born child tar is here! */
-
- program_name = _("tar (child)");
-
- xdup2 (parent_pipe[PREAD], STDIN_FILENO, _("(child) Pipe to stdin"));
- xclose (parent_pipe[PWRITE]);
-
- /* Check if we need a grandchild tar. This happens only if either:
- a) we are writing stdout: to force reblocking;
- b) the file is to be accessed by rmt: compressor doesn't know how;
- c) the file is not a plain file. */
-
- if (strcmp (archive_name_array[0], "-") != 0
- && !_remdev (archive_name_array[0])
- && is_regular_file (archive_name_array[0]))
- {
- if (backup_option)
- maybe_backup_file (archive_name_array[0], 1);
-
- /* We don't need a grandchild tar. Open the archive and launch the
- compressor. */
-
- archive = creat (archive_name_array[0], MODE_RW);
- if (archive < 0)
- {
- int saved_errno = errno;
-
- if (backup_option)
- undo_last_backup ();
- errno = saved_errno;
- open_fatal (archive_name_array[0]);
- }
- xdup2 (archive, STDOUT_FILENO, _("Archive to stdout"));
- execlp (use_compress_program_option, use_compress_program_option,
- (char *) 0);
- exec_fatal (use_compress_program_option);
- }
-
- /* We do need a grandchild tar. */
-
- xpipe (child_pipe);
- grandchild_pid = xfork ();
-
- if (grandchild_pid > 0)
- {
- /* The child tar is still here! Launch the compressor. */
-
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO,
- _("((child)) Pipe to stdout"));
- xclose (child_pipe[PREAD]);
- execlp (use_compress_program_option, use_compress_program_option,
- (char *) 0);
- exec_fatal (use_compress_program_option);
- }
-
- /* The new born grandchild tar is here! */
-
- program_name = _("tar (grandchild)");
-
- /* Prepare for reblocking the data from the compressor into the archive. */
-
- xdup2 (child_pipe[PREAD], STDIN_FILENO, _("(grandchild) Pipe to stdin"));
- xclose (child_pipe[PWRITE]);
-
- if (strcmp (archive_name_array[0], "-") == 0)
- archive = STDOUT_FILENO;
- else
- {
- archive = rmtcreat (archive_name_array[0], MODE_RW, rsh_command_option);
- if (archive < 0)
- open_fatal (archive_name_array[0]);
- }
-
- /* Let's read out of the stdin pipe and write an archive. */
-
- while (1)
- {
- ssize_t status = 0;
- char *cursor;
- size_t length;
-
- /* Assemble a record. */
-
- for (length = 0, cursor = record_start->buffer;
- length < record_size;
- length += status, cursor += status)
- {
- size_t size = record_size - length;
-
- if (size < BLOCKSIZE)
- size = BLOCKSIZE;
- status = safe_read (STDIN_FILENO, cursor, size);
- if (status <= 0)
- break;
- }
-
- if (status < 0)
- read_fatal (use_compress_program_option);
-
- /* Copy the record. */
-
- if (status == 0)
- {
- /* We hit the end of the file. Write last record at
- full length, as the only role of the grandchild is
- doing proper reblocking. */
-
- if (length > 0)
- {
- memset (record_start->buffer + length, 0, record_size - length);
- status = write_archive_buffer ();
- if (status != record_size)
- archive_write_error (status);
- }
-
- /* There is nothing else to read, break out. */
- break;
- }
-
- status = write_archive_buffer ();
- if (status != record_size)
- archive_write_error (status);
- }
-
-#if 0
- close_archive ();
-#endif
- exit (exit_status);
-}
-
-/*---------------------------------------------------------.
-| Set ARCHIVE for uncompressing, then reading an archive. |
-`---------------------------------------------------------*/
-
-static void
-child_open_for_uncompress (void)
-{
- int parent_pipe[2];
- int child_pipe[2];
- pid_t grandchild_pid;
-
- xpipe (parent_pipe);
- child_pid = xfork ();
-
- if (child_pid > 0)
- {
- /* The parent tar is still here! Just clean up. */
-
- read_full_records_option = 1;
- archive = parent_pipe[PREAD];
- xclose (parent_pipe[PWRITE]);
- return;
- }
-
- /* The new born child tar is here! */
-
- program_name = _("tar (child)");
-
- xdup2 (parent_pipe[PWRITE], STDOUT_FILENO, _("(child) Pipe to stdout"));
- xclose (parent_pipe[PREAD]);
-
- /* Check if we need a grandchild tar. This happens only if either:
- a) we're reading stdin: to force unblocking;
- b) the file is to be accessed by rmt: compressor doesn't know how;
- c) the file is not a plain file. */
-
- if (strcmp (archive_name_array[0], "-") != 0
- && !_remdev (archive_name_array[0])
- && is_regular_file (archive_name_array[0]))
- {
- /* We don't need a grandchild tar. Open the archive and lauch the
- uncompressor. */
-
- archive = open (archive_name_array[0], O_RDONLY | O_BINARY, MODE_RW);
- if (archive < 0)
- open_fatal (archive_name_array[0]);
- xdup2 (archive, STDIN_FILENO, _("Archive to stdin"));
- execlp (use_compress_program_option, use_compress_program_option,
- "-d", (char *) 0);
- exec_fatal (use_compress_program_option);
- }
-
- /* We do need a grandchild tar. */
-
- xpipe (child_pipe);
- grandchild_pid = xfork ();
-
- if (grandchild_pid > 0)
- {
- /* The child tar is still here! Launch the uncompressor. */
-
- xdup2 (child_pipe[PREAD], STDIN_FILENO, _("((child)) Pipe to stdin"));
- xclose (child_pipe[PWRITE]);
- execlp (use_compress_program_option, use_compress_program_option,
- "-d", (char *) 0);
- exec_fatal (use_compress_program_option);
- }
-
- /* The new born grandchild tar is here! */
-
- program_name = _("tar (grandchild)");
-
- /* Prepare for unblocking the data from the archive into the uncompressor. */
-
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO, _("(grandchild) Pipe to stdout"));
- xclose (child_pipe[PREAD]);
-
- if (strcmp (archive_name_array[0], "-") == 0)
- archive = STDIN_FILENO;
- else
- archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
- MODE_RW, rsh_command_option);
- if (archive < 0)
- open_fatal (archive_name_array[0]);
-
- /* Let's read the archive and pipe it into stdout. */
-
- while (1)
- {
- char *cursor;
- size_t maximum;
- size_t count;
- ssize_t status;
-
- read_error_count = 0;
-
- error_loop:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
- {
- archive_read_error ();
- goto error_loop;
- }
- if (status == 0)
- break;
- cursor = record_start->buffer;
- maximum = status;
- while (maximum)
- {
- count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE;
- status = full_write (STDOUT_FILENO, cursor, count);
- if (status < 0)
- write_error (use_compress_program_option);
-
- if (status != count)
- {
- ERROR ((0, 0, _("Write to compression program short %lu bytes"),
- (unsigned long) (count - status)));
- count = status;
- }
-
- cursor += count;
- maximum -= count;
- }
- }
-
-#if 0
- close_archive ();
-#endif
- exit (exit_status);
+ if (close (fd) != 0)
+ close_error (_("(pipe)"));
}
-#endif /* not MSDOS */
-
-/*--------------------------------------------------------------------------.
-| Check the LABEL block against the volume label, seen as a globbing |
-| pattern. Return true if the pattern matches. In case of failure, retry |
-| matching a volume sequence number before giving up in multi-volume mode. |
-`--------------------------------------------------------------------------*/
-
-static int
+/* Check the LABEL block against the volume label, seen as a globbing
+ pattern. Return true if the pattern matches. In case of failure,
+ retry matching a volume sequence number before giving up in
+ multi-volume mode. */
+static bool
check_label_pattern (union block *label)
{
char *string;
- int result;
+ bool result;
+
+ if (! memchr (label->header.name, '\0', sizeof label->header.name))
+ return false;
if (fnmatch (volume_label_option, label->header.name, 0) == 0)
- return 1;
+ return true;
if (!multi_volume_option)
- return 0;
+ return false;
string = xmalloc (strlen (volume_label_option)
+ sizeof VOLUME_LABEL_APPEND + 1);
return result;
}
-/*------------------------------------------------------------------------.
-| Open an archive file. The argument specifies whether we are reading or |
-| writing, or both. |
-`------------------------------------------------------------------------*/
-
+/* Open an archive file. The argument specifies whether we are
+ reading or writing, or both. */
void
open_archive (enum access_mode wanted_access)
{
int backed_up_flag = 0;
- stdlis = to_stdout_option ? stderr : stdout;
+ if (index_file_name)
+ {
+ stdlis = fopen (index_file_name, "w");
+ if (! stdlis)
+ open_error (index_file_name);
+ }
+ else
+ stdlis = to_stdout_option ? stderr : stdout;
if (record_size == 0)
FATAL_ERROR ((0, 0, _("Invalid value for record_size")));
if (archive_names == 0)
FATAL_ERROR ((0, 0, _("No archive name given")));
- current_file_name = 0;
- current_link_name = 0;
-
- /* FIXME: According to POSIX.1, PATH_MAX may well not be a compile-time
- constant, and the value from sysconf (_SC_PATH_MAX) may well not be any
- size that is reasonable to allocate a buffer. In the GNU system, there
- is no fixed limit. The only correct thing to do is to use dynamic
- allocation. (Roland McGrath) */
-
- if (!real_s_name)
- real_s_name = xmalloc (PATH_MAX);
- /* FIXME: real_s_name is never freed. */
-
+ tar_stat_destroy (¤t_stat_info);
save_name = 0;
+ real_s_name = 0;
if (multi_volume_option)
{
- if (verify_option)
- FATAL_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
record_start = valloc (record_size + (2 * BLOCKSIZE));
if (record_start)
record_start += 2;
if (use_compress_program_option)
{
- if (multi_volume_option)
- FATAL_ERROR ((0, 0, _("Cannot use multi-volume compressed archives")));
- if (verify_option)
- FATAL_ERROR ((0, 0, _("Cannot verify compressed archives")));
-
switch (wanted_access)
{
case ACCESS_READ:
- child_open_for_uncompress ();
+ child_pid = sys_child_open_for_uncompress ();
+ read_full_records_option = false;
break;
case ACCESS_WRITE:
- child_open_for_compress ();
+ child_pid = sys_child_open_for_compress ();
break;
case ACCESS_UPDATE:
- FATAL_ERROR ((0, 0, _("Cannot update compressed archives")));
+ abort (); /* Should not happen */
break;
}
}
else if (strcmp (archive_name_array[0], "-") == 0)
{
- read_full_records_option = 1; /* could be a pipe, be safe */
+ read_full_records_option = true; /* could be a pipe, be safe */
if (verify_option)
FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive")));
case ACCESS_UPDATE:
archive = STDIN_FILENO;
stdlis = stderr;
- write_archive_to_stdout = 1;
+ write_archive_to_stdout = true;
break;
}
}
}
if (archive < 0
- || (! _isrmt (archive) && fstat (archive, &archive_stat) < 0))
+ || (! _isrmt (archive) && !sys_get_archive_stat ()))
{
int saved_errno = errno;
open_fatal (archive_name_array[0]);
}
-#if !MSDOS
-
- /* Detect if outputting to "/dev/null". */
- {
- static char const dev_null[] = "/dev/null";
- struct stat dev_null_stat;
-
- dev_null_output =
- (strcmp (archive_name_array[0], dev_null) == 0
- || (! _isrmt (archive)
- && S_ISCHR (archive_stat.st_mode)
- && stat (dev_null, &dev_null_stat) == 0
- && S_ISCHR (dev_null_stat.st_mode)
- && archive_stat.st_rdev == dev_null_stat.st_rdev));
- }
-
- if (!_isrmt (archive) && S_ISREG (archive_stat.st_mode))
- {
- ar_dev = archive_stat.st_dev;
- ar_ino = archive_stat.st_ino;
- }
- else
- ar_dev = 0;
-
-#endif /* not MSDOS */
-
-#if MSDOS
- setmode (archive, O_BINARY);
-#endif
+ sys_detect_dev_null_output ();
+ sys_save_archive_dev_ino ();
+ SET_BINARY_MODE (archive);
switch (wanted_access)
{
- case ACCESS_READ:
case ACCESS_UPDATE:
+ records_written = 0;
+ case ACCESS_READ:
+ records_read = 0;
record_end = record_start; /* set up for 1st record = # 0 */
find_next_block (); /* read it in, check for EOF */
break;
case ACCESS_WRITE:
+ records_written = 0;
if (volume_label_option)
{
memset (record_start, 0, BLOCKSIZE);
else
strcpy (record_start->header.name, volume_label_option);
- assign_string (¤t_file_name, record_start->header.name);
+ assign_string (¤t_stat_info.file_name,
+ record_start->header.name);
+ current_stat_info.had_trailing_slash =
+ strip_trailing_slashes (current_stat_info.file_name);
record_start->header.typeflag = GNUTYPE_VOLHDR;
TIME_TO_CHARS (start_time, record_start->header.mtime);
- finish_header (record_start);
-#if 0
- current_block++;
-#endif
+ finish_header (¤t_stat_info, record_start, -1);
}
break;
}
}
-/*--------------------------------------.
-| Perform a write to flush the buffer. |
-`--------------------------------------*/
-
+/* Perform a write to flush the buffer. */
void
flush_write (void)
{
else if (dev_null_output)
status = record_size;
else
- status = write_archive_buffer ();
+ status = sys_write_archive_buffer ();
if (status != record_size && !multi_volume_option)
archive_write_error (status);
if (status > 0)
- bytes_written += status;
+ {
+ records_written++;
+ bytes_written += status;
+ }
if (status == record_size)
{
if (multi_volume_option)
{
- char *cursor;
-
- if (!save_name)
+ if (save_name)
+ {
+ assign_string (&real_s_name, safer_name_suffix (save_name, false));
+ real_s_totsize = save_totsize;
+ real_s_sizeleft = save_sizeleft;
+ }
+ else
{
- real_s_name[0] = '\0';
+ assign_string (&real_s_name, 0);
real_s_totsize = 0;
real_s_sizeleft = 0;
- return;
}
-
- cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
- while (*cursor == '/')
- cursor++;
-
- strcpy (real_s_name, cursor);
- real_s_totsize = save_totsize;
- real_s_sizeleft = save_sizeleft;
}
return;
}
prev_written += bytes_written;
bytes_written = 0;
- if (volume_label_option && real_s_name[0])
+ if (volume_label_option && real_s_name)
{
copy_back = 2;
record_start -= 2;
}
- else if (volume_label_option || real_s_name[0])
+ else if (volume_label_option || real_s_name)
{
copy_back = 1;
record_start--;
volume_label_option, volno);
TIME_TO_CHARS (start_time, record_start->header.mtime);
record_start->header.typeflag = GNUTYPE_VOLHDR;
- finish_header (record_start);
+ finish_header (¤t_stat_info, record_start, -1);
}
- if (real_s_name[0])
+ if (real_s_name)
{
int tmp;
strcpy (record_start->header.name, real_s_name);
record_start->header.typeflag = GNUTYPE_MULTIVOL;
OFF_TO_CHARS (real_s_sizeleft, record_start->header.size);
- OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
+ OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
record_start->oldgnu_header.offset);
tmp = verbose_option;
verbose_option = 0;
- finish_header (record_start);
+ finish_header (¤t_stat_info, record_start, -1);
verbose_option = tmp;
if (volume_label_option)
record_start--;
}
- status = write_archive_buffer ();
+ status = sys_write_archive_buffer ();
if (status != record_size)
archive_write_error (status);
if (real_s_sizeleft >= copy_back * BLOCKSIZE)
real_s_sizeleft -= copy_back * BLOCKSIZE;
else if ((real_s_sizeleft + BLOCKSIZE - 1) / BLOCKSIZE <= copy_back)
- real_s_name[0] = '\0';
+ assign_string (&real_s_name, 0);
else
{
- char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-
- while (*cursor == '/')
- cursor++;
-
- strcpy (real_s_name, cursor);
+ assign_string (&real_s_name, safer_name_suffix (save_name, false));
real_s_sizeleft = save_sizeleft;
real_s_totsize = save_totsize;
}
}
}
-/*---------------------------------------------------------------------.
-| Handle write errors on the archive. Write errors are always fatal. |
-| Hitting the end of a volume does not cause a write error unless the |
-| write was the first record of the volume. |
-`---------------------------------------------------------------------*/
-
-static void
+/* Handle write errors on the archive. Write errors are always fatal.
+ Hitting the end of a volume does not cause a write error unless the
+ write was the first record of the volume. */
+void
archive_write_error (ssize_t status)
{
- int saved_errno = errno;
-
/* It might be useful to know how much was written before the error
occurred. */
if (totals_option)
- print_total_written ();
-
- if (status < 0)
{
- errno = saved_errno;
- write_fatal (*archive_name_cursor);
+ int e = errno;
+ print_total_written ();
+ errno = e;
}
- else
- FATAL_ERROR ((0, 0, _("Only wrote %lu of %lu bytes to %s"),
- (unsigned long) status, (unsigned long) record_size,
- quote (*archive_name_cursor)));
-}
-/*-------------------------------------------------------------------.
-| Handle read errors on the archive. If the read should be retried, |
-| returns to the caller. |
-`-------------------------------------------------------------------*/
+ write_fatal_details (*archive_name_cursor, status, record_size);
+}
-static void
+/* Handle read errors on the archive. If the read should be retried,
+ return to the caller. */
+void
archive_read_error (void)
{
read_error (*archive_name_cursor);
return;
}
-/*-------------------------------------.
-| Perform a read to flush the buffer. |
-`-------------------------------------*/
+static void
+short_read (size_t status)
+{
+ size_t left; /* bytes left */
+ char *more; /* pointer to next byte to read */
+
+ more = record_start->buffer + status;
+ left = record_size - status;
+
+ while (left % BLOCKSIZE != 0
+ || (left && status && read_full_records_option))
+ {
+ if (status)
+ while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR)
+ archive_read_error ();
+
+ if (status == 0)
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+
+ WARN((0, 0, _("Read %s bytes from %s"),
+ STRINGIFY_BIGINT (record_size - left, buf),
+ *archive_name_cursor));
+ break;
+ }
+
+ if (! read_full_records_option)
+ {
+ unsigned long rest = record_size - left;
+
+ FATAL_ERROR ((0, 0,
+ ngettext ("Unaligned block (%lu byte) in archive",
+ "Unaligned block (%lu bytes) in archive",
+ rest),
+ rest));
+ }
+
+ /* User warned us about this. Fix up. */
+
+ left -= status;
+ more += status;
+ }
+
+ /* FIXME: for size=0, multi-volume support. On the first record, warn
+ about the problem. */
+ if (!read_full_records_option && verbose_option > 1
+ && record_start_block == 0 && status != 0)
+ {
+ unsigned long rsize = (record_size - left) / BLOCKSIZE;
+ WARN ((0, 0,
+ ngettext ("Record size = %lu block",
+ "Record size = %lu blocks",
+ rsize),
+ rsize));
+ }
+
+ record_end = record_start + (record_size - left) / BLOCKSIZE;
+ records_read++;
+}
+
+/* Perform a read to flush the buffer. */
void
flush_read (void)
{
- ssize_t status; /* result from system call */
- size_t left; /* bytes left */
- char *more; /* pointer to next byte to read */
+ size_t status; /* result from system call */
if (checkpoint_option && !(++checkpoint % 10))
WARN ((0, 0, _("Read checkpoint %d"), checkpoint));
if (write_archive_to_stdout && record_start_block != 0)
{
archive = STDOUT_FILENO;
- status = write_archive_buffer ();
+ status = sys_write_archive_buffer ();
archive = STDIN_FILENO;
if (status != record_size)
archive_write_error (status);
{
if (save_name)
{
- char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-
- while (*cursor == '/')
- cursor++;
-
- strcpy (real_s_name, cursor);
+ assign_string (&real_s_name, safer_name_suffix (save_name, false));
real_s_sizeleft = save_sizeleft;
real_s_totsize = save_totsize;
}
else
{
- real_s_name[0] = '\0';
+ assign_string (&real_s_name, 0);
real_s_totsize = 0;
real_s_sizeleft = 0;
}
error_loop:
status = rmtread (archive, record_start->buffer, record_size);
if (status == record_size)
- return;
+ {
+ records_read++;
+ return;
+ }
+
+ /* The condition below used to include
+ || (status > 0 && !read_full_records_option)
+ This is incorrect since even if new_volume() succeeds, the
+ subsequent call to rmtread will overwrite the chunk of data
+ already read in the buffer, so the processing will fail */
if ((status == 0
- || (status < 0 && errno == ENOSPC)
- || (status > 0 && !read_full_records_option))
+ || (status == SAFE_READ_ERROR && errno == ENOSPC))
&& multi_volume_option)
{
union block *cursor;
break;
}
- vol_error:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
- {
- archive_read_error ();
- goto vol_error;
- }
+ while ((status = rmtread (archive, record_start->buffer, record_size))
+ == SAFE_READ_ERROR)
+ archive_read_error ();
+
if (status != record_size)
- goto short_read;
+ short_read (status);
cursor = record_start;
else if (volume_label_option)
WARN ((0, 0, _("WARNING: No volume header")));
- if (real_s_name[0])
+ if (real_s_name)
{
uintmax_t s1, s2;
if (cursor->header.typeflag != GNUTYPE_MULTIVOL
char totsizebuf[UINTMAX_STRSIZE_BOUND];
char s1buf[UINTMAX_STRSIZE_BOUND];
char s2buf[UINTMAX_STRSIZE_BOUND];
-
+
WARN ((0, 0, _("%s is the wrong size (%s != %s + %s)"),
quote (cursor->header.name),
STRINGIFY_BIGINT (save_totsize, totsizebuf),
cursor++;
}
current_block = cursor;
+ records_read++;
return;
}
- else if (status < 0)
+ else if (status == SAFE_READ_ERROR)
{
archive_read_error ();
goto error_loop; /* try again */
}
- short_read:
- more = record_start->buffer + status;
- left = record_size - status;
-
- while (left % BLOCKSIZE != 0)
- {
- while ((status = rmtread (archive, more, left)) < 0)
- archive_read_error ();
-
- if (status == 0)
- {
- ERROR ((0, 0, _("%d garbage bytes ignored at end of archive"),
- (int) ((record_size - left) % BLOCKSIZE)));
- break;
- }
-
- if (! read_full_records_option)
- FATAL_ERROR ((0, 0, _("Unaligned block (%lu bytes) in archive"),
- (unsigned long) (record_size - left)));
-
- /* User warned us about this. Fix up. */
-
- left -= status;
- more += status;
- }
-
- /* FIXME: for size=0, multi-volume support. On the first record, warn
- about the problem. */
-
- if (!read_full_records_option && verbose_option
- && record_start_block == 0 && status > 0)
- WARN ((0, 0, _("Record size = %lu blocks"),
- (unsigned long) ((record_size - left) / BLOCKSIZE)));
-
- record_end = record_start + (record_size - left) / BLOCKSIZE;
+ short_read (status);
}
-/*-----------------------------------------------.
-| Flush the current buffer to/from the archive. |
-`-----------------------------------------------*/
-
+/* Flush the current buffer to/from the archive. */
void
flush_archive (void)
{
if (access_mode == ACCESS_READ && time_to_start_writing)
{
access_mode = ACCESS_WRITE;
- time_to_start_writing = 0;
-
- if (file_to_switch_to >= 0)
- {
- int status = rmtclose (archive);
-
- if (status < 0)
- {
- int e = errno;
- WARN ((0, e, _("WARNING: %s: close (%d, %d)"),
- quotearg_colon (*archive_name_cursor), archive, status));
- }
-
- archive = file_to_switch_to;
- }
- else
- backspace_output ();
+ time_to_start_writing = false;
+ backspace_output ();
}
switch (access_mode)
}
}
-/*-------------------------------------------------------------------------.
-| Backspace the archive descriptor by one record worth. If its a tape, |
-| MTIOCTOP will work. If its something else, we try to seek on it. If we |
-| can't seek, we lose! |
-`-------------------------------------------------------------------------*/
-
+/* Backspace the archive descriptor by one record worth. If it's a
+ tape, MTIOCTOP will work. If it's something else, try to seek on
+ it. If we can't seek, we lose! */
static void
backspace_output (void)
{
/* Seek back to the beginning of this record and start writing there. */
position -= record_size;
+ if (position < 0)
+ position = 0;
if (rmtlseek (archive, position, SEEK_SET) != position)
{
/* Lseek failed. Try a different method. */
}
}
-/*-------------------------.
-| Close the archive file. |
-`-------------------------*/
-
+/* Close the archive file. */
void
close_archive (void)
{
if (time_to_start_writing || access_mode == ACCESS_WRITE)
flush_archive ();
-#if !MSDOS
-
- /* 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. */
+ sys_drain_input_pipe ();
- if (access_mode == ACCESS_READ
- && ! _isrmt (archive)
- && S_ISFIFO (archive_stat.st_mode))
- while (rmtread (archive, record_start->buffer, record_size) > 0)
- continue;
-#endif
-
- if (! _isrmt (archive) && subcommand_option == DELETE_SUBCOMMAND)
- {
-#if MSDOS
- int status = write (archive, "", 0);
-#else
- off_t pos = lseek (archive, (off_t) 0, SEEK_CUR);
- int status = pos < 0 ? -1 : ftruncate (archive, pos);
-#endif
- if (status != 0)
- truncate_warn (*archive_name_cursor);
- }
if (verify_option)
verify_volume ();
- {
- int status = rmtclose (archive);
-
- if (status < 0)
- {
- int e = errno;
- WARN ((0, e, _("WARNING: %s: close (%d, %d)"),
- quotearg_colon (*archive_name_cursor), archive, status));
- }
- }
-
-#if !MSDOS
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
- if (child_pid)
- {
- int wait_status;
-
- while (waitpid (child_pid, &wait_status, 0) == -1)
- if (errno != EINTR)
- {
- waitpid_error (use_compress_program_option);
- break;
- }
-
- if (WIFSIGNALED (wait_status))
- {
- /* SIGPIPE is OK, everything else is a problem. */
-
- if (WTERMSIG (wait_status) != SIGPIPE)
- ERROR ((0, 0, _("Child died with signal %d"),
- WTERMSIG (wait_status)));
- }
- else
- {
- /* Child voluntarily terminated -- but why? /bin/sh returns
- SIGPIPE + 128 if its child, then do nothing. */
-
- if (WEXITSTATUS (wait_status)
- && WEXITSTATUS (wait_status) != (SIGPIPE + 128))
- ERROR ((0, 0, _("Child returned status %d"),
- WEXITSTATUS (wait_status)));
- }
- }
-#endif /* !MSDOS */
+ sys_wait_for_child (child_pid);
- if (current_file_name)
- free (current_file_name);
- if (current_link_name)
- free (current_link_name);
+ tar_stat_destroy (¤t_stat_info);
if (save_name)
free (save_name);
+ if (real_s_name)
+ free (real_s_name);
free (multi_volume_option ? record_start - 2 : record_start);
}
-/*------------------------------------------------.
-| Called to initialize the global volume number. |
-`------------------------------------------------*/
-
+/* Called to initialize the global volume number. */
void
init_volume_number (void)
{
if (file)
{
- fscanf (file, "%d", &global_volno);
+ if (fscanf (file, "%d", &global_volno) != 1
+ || global_volno < 0)
+ FATAL_ERROR ((0, 0, _("%s: contains invalid volume number"),
+ quotearg_colon (volno_file_option)));
if (ferror (file))
read_error (volno_file_option);
if (fclose (file) != 0)
open_error (volno_file_option);
}
-/*-------------------------------------------------------.
-| Called to write out the closing global volume number. |
-`-------------------------------------------------------*/
-
+/* Called to write out the closing global volume number. */
void
closeout_volume_number (void)
{
open_error (volno_file_option);
}
-/*-----------------------------------------------------------------------.
-| We've hit the end of the old volume. Close it and open the next one. |
-| Return nonzero on success. |
-`-----------------------------------------------------------------------*/
-
-static int
-new_volume (enum access_mode access)
+/* We've hit the end of the old volume. Close it and open the next one.
+ Return nonzero on success.
+*/
+static bool
+new_volume (enum access_mode mode)
{
static FILE *read_file;
static int looped;
- int status;
-
if (!read_file && !info_script_option)
/* FIXME: if fopen is used, it will never be closed. */
read_file = archive == STDIN_FILENO ? fopen (TTY_NAME, "r") : stdin;
if (now_verifying)
- return 0;
+ return false;
if (verify_option)
verify_volume ();
- if (status = rmtclose (archive), status < 0)
- {
- int e = errno;
- WARN ((0, e, _("WARNING: %s: close (%d, %d)"),
- quotearg_colon (*archive_name_cursor), archive, status));
- }
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
global_volno++;
+ if (global_volno < 0)
+ FATAL_ERROR ((0, 0, _("Volume number overflow")));
volno++;
archive_name_cursor++;
if (archive_name_cursor == archive_name_array + archive_names)
{
if (volno_file_option)
closeout_volume_number ();
- system (info_script_option);
+ if (system (info_script_option) != 0)
+ FATAL_ERROR ((0, 0, _("`%s' command failed"), info_script_option));
}
else
while (1)
{
case '?':
{
+ /* FIXME: Might it be useful to disable the '!' command? */
fprintf (stderr, _("\
n [name] Give a new file name for the next (and subsequent) volume(s)\n\
q Abort tar\n\
char *name = &input_buffer[1];
char *cursor;
- while (*name == ' ' || *name == '\t')
- name++;
- cursor = name;
- while (*cursor && *cursor != '\n')
- cursor++;
+ for (name = input_buffer + 1;
+ *name == ' ' || *name == '\t';
+ name++)
+ ;
+
+ for (cursor = name; *cursor && *cursor != '\n'; cursor++)
+ ;
*cursor = '\0';
/* FIXME: the following allocation is never reclaimed. */
break;
case '!':
-#if MSDOS
- spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
-#else /* not MSDOS */
- {
- pid_t child;
- const char *shell = getenv ("SHELL");
- if (! shell)
- shell = "/bin/sh";
- child = xfork ();
- if (child == 0)
- {
- execlp (shell, "-sh", "-i", 0);
- exec_fatal (shell);
- }
- else
- {
- int wait_status;
- while (waitpid (child, &wait_status, 0) == -1)
- if (errno != EINTR)
- {
- waitpid_error (shell);
- break;
- }
- }
- }
-#endif /* not MSDOS */
+ sys_spawn_shell ();
break;
}
}
}
- if (verify_option)
+ if (strcmp (archive_name_cursor[0], "-") == 0)
+ {
+ read_full_records_option = true;
+ archive = STDIN_FILENO;
+ }
+ else if (verify_option)
archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
rsh_command_option);
else
- switch (access)
+ switch (mode)
{
case ACCESS_READ:
archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
if (archive < 0)
{
open_warn (*archive_name_cursor);
- if (!verify_option && access == ACCESS_WRITE && backup_option)
+ if (!verify_option && mode == ACCESS_WRITE && backup_option)
undo_last_backup ();
goto tryagain;
}
-#if MSDOS
- setmode (archive, O_BINARY);
-#endif
+ SET_BINARY_MODE (archive);
- return 1;
+ return true;
}
+
projects / chaz / tar / blobdiff