/* 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, 2005, 2006, 2007, 2008 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
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any later
+ Free Software Foundation; either version 3, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but
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. */
-
-/* Enable GNU extensions in fnmatch.h. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "system.h"
+#include <system.h>
+#include <system-ioctl.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 <closeout.h>
#include <fnmatch.h>
+#include <human.h>
+#include <quotearg.h>
#include "common.h"
-#include "rmt.h"
-
-#define DEBUG_FORK 0 /* if nonzero, childs are born stopped */
-
-#define PREAD 0 /* read file descriptor from pipe() */
-#define PWRITE 1 /* write file descriptor from pipe() */
+#include <rmt.h>
/* Number of retries before giving up on read. */
-#define READ_ERROR_MAX 10
+#define READ_ERROR_MAX 10
/* Globbing pattern to append to volume label if initial match failed. */
#define VOLUME_LABEL_APPEND " Volume [1-9]*"
-\f
+
/* Variables. */
-static tarlong prev_written; /* bytes written on previous volumes */
-static tarlong bytes_written; /* bytes written on this volume */
+static tarlong prev_written; /* bytes written on previous volumes */
+static tarlong bytes_written; /* bytes written on this volume */
+static void *record_buffer[2]; /* allocated memory */
+union block *record_buffer_aligned[2];
+static int record_index;
-/* 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 */
+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 */
+off_t records_read; /* number of records read from this archive */
+off_t records_written; /* likewise, for records written */
+extern off_t records_skipped; /* number of records skipped at the start
+ of the archive, defined in delete.c */
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 write_error PARAMS ((ssize_t));
-static void 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);
/* PID of child program, if compress_option or remote archive access. */
static pid_t child_pid;
static int read_error_count;
/* Have we hit EOF yet? */
-static int hit_eof;
+static bool hit_eof;
+
+static bool read_full_records = false;
-/* Checkpointing counter */
-static int checkpoint;
+/* We're reading, but we just read the last block and it's time to update.
+ Declared in update.c
-/* 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;
+ 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;
-int file_to_switch_to = -1; /* if remote update, close archive, and use
- this descriptor to write to */
+bool write_archive_to_stdout;
-static int volno = 1; /* which volume of a multi-volume tape we're
- on */
-static int global_volno = 1; /* volume number to print in external
- messages */
+void (*flush_write_ptr) (size_t);
+void (*flush_read_ptr) (void);
-/* The pointer save_name, which is set in function dump_file() of module
- create.c, points to the original long filename instead of the new,
- shorter mangled name that is set in start_header() of module create.c.
- The pointer save_name is only used in multi-volume mode when the file
- being processed is non-sparse; if a file is split between volumes, the
- save_name is used in generating the LF_MULTIVOL record on the second
- volume. (From Pierce Cantrell, 1991-08-13.) */
+\f
+char *volume_label;
+char *continued_file_name;
+uintmax_t continued_file_size;
+uintmax_t continued_file_offset;
-char *save_name; /* name of the file we are currently writing */
-off_t save_totsize; /* total size of file we are writing, only
- valid if save_name is non NULL */
-off_t save_sizeleft; /* where we are in the file we are writing,
- only valid if save_name is nonzero */
+\f
+static int volno = 1; /* which volume of a multi-volume tape we're
+ on */
+static int global_volno = 1; /* volume number to print in external
+ messages */
-int write_archive_to_stdout = 0;
+bool write_archive_to_stdout;
/* Used by flush_read and flush_write to store the real info about saved
names. */
-static char *real_s_name = NULL;
+static char *real_s_name;
static off_t real_s_totsize;
static off_t real_s_sizeleft;
+
\f
-/* Functions. */
+/* Multi-volume tracking support */
+static char *save_name; /* name of the file we are currently writing */
+static off_t save_totsize; /* total size of file we are writing, only
+ valid if save_name is nonzero */
+static off_t save_sizeleft; /* where we are in the file we are writing,
+ only valid if save_name is nonzero */
-#if DEBUG_FORK
+\f
+static struct tar_stat_info dummy;
-static pid_t
-myfork (void)
+void
+buffer_write_global_xheader ()
{
- pid_t result = fork ();
+ xheader_write_global (&dummy.xhdr);
+}
- if (result == 0)
- kill (getpid (), SIGSTOP);
- return result;
+void
+mv_begin (struct tar_stat_info *st)
+{
+ if (multi_volume_option)
+ {
+ assign_string (&save_name, st->orig_file_name);
+ save_totsize = save_sizeleft = st->stat.st_size;
+ }
+}
+
+void
+mv_end ()
+{
+ if (multi_volume_option)
+ assign_string (&save_name, 0);
+}
+
+void
+mv_total_size (off_t size)
+{
+ save_totsize = size;
+}
+
+void
+mv_size_left (off_t size)
+{
+ save_sizeleft = size;
+}
+
+\f
+/* Functions. */
+
+void
+clear_read_error_count (void)
+{
+ read_error_count = 0;
}
-# define fork myfork
+\f
+/* Time-related functions */
+
+double duration;
+
+void
+set_start_time ()
+{
+ gettime (&start_time);
+ volume_start_time = start_time;
+ last_stat_time = start_time;
+}
-#endif /* DEBUG FORK */
+void
+set_volume_start_time ()
+{
+ gettime (&volume_start_time);
+ last_stat_time = volume_start_time;
+}
void
-print_total_written (void)
+compute_duration ()
+{
+ struct timespec now;
+ gettime (&now);
+ duration += ((now.tv_sec - last_stat_time.tv_sec)
+ + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9);
+ gettime (&last_stat_time);
+}
+
+\f
+/* Compression detection */
+
+enum compress_type {
+ ct_tar, /* Plain tar file */
+ ct_none, /* Unknown compression type */
+ ct_compress,
+ ct_gzip,
+ ct_bzip2,
+ ct_lzma,
+ ct_lzop
+};
+
+struct zip_magic
+{
+ enum compress_type type;
+ size_t length;
+ char *magic;
+ char *program;
+ char *option;
+};
+
+static struct zip_magic const magic[] = {
+ { ct_tar },
+ { ct_none, },
+ { ct_compress, 2, "\037\235", "compress", "-Z" },
+ { ct_gzip, 2, "\037\213", "gzip", "-z" },
+ { ct_bzip2, 3, "BZh", "bzip2", "-j" },
+ { ct_lzma, 6, "\xFFLZMA", "lzma", "-J" }, /* FIXME: ???? */
+ { ct_lzop, 4, "\211LZO", "lzop", "--lzop" },
+};
+
+#define NMAGIC (sizeof(magic)/sizeof(magic[0]))
+
+#define compress_option(t) magic[t].option
+#define compress_program(t) magic[t].program
+
+/* Check if the file ARCHIVE is a compressed archive. */
+enum compress_type
+check_compressed_archive (bool *pshort)
+{
+ struct zip_magic const *p;
+ bool sfr;
+ bool temp;
+
+ if (!pshort)
+ pshort = &temp;
+
+ /* Prepare global data needed for find_next_block: */
+ record_end = record_start; /* set up for 1st record = # 0 */
+ sfr = read_full_records;
+ read_full_records = true; /* Suppress fatal error on reading a partial
+ record */
+ *pshort = find_next_block () == 0;
+
+ /* Restore global values */
+ read_full_records = sfr;
+
+ if (tar_checksum (record_start, true) == HEADER_SUCCESS)
+ /* Probably a valid header */
+ return ct_tar;
+
+ for (p = magic + 2; p < magic + NMAGIC; p++)
+ if (memcmp (record_start->buffer, p->magic, p->length) == 0)
+ return p->type;
+
+ return ct_none;
+}
+
+/* Open an archive named archive_name_array[0]. Detect if it is
+ a compressed archive of known type and use corresponding decompression
+ program if so */
+int
+open_compressed_archive ()
+{
+ archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
+ MODE_RW, rsh_command_option);
+ if (archive == -1)
+ return archive;
+
+ if (!multi_volume_option)
+ {
+ if (!use_compress_program_option)
+ {
+ bool shortfile;
+ enum compress_type type = check_compressed_archive (&shortfile);
+
+ switch (type)
+ {
+ case ct_tar:
+ if (shortfile)
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ return archive;
+
+ case ct_none:
+ if (shortfile)
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ set_comression_program_by_suffix (archive_name_array[0], NULL);
+ if (!use_compress_program_option)
+ return archive;
+ break;
+
+ default:
+ use_compress_program_option = compress_program (type);
+ break;
+ }
+ }
+
+ /* FD is not needed any more */
+ rmtclose (archive);
+
+ hit_eof = false; /* It might have been set by find_next_block in
+ check_compressed_archive */
+
+ /* Open compressed archive */
+ child_pid = sys_child_open_for_uncompress ();
+ read_full_records = true;
+ }
+
+ records_read = 0;
+ record_end = record_start; /* set up for 1st record = # 0 */
+
+ return archive;
+}
+\f
+
+static void
+print_stats (FILE *fp, const char *text, tarlong numbytes)
{
- fprintf (stderr, _("Total bytes written: "));
- fprintf (stderr, TARLONG_FORMAT, prev_written + bytes_written);
- fprintf (stderr, "\n");
+ char bytes[sizeof (tarlong) * CHAR_BIT];
+ char abbr[LONGEST_HUMAN_READABLE + 1];
+ char rate[LONGEST_HUMAN_READABLE + 1];
+
+ int human_opts = human_autoscale | human_base_1024 | human_SI | human_B;
+
+ sprintf (bytes, TARLONG_FORMAT, numbytes);
+
+ fprintf (fp, "%s: %s (%s, %s/s)\n",
+ text, bytes,
+ human_readable (numbytes, abbr, human_opts, 1, 1),
+ (0 < duration && numbytes / duration < (uintmax_t) -1
+ ? human_readable (numbytes / duration, rate, human_opts, 1, 1)
+ : "?"));
}
-/*--------------------------------------------------------.
-| Compute and return the block ordinal at current_block. |
-`--------------------------------------------------------*/
+void
+print_total_stats ()
+{
+ switch (subcommand_option)
+ {
+ case CREATE_SUBCOMMAND:
+ case CAT_SUBCOMMAND:
+ case UPDATE_SUBCOMMAND:
+ case APPEND_SUBCOMMAND:
+ /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */
+ print_stats (stderr, _("Total bytes written"),
+ prev_written + bytes_written);
+ break;
+
+ case DELETE_SUBCOMMAND:
+ {
+ char buf[UINTMAX_STRSIZE_BOUND];
+ print_stats (stderr, _("Total bytes read"),
+ records_read * record_size);
+ print_stats (stderr, _("Total bytes written"),
+ prev_written + bytes_written);
+ fprintf (stderr, _("Total bytes deleted: %s\n"),
+ STRINGIFY_BIGINT ((records_read - records_skipped)
+ * record_size
+ - (prev_written + bytes_written), buf));
+ }
+ break;
+ case EXTRACT_SUBCOMMAND:
+ case LIST_SUBCOMMAND:
+ case DIFF_SUBCOMMAND:
+ print_stats (stderr, _("Total bytes read"),
+ records_read * record_size);
+ break;
+
+ default:
+ abort ();
+ }
+}
+
+/* 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)
{
if (hit_eof)
{
- hit_eof = 0;
+ hit_eof = false;
current_block = record_start;
record_end = record_start + blocking_factor;
access_mode = ACCESS_WRITE;
}
}
-/*-------------------------------------------------------------------------.
-| Return the location of the next available input or output block. |
-| Return NULL for EOF. Once we have returned NULL, 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)
{
if (current_block == record_end)
{
if (hit_eof)
- return NULL;
+ return 0;
flush_archive ();
if (current_block == record_end)
- {
- hit_eof = 1;
- return NULL;
- }
+ {
+ hit_eof = true;
+ return 0;
+ }
}
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 unsucessful. |
-`------------------------------------------------------------------*/
-
-static void
+/* Close file having descriptor FD, and abort if close unsuccessful. */
+void
xclose (int fd)
{
- if (close (fd) < 0)
- FATAL_ERROR ((0, errno, _("Cannot close file #%d"), fd));
+ if (close (fd) != 0)
+ close_error (_("(pipe)"));
}
-/*-----------------------------------------------------------------------.
-| 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)
+init_buffer ()
{
- if (from != into)
- {
- int status = close (into);
-
- if (status < 0 && errno != EBADF)
- FATAL_ERROR ((0, errno, _("Cannot close descriptor %d"), into));
- status = dup (from);
- if (status != into)
- FATAL_ERROR ((0, errno, _("Cannot properly duplicate %s"), message));
- xclose (from);
- }
-}
-
-#if MSDOS
+ if (! record_buffer_aligned[record_index])
+ record_buffer_aligned[record_index] =
+ page_aligned_alloc (&record_buffer[record_index], record_size);
-/*-------------------------------------------------------.
-| Set ARCHIVE for writing, then compressing an archive. |
-`-------------------------------------------------------*/
+ record_start = record_buffer_aligned[record_index];
+ current_block = record_start;
+ record_end = record_start + blocking_factor;
+}
+/* Open an archive file. The argument specifies whether we are
+ reading or writing, or both. */
static void
-child_open_for_compress (void)
+_open_archive (enum access_mode wanted_access)
{
- FATAL_ERROR ((0, 0, _("Cannot use compressed or remote archives")));
-}
+ int backed_up_flag = 0;
-/*---------------------------------------------------------.
-| Set ARCHIVE for uncompressing, then reading an archive. |
-`---------------------------------------------------------*/
+ if (record_size == 0)
+ FATAL_ERROR ((0, 0, _("Invalid value for record_size")));
-static void
-child_open_for_uncompress (void)
-{
- FATAL_ERROR ((0, 0, _("Cannot use compressed or remote archives")));
-}
+ if (archive_names == 0)
+ FATAL_ERROR ((0, 0, _("No archive name given")));
-#else /* not MSDOS */
+ tar_stat_destroy (¤t_stat_info);
+ save_name = 0;
+ real_s_name = 0;
-/*---------------------------------------------------------------------.
-| 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). |
-`---------------------------------------------------------------------*/
+ record_index = 0;
+ init_buffer ();
-static int
-is_regular_file (const char *name)
-{
- struct stat stbuf;
+ /* When updating the archive, we start with reading. */
+ access_mode = wanted_access == ACCESS_UPDATE ? ACCESS_READ : wanted_access;
- if (stat (name, &stbuf) == 0)
- return S_ISREG (stbuf.st_mode);
- else
- return errno == ENOENT;
-}
+ read_full_records = read_full_records_option;
-static ssize_t
-write_archive_buffer (void)
-{
- ssize_t status;
- ssize_t written = 0;
+ records_read = 0;
- while (0 <= (status = rmtwrite (archive, record_start->buffer + written,
- record_size - written)))
+ if (use_compress_program_option)
{
- written += status;
- if (written == record_size
- || _isrmt (archive) || ! S_ISFIFO (archive_stat.st_mode))
- break;
+ switch (wanted_access)
+ {
+ case ACCESS_READ:
+ child_pid = sys_child_open_for_uncompress ();
+ read_full_records = true;
+ record_end = record_start; /* set up for 1st record = # 0 */
+ break;
+
+ case ACCESS_WRITE:
+ child_pid = sys_child_open_for_compress ();
+ break;
+
+ case ACCESS_UPDATE:
+ abort (); /* Should not happen */
+ break;
+ }
+
+ if (!index_file_name
+ && wanted_access == ACCESS_WRITE
+ && strcmp (archive_name_array[0], "-") == 0)
+ stdlis = stderr;
}
+ else if (strcmp (archive_name_array[0], "-") == 0)
+ {
+ read_full_records = true; /* could be a pipe, be safe */
+ if (verify_option)
+ FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive")));
+
+ switch (wanted_access)
+ {
+ case ACCESS_READ:
+ {
+ bool shortfile;
+ enum compress_type type;
+
+ archive = STDIN_FILENO;
+
+ type = check_compressed_archive (&shortfile);
+ if (type != ct_tar && type != ct_none)
+ FATAL_ERROR ((0, 0,
+ _("Archive is compressed. Use %s option"),
+ compress_option (type)));
+ if (shortfile)
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ }
+ break;
+
+ case ACCESS_WRITE:
+ archive = STDOUT_FILENO;
+ if (!index_file_name)
+ stdlis = stderr;
+ break;
+
+ case ACCESS_UPDATE:
+ archive = STDIN_FILENO;
+ write_archive_to_stdout = true;
+ record_end = record_start; /* set up for 1st record = # 0 */
+ if (!index_file_name)
+ stdlis = stderr;
+ break;
+ }
+ }
+ else if (verify_option)
+ archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
+ MODE_RW, rsh_command_option);
+ else
+ switch (wanted_access)
+ {
+ case ACCESS_READ:
+ archive = open_compressed_archive ();
+ 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;
-
- if (pipe (parent_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
+ case ACCESS_WRITE:
+ if (backup_option)
+ {
+ maybe_backup_file (archive_name_array[0], 1);
+ backed_up_flag = 1;
+ }
+ archive = rmtcreat (archive_name_array[0], MODE_RW,
+ rsh_command_option);
+ break;
- child_pid = fork ();
- if (child_pid < 0)
- FATAL_ERROR ((0, errno, _("Cannot fork")));
+ case ACCESS_UPDATE:
+ archive = rmtopen (archive_name_array[0],
+ O_RDWR | O_CREAT | O_BINARY,
+ MODE_RW, rsh_command_option);
+
+ switch (check_compressed_archive (NULL))
+ {
+ case ct_none:
+ case ct_tar:
+ break;
+
+ default:
+ FATAL_ERROR ((0, 0,
+ _("Cannot update compressed archives")));
+ }
+ break;
+ }
- if (child_pid > 0)
+ if (archive < 0
+ || (! _isrmt (archive) && !sys_get_archive_stat ()))
{
- /* The parent tar is still here! Just clean up. */
+ int saved_errno = errno;
- archive = parent_pipe[PWRITE];
- xclose (parent_pipe[PREAD]);
- return;
+ if (backed_up_flag)
+ undo_last_backup ();
+ errno = saved_errno;
+ open_fatal (archive_name_array[0]);
}
- /* The new born child tar is here! */
+ sys_detect_dev_null_output ();
+ sys_save_archive_dev_ino ();
+ SET_BINARY_MODE (archive);
- program_name = _("tar (child)");
+ switch (wanted_access)
+ {
+ case ACCESS_READ:
+ find_next_block (); /* read it in, check for EOF */
+ break;
- xdup2 (parent_pipe[PREAD], STDIN_FILENO, _("(child) Pipe to stdin"));
- xclose (parent_pipe[PWRITE]);
+ case ACCESS_UPDATE:
+ case ACCESS_WRITE:
+ records_written = 0;
+ break;
+ }
+}
- /* 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. */
+/* Perform a write to flush the buffer. */
+ssize_t
+_flush_write (void)
+{
+ ssize_t status;
- if (strcmp (archive_name_array[0], "-") != 0
- && !_remdev (archive_name_array[0])
- && is_regular_file (archive_name_array[0]))
+ checkpoint_run (true);
+ if (tape_length_option && tape_length_option <= bytes_written)
{
- 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 ();
- FATAL_ERROR ((0, saved_errno, _("Cannot open archive %s"),
- archive_name_array[0]));
- }
- xdup2 (archive, STDOUT_FILENO, _("Archive to stdout"));
- execlp (use_compress_program_option, use_compress_program_option,
- (char *) 0);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
+ errno = ENOSPC;
+ status = 0;
}
+ else if (dev_null_output)
+ status = record_size;
+ else
+ status = sys_write_archive_buffer ();
+
+ return status;
+}
- /* We do need a grandchild tar. */
-
- if (pipe (child_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
-
- grandchild_pid = fork ();
- if (grandchild_pid < 0)
- FATAL_ERROR ((0, errno, _("Child cannot fork")));
-
- if (grandchild_pid > 0)
+/* 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)
+{
+ /* It might be useful to know how much was written before the error
+ occurred. */
+ if (totals_option)
{
- /* 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);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
+ int e = errno;
+ print_total_stats ();
+ errno = e;
}
- /* The new born grandchild tar is here! */
+ write_fatal_details (*archive_name_cursor, status, record_size);
+}
+
+/* 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);
- program_name = _("tar (grandchild)");
+ if (record_start_block == 0)
+ FATAL_ERROR ((0, 0, _("At beginning of tape, quitting now")));
- /* Prepare for reblocking the data from the compressor into the archive. */
+ /* Read error in mid archive. We retry up to READ_ERROR_MAX times and
+ then give up on reading the archive. */
- xdup2 (child_pipe[PREAD], STDIN_FILENO, _("(grandchild) Pipe to stdin"));
- xclose (child_pipe[PWRITE]);
+ if (read_error_count++ > READ_ERROR_MAX)
+ FATAL_ERROR ((0, 0, _("Too many errors, quitting")));
+ return;
+}
- 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)
- FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
- archive_name_array[0]));
+static void
+short_read (size_t status)
+{
+ size_t left; /* bytes left */
+ char *more; /* pointer to next byte to read */
- /* Let's read out of the stdin pipe and write an archive. */
+ more = record_start->buffer + status;
+ left = record_size - status;
- while (1)
+ while (left % BLOCKSIZE != 0
+ || (left && status && read_full_records))
{
- ssize_t status = 0;
- char *cursor;
- size_t length;
+ if (status)
+ while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR)
+ archive_read_error ();
+
+ if (status == 0)
+ break;
- /* Assemble a record. */
+ if (! read_full_records)
+ {
+ unsigned long rest = record_size - left;
- for (length = 0, cursor = record_start->buffer;
- length < record_size;
- length += status, cursor += status)
- {
- size_t size = record_size - length;
+ FATAL_ERROR ((0, 0,
+ ngettext ("Unaligned block (%lu byte) in archive",
+ "Unaligned block (%lu bytes) in archive",
+ rest),
+ rest));
+ }
- if (size < BLOCKSIZE)
- size = BLOCKSIZE;
- status = safe_read (STDIN_FILENO, cursor, size);
- if (status <= 0)
- break;
- }
+ /* User warned us about this. Fix up. */
- if (status < 0)
- FATAL_ERROR ((0, errno, _("Cannot read from compression program")));
+ left -= status;
+ more += status;
+ }
- /* Copy the record. */
+ /* FIXME: for size=0, multi-volume support. On the first record, warn
+ about the problem. */
- 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)
- write_error (status);
- }
-
- /* There is nothing else to read, break out. */
- break;
- }
-
- status = write_archive_buffer ();
- if (status != record_size)
- write_error (status);
+ if (!read_full_records && 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));
}
-#if 0
- close_archive ();
-#endif
- exit (exit_status);
+ record_end = record_start + (record_size - left) / BLOCKSIZE;
+ records_read++;
}
-/*---------------------------------------------------------.
-| Set ARCHIVE for uncompressing, then reading an archive. |
-`---------------------------------------------------------*/
-
-static void
-child_open_for_uncompress (void)
+/* Flush the current buffer to/from the archive. */
+void
+flush_archive (void)
{
- int parent_pipe[2];
- int child_pipe[2];
- pid_t grandchild_pid;
-
- if (pipe (parent_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
+ size_t buffer_level = current_block->buffer - record_start->buffer;
+ record_start_block += record_end - record_start;
+ current_block = record_start;
+ record_end = record_start + blocking_factor;
- child_pid = fork ();
- if (child_pid < 0)
- FATAL_ERROR ((0, errno, _("Cannot fork")));
+ if (access_mode == ACCESS_READ && time_to_start_writing)
+ {
+ access_mode = ACCESS_WRITE;
+ time_to_start_writing = false;
+ backspace_output ();
+ }
- if (child_pid > 0)
+ switch (access_mode)
{
- /* The parent tar is still here! Just clean up. */
+ case ACCESS_READ:
+ flush_read ();
+ break;
- read_full_records_option = 1;
- archive = parent_pipe[PREAD];
- xclose (parent_pipe[PWRITE]);
- return;
- }
+ case ACCESS_WRITE:
+ flush_write_ptr (buffer_level);
+ break;
- /* The new born child tar is here! */
+ case ACCESS_UPDATE:
+ abort ();
+ }
+}
- program_name = _("tar (child)");
+/* 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)
+{
+#ifdef MTIOCTOP
+ {
+ struct mtop operation;
- xdup2 (parent_pipe[PWRITE], STDOUT_FILENO, _("(child) Pipe to stdout"));
- xclose (parent_pipe[PREAD]);
+ operation.mt_op = MTBSR;
+ operation.mt_count = 1;
+ if (rmtioctl (archive, MTIOCTOP, (char *) &operation) >= 0)
+ return;
+ if (errno == EIO && rmtioctl (archive, MTIOCTOP, (char *) &operation) >= 0)
+ return;
+ }
+#endif
- /* 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. */
+ {
+ off_t position = rmtlseek (archive, (off_t) 0, SEEK_CUR);
- 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)
- FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
- archive_name_array[0]));
- xdup2 (archive, STDIN_FILENO, _("Archive to stdin"));
- execlp (use_compress_program_option, use_compress_program_option,
- "-d", (char *) 0);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
- }
+ /* Seek back to the beginning of this record and start writing there. */
- /* We do need a grandchild tar. */
+ position -= record_size;
+ if (position < 0)
+ position = 0;
+ if (rmtlseek (archive, position, SEEK_SET) != position)
+ {
+ /* Lseek failed. Try a different method. */
- if (pipe (child_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
+ WARN ((0, 0,
+ _("Cannot backspace archive file; it may be unreadable without -i")));
- grandchild_pid = fork ();
- if (grandchild_pid < 0)
- FATAL_ERROR ((0, errno, _("Child cannot fork")));
+ /* Replace the first part of the record with NULs. */
- 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);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
- }
+ if (record_start->buffer != output_start)
+ memset (record_start->buffer, 0,
+ output_start - record_start->buffer);
+ }
+ }
+}
- /* The new born grandchild tar is here! */
+off_t
+seek_archive (off_t size)
+{
+ off_t start = current_block_ordinal ();
+ off_t offset;
+ off_t nrec, nblk;
+ off_t skipped = (blocking_factor - (current_block - record_start));
- program_name = _("tar (grandchild)");
+ size -= skipped * BLOCKSIZE;
- /* Prepare for unblocking the data from the archive into the uncompressor. */
+ if (size < record_size)
+ return 0;
+ /* FIXME: flush? */
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO, _("(grandchild) Pipe to stdout"));
- xclose (child_pipe[PREAD]);
+ /* Compute number of records to skip */
+ nrec = size / record_size;
+ offset = rmtlseek (archive, nrec * record_size, SEEK_CUR);
+ if (offset < 0)
+ return offset;
- 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)
- FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
- archive_name_array[0]));
+ if (offset % record_size)
+ FATAL_ERROR ((0, 0, _("rmtlseek not stopped at a record boundary")));
- /* Let's read the archive and pipe it into stdout. */
+ /* Convert to number of records */
+ offset /= BLOCKSIZE;
+ /* Compute number of skipped blocks */
+ nblk = offset - start;
- while (1)
- {
- char *cursor;
- size_t maximum;
- size_t count;
- ssize_t status;
+ /* Update buffering info */
+ records_read += nblk / blocking_factor;
+ record_start_block = offset - blocking_factor;
+ current_block = record_end;
- read_error_count = 0;
+ return nblk;
+}
- error_loop:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
- {
- 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)
- FATAL_ERROR ((0, errno, _("Cannot write to compression program")));
-
- if (status != count)
- {
- ERROR ((0, 0, _("Write to compression program short %lu bytes"),
- (unsigned long) (count - status)));
- count = status;
- }
-
- cursor += count;
- maximum -= count;
- }
+/* Close the archive file. */
+void
+close_archive (void)
+{
+ if (time_to_start_writing || access_mode == ACCESS_WRITE)
+ {
+ flush_archive ();
+ if (current_block > record_start)
+ flush_archive ();
}
-#if 0
- close_archive ();
-#endif
- exit (exit_status);
-}
+ sys_drain_input_pipe ();
-#endif /* not MSDOS */
+ compute_duration ();
+ if (verify_option)
+ verify_volume ();
-/*--------------------------------------------------------------------------.
-| 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. |
-`--------------------------------------------------------------------------*/
+ if (rmtclose (archive) != 0)
+ close_error (*archive_name_cursor);
-static int
-check_label_pattern (union block *label)
-{
- char *string;
- int result;
+ sys_wait_for_child (child_pid);
- if (fnmatch (volume_label_option, label->header.name, 0) == 0)
- return 1;
+ tar_stat_destroy (¤t_stat_info);
+ if (save_name)
+ free (save_name);
+ if (real_s_name)
+ free (real_s_name);
+ free (record_buffer[0]);
+ free (record_buffer[1]);
+}
- if (!multi_volume_option)
- return 0;
+/* Called to initialize the global volume number. */
+void
+init_volume_number (void)
+{
+ FILE *file = fopen (volno_file_option, "r");
- string = xmalloc (strlen (volume_label_option)
- + sizeof VOLUME_LABEL_APPEND + 1);
- strcpy (string, volume_label_option);
- strcat (string, VOLUME_LABEL_APPEND);
- result = fnmatch (string, label->header.name, 0) == 0;
- free (string);
- return result;
+ if (file)
+ {
+ 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)
+ close_error (volno_file_option);
+ }
+ else if (errno != ENOENT)
+ open_error (volno_file_option);
}
-/*------------------------------------------------------------------------.
-| Open an archive file. The argument specifies whether we are reading or |
-| writing, or both. |
-`------------------------------------------------------------------------*/
-
+/* Called to write out the closing global volume number. */
void
-open_archive (enum access_mode access)
+closeout_volume_number (void)
{
- int backed_up_flag = 0;
+ FILE *file = fopen (volno_file_option, "w");
- stdlis = to_stdout_option ? stderr : stdout;
+ if (file)
+ {
+ fprintf (file, "%d\n", global_volno);
+ if (ferror (file))
+ write_error (volno_file_option);
+ if (fclose (file) != 0)
+ close_error (volno_file_option);
+ }
+ else
+ open_error (volno_file_option);
+}
- if (record_size == 0)
- FATAL_ERROR ((0, 0, _("Invalid value for record_size")));
+\f
+static void
+increase_volume_number ()
+{
+ global_volno++;
+ if (global_volno < 0)
+ FATAL_ERROR ((0, 0, _("Volume number overflow")));
+ volno++;
+}
- if (archive_names == 0)
- FATAL_ERROR ((0, 0, _("No archive name given")));
+void
+change_tape_menu (FILE *read_file)
+{
+ char *input_buffer = NULL;
+ size_t size = 0;
+ bool stop = false;
+
+ while (!stop)
+ {
+ fputc ('\007', stderr);
+ fprintf (stderr,
+ _("Prepare volume #%d for %s and hit return: "),
+ global_volno + 1, quote (*archive_name_cursor));
+ fflush (stderr);
+
+ if (getline (&input_buffer, &size, read_file) <= 0)
+ {
+ WARN ((0, 0, _("EOF where user reply was expected")));
+
+ if (subcommand_option != EXTRACT_SUBCOMMAND
+ && subcommand_option != LIST_SUBCOMMAND
+ && subcommand_option != DIFF_SUBCOMMAND)
+ WARN ((0, 0, _("WARNING: Archive is incomplete")));
+
+ fatal_exit ();
+ }
+
+ if (input_buffer[0] == '\n'
+ || input_buffer[0] == 'y'
+ || input_buffer[0] == 'Y')
+ break;
+
+ switch (input_buffer[0])
+ {
+ case '?':
+ {
+ fprintf (stderr, _("\
+ n name Give a new file name for the next (and subsequent) volume(s)\n\
+ q Abort tar\n\
+ y or newline Continue operation\n"));
+ if (!restrict_option)
+ fprintf (stderr, _(" ! Spawn a subshell\n"));
+ fprintf (stderr, _(" ? Print this list\n"));
+ }
+ break;
+
+ case 'q':
+ /* Quit. */
+
+ WARN ((0, 0, _("No new volume; exiting.\n")));
+
+ if (subcommand_option != EXTRACT_SUBCOMMAND
+ && subcommand_option != LIST_SUBCOMMAND
+ && subcommand_option != DIFF_SUBCOMMAND)
+ WARN ((0, 0, _("WARNING: Archive is incomplete")));
+
+ fatal_exit ();
+
+ case 'n':
+ /* Get new file name. */
+
+ {
+ char *name;
+ char *cursor;
+
+ for (name = input_buffer + 1;
+ *name == ' ' || *name == '\t';
+ name++)
+ ;
+
+ for (cursor = name; *cursor && *cursor != '\n'; cursor++)
+ ;
+ *cursor = '\0';
+
+ if (name[0])
+ {
+ /* FIXME: the following allocation is never reclaimed. */
+ *archive_name_cursor = xstrdup (name);
+ stop = true;
+ }
+ else
+ fprintf (stderr, "%s",
+ _("File name not specified. Try again.\n"));
+ }
+ break;
+
+ case '!':
+ if (!restrict_option)
+ {
+ sys_spawn_shell ();
+ break;
+ }
+ /* FALL THROUGH */
+
+ default:
+ fprintf (stderr, _("Invalid input. Type ? for help.\n"));
+ }
+ }
+ free (input_buffer);
+}
- current_file_name = NULL;
- current_link_name = NULL;
+/* 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 prompt;
- /* 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 (!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 (!real_s_name)
- real_s_name = (char *) xmalloc (PATH_MAX);
- /* FIXME: real_s_name is never freed. */
+ if (now_verifying)
+ return false;
+ if (verify_option)
+ verify_volume ();
- save_name = NULL;
+ assign_string (&volume_label, NULL);
+ assign_string (&continued_file_name, NULL);
+ continued_file_size = continued_file_offset = 0;
+ current_block = record_start;
+
+ if (rmtclose (archive) != 0)
+ close_error (*archive_name_cursor);
- if (multi_volume_option)
+ archive_name_cursor++;
+ if (archive_name_cursor == archive_name_array + archive_names)
{
- record_start
- = (union block *) valloc (record_size + (2 * BLOCKSIZE));
- if (record_start)
- record_start += 2;
+ archive_name_cursor = archive_name_array;
+ looped = 1;
}
- else
- record_start = (union block *) valloc (record_size);
- if (!record_start)
- FATAL_ERROR ((0, 0, _("Could not allocate memory for blocking factor %d"),
- blocking_factor));
-
- current_block = record_start;
- record_end = record_start + blocking_factor;
- /* When updating the archive, we start with reading. */
- access_mode = access == ACCESS_UPDATE ? ACCESS_READ : access;
-
- if (multi_volume_option && verify_option)
- FATAL_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
+ prompt = looped;
- if (use_compress_program_option)
+ tryagain:
+ if (prompt)
{
- 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 (access)
- {
- case ACCESS_READ:
- child_open_for_uncompress ();
- break;
-
- case ACCESS_WRITE:
- child_open_for_compress ();
- break;
-
- case ACCESS_UPDATE:
- FATAL_ERROR ((0, 0, _("Cannot update compressed archives")));
- break;
- }
+ /* We have to prompt from now on. */
- if (access == ACCESS_WRITE && strcmp (archive_name_array[0], "-") == 0)
- stdlis = stderr;
+ if (info_script_option)
+ {
+ if (volno_file_option)
+ closeout_volume_number ();
+ if (sys_exec_info_script (archive_name_cursor, global_volno+1))
+ FATAL_ERROR ((0, 0, _("%s command failed"),
+ quote (info_script_option)));
+ }
+ else
+ change_tape_menu (read_file);
}
- else if (strcmp (archive_name_array[0], "-") == 0)
+
+ if (strcmp (archive_name_cursor[0], "-") == 0)
{
- read_full_records_option = 1; /* could be a pipe, be safe */
- if (verify_option)
- FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive")));
-
- switch (access)
- {
- case ACCESS_READ:
- archive = STDIN_FILENO;
- break;
-
- case ACCESS_WRITE:
- archive = STDOUT_FILENO;
- stdlis = stderr;
- break;
-
- case ACCESS_UPDATE:
- archive = STDIN_FILENO;
- stdlis = stderr;
- write_archive_to_stdout = 1;
- break;
- }
+ read_full_records = true;
+ archive = STDIN_FILENO;
}
else if (verify_option)
- archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
- MODE_RW, rsh_command_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_array[0], O_RDONLY | O_BINARY,
- MODE_RW, rsh_command_option);
- break;
+ archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
+ rsh_command_option);
+ break;
case ACCESS_WRITE:
- if (backup_option)
- {
- maybe_backup_file (archive_name_array[0], 1);
- backed_up_flag = 1;
- }
- archive = rmtcreat (archive_name_array[0], MODE_RW,
- rsh_command_option);
- break;
+ if (backup_option)
+ maybe_backup_file (*archive_name_cursor, 1);
+ archive = rmtcreat (*archive_name_cursor, MODE_RW,
+ rsh_command_option);
+ break;
case ACCESS_UPDATE:
- archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
- MODE_RW, rsh_command_option);
- break;
+ archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
+ rsh_command_option);
+ break;
}
- if (archive < 0
- || (! _isrmt (archive) && fstat (archive, &archive_stat) < 0))
+ if (archive < 0)
{
- int saved_errno = errno;
-
- if (backed_up_flag)
- undo_last_backup ();
- FATAL_ERROR ((0, saved_errno, "%s", archive_name_array[0]));
+ open_warn (*archive_name_cursor);
+ if (!verify_option && mode == ACCESS_WRITE && backup_option)
+ undo_last_backup ();
+ prompt = 1;
+ goto tryagain;
}
-#if !MSDOS
+ SET_BINARY_MODE (archive);
- /* 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));
- }
+ return true;
+}
+
+static bool
+read_header0 (struct tar_stat_info *info)
+{
+ enum read_header rc;
- if (!_isrmt (archive) && S_ISREG (archive_stat.st_mode))
+ tar_stat_init (info);
+ rc = read_header_primitive (false, info);
+ if (rc == HEADER_SUCCESS)
{
- ar_dev = archive_stat.st_dev;
- ar_ino = archive_stat.st_ino;
+ set_next_block_after (current_header);
+ return true;
}
- else
- ar_dev = 0;
-
-#endif /* not MSDOS */
-
-#if MSDOS
- setmode (archive, O_BINARY);
-#endif
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ return false;
+}
- switch (access)
+bool
+try_new_volume ()
+{
+ size_t status;
+ union block *header;
+ enum access_mode acc;
+
+ switch (subcommand_option)
{
- case ACCESS_READ:
- case ACCESS_UPDATE:
- record_end = record_start; /* set up for 1st record = # 0 */
- find_next_block (); /* read it in, check for EOF */
-
- if (volume_label_option)
- {
- union block *label = find_next_block ();
-
- if (!label)
- FATAL_ERROR ((0, 0, _("Archive not labelled to match `%s'"),
- volume_label_option));
- if (!check_label_pattern (label))
- FATAL_ERROR ((0, 0, _("Volume `%s' does not match `%s'"),
- label->header.name, volume_label_option));
- }
+ case APPEND_SUBCOMMAND:
+ case CAT_SUBCOMMAND:
+ case UPDATE_SUBCOMMAND:
+ acc = ACCESS_UPDATE;
break;
- case ACCESS_WRITE:
- if (volume_label_option)
- {
- memset ((void *) record_start, 0, BLOCKSIZE);
- if (multi_volume_option)
- sprintf (record_start->header.name, "%s Volume 1",
- volume_label_option);
- else
- strcpy (record_start->header.name, volume_label_option);
-
- assign_string (¤t_file_name, record_start->header.name);
-
- record_start->header.typeflag = GNUTYPE_VOLHDR;
- TIME_TO_CHARS (time (0), record_start->header.mtime);
- finish_header (record_start);
-#if 0
- current_block++;
-#endif
- }
+ default:
+ acc = ACCESS_READ;
break;
}
-}
-/*--------------------------------------.
-| Perform a write to flush the buffer. |
-`--------------------------------------*/
+ if (!new_volume (acc))
+ return true;
+
+ while ((status = rmtread (archive, record_start->buffer, record_size))
+ == SAFE_READ_ERROR)
+ archive_read_error ();
-void
-flush_write (void)
-{
- int copy_back;
- ssize_t status;
+ if (status != record_size)
+ short_read (status);
- if (checkpoint_option && !(++checkpoint % 10))
- WARN ((0, 0, _("Write checkpoint %d"), checkpoint));
+ header = find_next_block ();
+ if (!header)
+ return false;
- if (tape_length_option && tape_length_option <= bytes_written)
+ switch (header->header.typeflag)
{
- errno = ENOSPC; /* FIXME: errno should be read-only */
- status = 0;
- }
- else if (dev_null_output)
- status = record_size;
- else
- status = write_archive_buffer ();
- if (status != record_size && !multi_volume_option)
- write_error (status);
+ case XGLTYPE:
+ {
+ if (!read_header0 (&dummy))
+ return false;
+ xheader_decode (&dummy); /* decodes values from the global header */
+ tar_stat_destroy (&dummy);
+ if (!real_s_name)
+ {
+ /* We have read the extended header of the first member in
+ this volume. Put it back, so next read_header works as
+ expected. */
+ current_block = record_start;
+ }
+ break;
+ }
- if (status > 0)
- bytes_written += status;
+ case GNUTYPE_VOLHDR:
+ if (!read_header0 (&dummy))
+ return false;
+ tar_stat_destroy (&dummy);
+ assign_string (&volume_label, current_header->header.name);
+ set_next_block_after (header);
+ header = find_next_block ();
+ if (header->header.typeflag != GNUTYPE_MULTIVOL)
+ break;
+ /* FALL THROUGH */
+
+ case GNUTYPE_MULTIVOL:
+ if (!read_header0 (&dummy))
+ return false;
+ tar_stat_destroy (&dummy);
+ assign_string (&continued_file_name, current_header->header.name);
+ continued_file_size =
+ UINTMAX_FROM_HEADER (current_header->header.size);
+ continued_file_offset =
+ UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset);
+ break;
- if (status == record_size)
+ default:
+ break;
+ }
+
+ if (real_s_name)
{
- if (multi_volume_option)
- {
- char *cursor;
-
- if (!save_name)
- {
- real_s_name[0] = '\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;
+ uintmax_t s;
+ if (!continued_file_name
+ || strcmp (continued_file_name, real_s_name))
+ {
+ if ((archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT)
+ && strlen (real_s_name) >= NAME_FIELD_SIZE
+ && strncmp (continued_file_name, real_s_name,
+ NAME_FIELD_SIZE) == 0)
+ WARN ((0, 0,
+ _("%s is possibly continued on this volume: header contains truncated name"),
+ quote (real_s_name)));
+ else
+ {
+ WARN ((0, 0, _("%s is not continued on this volume"),
+ quote (real_s_name)));
+ return false;
+ }
+ }
+
+ s = continued_file_size + continued_file_offset;
+
+ if (real_s_totsize != s || s < continued_file_offset)
+ {
+ 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 (continued_file_name),
+ STRINGIFY_BIGINT (save_totsize, totsizebuf),
+ STRINGIFY_BIGINT (continued_file_size, s1buf),
+ STRINGIFY_BIGINT (continued_file_offset, s2buf)));
+ return false;
+ }
+
+ if (real_s_totsize - real_s_sizeleft != continued_file_offset)
+ {
+ char totsizebuf[UINTMAX_STRSIZE_BOUND];
+ char s1buf[UINTMAX_STRSIZE_BOUND];
+ char s2buf[UINTMAX_STRSIZE_BOUND];
+
+ WARN ((0, 0, _("This volume is out of sequence (%s - %s != %s)"),
+ STRINGIFY_BIGINT (real_s_totsize, totsizebuf),
+ STRINGIFY_BIGINT (real_s_sizeleft, s1buf),
+ STRINGIFY_BIGINT (continued_file_offset, s2buf)));
+
+ return false;
+ }
}
- /* We're multivol. Panic if we didn't get the right kind of response. */
+ increase_volume_number ();
+ return true;
+}
- /* ENXIO is for the UNIX PC. */
- if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
- write_error (status);
+\f
+/* 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;
+ bool result;
- /* If error indicates a short write, we just move to the next tape. */
+ if (! memchr (label->header.name, '\0', sizeof label->header.name))
+ return false;
- if (!new_volume (ACCESS_WRITE))
- return;
+ if (fnmatch (volume_label_option, label->header.name, 0) == 0)
+ return true;
- if (totals_option)
- prev_written += bytes_written;
- bytes_written = 0;
+ if (!multi_volume_option)
+ return false;
- if (volume_label_option && real_s_name[0])
- {
- copy_back = 2;
- record_start -= 2;
- }
- else if (volume_label_option || real_s_name[0])
- {
- copy_back = 1;
- record_start--;
- }
- else
- copy_back = 0;
+ string = xmalloc (strlen (volume_label_option)
+ + sizeof VOLUME_LABEL_APPEND + 1);
+ strcpy (string, volume_label_option);
+ strcat (string, VOLUME_LABEL_APPEND);
+ result = fnmatch (string, label->header.name, 0) == 0;
+ free (string);
+ return result;
+}
- if (volume_label_option)
- {
- memset ((void *) record_start, 0, BLOCKSIZE);
- sprintf (record_start->header.name, "%s Volume %d", volume_label_option, volno);
- TIME_TO_CHARS (time (0), record_start->header.mtime);
- record_start->header.typeflag = GNUTYPE_VOLHDR;
- finish_header (record_start);
- }
+/* Check if the next block contains a volume label and if this matches
+ the one given in the command line */
+static void
+match_volume_label (void)
+{
+ union block *label = find_next_block ();
+
+ if (!label)
+ FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
+ quote (volume_label_option)));
+ if (!check_label_pattern (label))
+ FATAL_ERROR ((0, 0, _("Volume %s does not match %s"),
+ quote_n (0, label->header.name),
+ quote_n (1, volume_label_option)));
+}
- if (real_s_name[0])
+/* Mark the archive with volume label STR. */
+static void
+_write_volume_label (const char *str)
+{
+ if (archive_format == POSIX_FORMAT)
+ xheader_store ("GNU.volume.label", &dummy, str);
+ else
{
- int tmp;
-
- if (volume_label_option)
- record_start++;
+ union block *label = find_next_block ();
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (label, 0, BLOCKSIZE);
- /* FIXME: Michael P Urban writes: [a long name file] is being written
- when a new volume rolls around [...] Looks like the wrong value is
- being preserved in real_s_name, though. */
+ strcpy (label->header.name, volume_label_option);
+ assign_string (¤t_stat_info.file_name,
+ label->header.name);
+ current_stat_info.had_trailing_slash =
+ strip_trailing_slashes (current_stat_info.file_name);
- 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,
- record_start->oldgnu_header.offset);
- tmp = verbose_option;
- verbose_option = 0;
- finish_header (record_start);
- verbose_option = tmp;
-
- if (volume_label_option)
- record_start--;
+ label->header.typeflag = GNUTYPE_VOLHDR;
+ TIME_TO_CHARS (start_time.tv_sec, label->header.mtime);
+ finish_header (¤t_stat_info, label, -1);
+ set_next_block_after (label);
}
+}
- status = write_archive_buffer ();
- if (status != record_size)
- write_error (status);
+#define VOL_SUFFIX "Volume"
- bytes_written += status;
+/* Add a volume label to a part of multi-volume archive */
+static void
+add_volume_label (void)
+{
+ char buf[UINTMAX_STRSIZE_BOUND];
+ char *p = STRINGIFY_BIGINT (volno, buf);
+ char *s = xmalloc (strlen (volume_label_option) + sizeof VOL_SUFFIX
+ + strlen (p) + 2);
+ sprintf (s, "%s %s %s", volume_label_option, VOL_SUFFIX, p);
+ _write_volume_label (s);
+ free (s);
+}
- if (copy_back)
+static void
+add_chunk_header ()
+{
+ if (archive_format == POSIX_FORMAT)
{
- record_start += copy_back;
- memcpy ((void *) current_block,
- (void *) (record_start + blocking_factor - copy_back),
- (size_t) (copy_back * BLOCKSIZE));
- current_block += copy_back;
-
- 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';
- else
- {
- char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-
- while (*cursor == '/')
- cursor++;
-
- strcpy (real_s_name, cursor);
- real_s_sizeleft = save_sizeleft;
- real_s_totsize = save_totsize;
- }
- copy_back = 0;
+ off_t block_ordinal;
+ union block *blk;
+ struct tar_stat_info st;
+ static size_t real_s_part_no; /* FIXME */
+
+ real_s_part_no++;
+ memset (&st, 0, sizeof st);
+ st.orig_file_name = st.file_name = real_s_name;
+ st.stat.st_mode = S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH;
+ st.stat.st_uid = getuid ();
+ st.stat.st_gid = getgid ();
+ st.orig_file_name = xheader_format_name (&st,
+ "%d/GNUFileParts.%p/%f.%n",
+ real_s_part_no);
+ st.file_name = st.orig_file_name;
+ st.archive_file_size = st.stat.st_size = real_s_sizeleft;
+
+ block_ordinal = current_block_ordinal ();
+ blk = start_header (&st);
+ if (!blk)
+ abort (); /* FIXME */
+ finish_header (&st, blk, block_ordinal);
+ free (st.orig_file_name);
}
}
-/*---------------------------------------------------------------------.
-| 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. |
-`---------------------------------------------------------------------*/
+/* Add a volume label to the current archive */
static void
-write_error (ssize_t status)
+write_volume_label (void)
{
- 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)
- FATAL_ERROR ((0, saved_errno, _("Cannot write to %s"),
- *archive_name_cursor));
+ if (multi_volume_option)
+ add_volume_label ();
else
- FATAL_ERROR ((0, 0, _("Only wrote %lu of %lu bytes to %s"),
- (unsigned long) status, (unsigned long) record_size,
- *archive_name_cursor));
+ _write_volume_label (volume_label_option);
}
-/*-------------------------------------------------------------------.
-| Handle read errors on the archive. If the read should be retried, |
-| returns to the caller. |
-`-------------------------------------------------------------------*/
-
+/* Write GNU multi-volume header */
static void
-read_error (void)
+gnu_add_multi_volume_header (void)
{
- WARN ((0, errno, _("Read error on %s"), *archive_name_cursor));
+ int tmp;
+ union block *block = find_next_block ();
- if (record_start_block == 0)
- FATAL_ERROR ((0, 0, _("At beginning of tape, quitting now")));
+ if (strlen (real_s_name) > NAME_FIELD_SIZE)
+ WARN ((0, 0,
+ _("%s: file name too long to be stored in a GNU multivolume header, truncated"),
+ quotearg_colon (real_s_name)));
- /* Read error in mid archive. We retry up to READ_ERROR_MAX times and
- then give up on reading the archive. */
-
- if (read_error_count++ > READ_ERROR_MAX)
- FATAL_ERROR ((0, 0, _("Too many errors, quitting")));
- return;
-}
+ memset (block, 0, BLOCKSIZE);
-/*-------------------------------------.
-| Perform a read to flush the buffer. |
-`-------------------------------------*/
+ /* FIXME: Michael P Urban writes: [a long name file] is being written
+ when a new volume rolls around [...] Looks like the wrong value is
+ being preserved in real_s_name, though. */
-void
-flush_read (void)
-{
- ssize_t status; /* result from system call */
- size_t left; /* bytes left */
- char *more; /* pointer to next byte to read */
-
- if (checkpoint_option && !(++checkpoint % 10))
- WARN ((0, 0, _("Read checkpoint %d"), checkpoint));
+ strncpy (block->header.name, real_s_name, NAME_FIELD_SIZE);
+ block->header.typeflag = GNUTYPE_MULTIVOL;
- /* Clear the count of errors. This only applies to a single call to
- flush_read. */
+ OFF_TO_CHARS (real_s_sizeleft, block->header.size);
+ OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
+ block->oldgnu_header.offset);
- read_error_count = 0; /* clear error count */
+ tmp = verbose_option;
+ verbose_option = 0;
+ finish_header (¤t_stat_info, block, -1);
+ verbose_option = tmp;
+ set_next_block_after (block);
+}
- if (write_archive_to_stdout && record_start_block != 0)
+/* Add a multi volume header to the current archive. The exact header format
+ depends on the archive format. */
+static void
+add_multi_volume_header (void)
+{
+ if (archive_format == POSIX_FORMAT)
{
- status = write_archive_buffer ();
- if (status != record_size)
- write_error (status);
+ off_t d = real_s_totsize - real_s_sizeleft;
+ xheader_store ("GNU.volume.filename", &dummy, real_s_name);
+ xheader_store ("GNU.volume.size", &dummy, &real_s_sizeleft);
+ xheader_store ("GNU.volume.offset", &dummy, &d);
}
+ else
+ gnu_add_multi_volume_header ();
+}
+
+/* Synchronize multi-volume globals */
+static void
+multi_volume_sync ()
+{
if (multi_volume_option)
{
if (save_name)
- {
- char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-
- while (*cursor == '/')
- cursor++;
-
- strcpy (real_s_name, cursor);
- real_s_sizeleft = save_sizeleft;
- real_s_totsize = save_totsize;
- }
+ {
+ assign_string (&real_s_name,
+ safer_name_suffix (save_name, false,
+ absolute_names_option));
+ real_s_totsize = save_totsize;
+ real_s_sizeleft = save_sizeleft;
+ }
else
- {
- real_s_name[0] = '\0';
- real_s_totsize = 0;
- real_s_sizeleft = 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;
+\f
+/* Low-level flush functions */
- if ((status == 0
- || (status < 0 && errno == ENOSPC)
- || (status > 0 && !read_full_records_option))
- && multi_volume_option)
+/* Simple flush read (no multi-volume or label extensions) */
+static void
+simple_flush_read (void)
+{
+ size_t status; /* result from system call */
+
+ checkpoint_run (false);
+
+ /* Clear the count of errors. This only applies to a single call to
+ flush_read. */
+
+ read_error_count = 0; /* clear error count */
+
+ if (write_archive_to_stdout && record_start_block != 0)
{
- union block *cursor;
-
- try_volume:
- switch (subcommand_option)
- {
- case APPEND_SUBCOMMAND:
- case CAT_SUBCOMMAND:
- case UPDATE_SUBCOMMAND:
- if (!new_volume (ACCESS_UPDATE))
- return;
- break;
-
- default:
- if (!new_volume (ACCESS_READ))
- return;
- break;
- }
-
- vol_error:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
- {
- read_error ();
- goto vol_error;
- }
+ archive = STDOUT_FILENO;
+ status = sys_write_archive_buffer ();
+ archive = STDIN_FILENO;
if (status != record_size)
- goto short_read;
-
- cursor = record_start;
-
- if (cursor->header.typeflag == GNUTYPE_VOLHDR)
- {
- if (volume_label_option)
- {
- if (!check_label_pattern (cursor))
- {
- WARN ((0, 0, _("Volume `%s' does not match `%s'"),
- cursor->header.name, volume_label_option));
- volno--;
- global_volno--;
- goto try_volume;
- }
- }
- if (verbose_option)
- fprintf (stdlis, _("Reading %s\n"), cursor->header.name);
- cursor++;
- }
- else if (volume_label_option)
- WARN ((0, 0, _("WARNING: No volume header")));
-
- if (real_s_name[0])
- {
- uintmax_t s1, s2;
- if (cursor->header.typeflag != GNUTYPE_MULTIVOL
- || strcmp (cursor->header.name, real_s_name))
- {
- WARN ((0, 0, _("%s is not continued on this volume"),
- real_s_name));
- volno--;
- global_volno--;
- goto try_volume;
- }
- s1 = UINTMAX_FROM_CHARS (cursor->header.size);
- s2 = UINTMAX_FROM_CHARS (cursor->oldgnu_header.offset);
- if (real_s_totsize != s1 + s2 || s1 + s2 < s2)
- {
- 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)"),
- cursor->header.name,
- STRINGIFY_BIGINT (save_totsize, totsizebuf),
- STRINGIFY_BIGINT (s1, s1buf),
- STRINGIFY_BIGINT (s2, s2buf)));
- volno--;
- global_volno--;
- goto try_volume;
- }
- if (real_s_totsize - real_s_sizeleft
- != OFF_FROM_CHARS (cursor->oldgnu_header.offset))
- {
- WARN ((0, 0, _("This volume is out of sequence")));
- volno--;
- global_volno--;
- goto try_volume;
- }
- cursor++;
- }
- current_block = cursor;
- return;
- }
- else if (status < 0)
- {
- read_error ();
- goto error_loop; /* try again */
+ archive_write_error (status);
}
-short_read:
- more = record_start->buffer + status;
- left = record_size - status;
-
-again:
- if (left % BLOCKSIZE == 0)
+ for (;;)
{
- /* 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) (status / BLOCKSIZE)));
+ status = rmtread (archive, record_start->buffer, record_size);
+ if (status == record_size)
+ {
+ records_read++;
+ return;
+ }
+ if (status == SAFE_READ_ERROR)
+ {
+ archive_read_error ();
+ continue; /* try again */
+ }
+ break;
+ }
+ short_read (status);
+}
- record_end = record_start + (record_size - left) / BLOCKSIZE;
+/* Simple flush write (no multi-volume or label extensions) */
+static void
+simple_flush_write (size_t level __attribute__((unused)))
+{
+ ssize_t status;
- return;
- }
- if (read_full_records_option)
+ status = _flush_write ();
+ if (status != record_size)
+ archive_write_error (status);
+ else
{
- /* User warned us about this. Fix up. */
-
- if (left > 0)
- {
- error2loop:
- status = rmtread (archive, more, left);
- if (status < 0)
- {
- read_error ();
- goto error2loop; /* try again */
- }
- if (status == 0)
- FATAL_ERROR ((0, 0, _("Archive %s EOF not on block boundary"),
- *archive_name_cursor));
- left -= status;
- more += status;
- goto again;
- }
+ records_written++;
+ bytes_written += status;
}
- else
- FATAL_ERROR ((0, 0, _("Only read %lu bytes from archive %s"),
- (unsigned long) status, *archive_name_cursor));
}
-/*-----------------------------------------------.
-| Flush the current buffer to/from the archive. |
-`-----------------------------------------------*/
+\f
+/* GNU flush functions. These support multi-volume and archive labels in
+ GNU and PAX archive formats. */
-void
-flush_archive (void)
+static void
+_gnu_flush_read (void)
{
- record_start_block += record_end - record_start;
- current_block = record_start;
- record_end = record_start + blocking_factor;
+ size_t status; /* result from system call */
- 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);
+ checkpoint_run (false);
+
+ /* Clear the count of errors. This only applies to a single call to
+ flush_read. */
- if (status < 0)
- WARN ((0, errno, _("WARNING: Cannot close %s (%d, %d)"),
- *archive_name_cursor, archive, status));
+ read_error_count = 0; /* clear error count */
- archive = file_to_switch_to;
- }
- else
- backspace_output ();
+ if (write_archive_to_stdout && record_start_block != 0)
+ {
+ archive = STDOUT_FILENO;
+ status = sys_write_archive_buffer ();
+ archive = STDIN_FILENO;
+ if (status != record_size)
+ archive_write_error (status);
}
- switch (access_mode)
- {
- case ACCESS_READ:
- flush_read ();
- break;
+ multi_volume_sync ();
- case ACCESS_WRITE:
- flush_write ();
+ for (;;)
+ {
+ status = rmtread (archive, record_start->buffer, record_size);
+ if (status == record_size)
+ {
+ records_read++;
+ return;
+ }
+
+ /* The condition below used to include
+ || (status > 0 && !read_full_records)
+ 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 == SAFE_READ_ERROR && errno == ENOSPC))
+ && multi_volume_option)
+ {
+ while (!try_new_volume ())
+ ;
+ return;
+ }
+ else if (status == SAFE_READ_ERROR)
+ {
+ archive_read_error ();
+ continue;
+ }
break;
-
- case ACCESS_UPDATE:
- abort ();
}
+ short_read (status);
}
-/*-------------------------------------------------------------------------.
-| 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! |
-`-------------------------------------------------------------------------*/
-
static void
-backspace_output (void)
+gnu_flush_read (void)
{
-#ifdef MTIOCTOP
- {
- struct mtop operation;
-
- operation.mt_op = MTBSR;
- operation.mt_count = 1;
- if (rmtioctl (archive, MTIOCTOP, (char *) &operation) >= 0)
- return;
- if (errno == EIO && rmtioctl (archive, MTIOCTOP, (char *) &operation) >= 0)
- return;
- }
-#endif
-
- {
- off_t position = rmtlseek (archive, (off_t) 0, SEEK_CUR);
-
- /* Seek back to the beginning of this record and start writing there. */
-
- position -= record_size;
- if (rmtlseek (archive, position, SEEK_SET) != position)
- {
- /* Lseek failed. Try a different method. */
-
- WARN ((0, 0,
- _("Could not backspace archive file; it may be unreadable without -i")));
-
- /* Replace the first part of the record with NULs. */
-
- if (record_start->buffer != output_start)
- memset (record_start->buffer, 0,
- (size_t) (output_start - record_start->buffer));
- }
- }
+ flush_read_ptr = simple_flush_read; /* Avoid recursion */
+ _gnu_flush_read ();
+ flush_read_ptr = gnu_flush_read;
}
-/*-------------------------.
-| Close the archive file. |
-`-------------------------*/
-
-void
-close_archive (void)
+static void
+_gnu_flush_write (size_t buffer_level)
{
- 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. */
+ ssize_t status;
+ union block *header;
+ char *copy_ptr;
+ size_t copy_size;
+ size_t bufsize;
+ tarlong wrt;
+
+ status = _flush_write ();
+ if (status != record_size && !multi_volume_option)
+ archive_write_error (status);
+ else
+ {
+ if (status)
+ records_written++;
+ bytes_written += status;
+ }
- 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 (status == record_size)
+ {
+ multi_volume_sync ();
+ return;
+ }
- if (! _isrmt (archive) && subcommand_option == DELETE_SUBCOMMAND)
+ if (status % BLOCKSIZE)
{
-#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)
- WARN ((0, errno, _("WARNING: Cannot truncate %s"),
- *archive_name_cursor));
+ ERROR ((0, 0, _("write did not end on a block boundary")));
+ archive_write_error (status);
}
- if (verify_option)
- verify_volume ();
+
+ /* In multi-volume mode. */
+ /* ENXIO is for the UNIX PC. */
+ if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
+ archive_write_error (status);
- {
- int status = rmtclose (archive);
+ real_s_sizeleft -= status;
+ if (!new_volume (ACCESS_WRITE))
+ return;
- if (status < 0)
- WARN ((0, errno, _("WARNING: Cannot close %s (%d, %d)"),
- *archive_name_cursor, archive, status));
- }
+ tar_stat_destroy (&dummy);
+
+ increase_volume_number ();
+ prev_written += bytes_written;
+ bytes_written = 0;
-#if !MSDOS
+ copy_ptr = record_start->buffer + status;
+ copy_size = buffer_level - status;
+
+ /* Switch to the next buffer */
+ record_index = !record_index;
+ init_buffer ();
- if (child_pid)
+ if (volume_label_option)
+ add_volume_label ();
+
+ if (real_s_name)
+ add_multi_volume_header ();
+
+ write_extended (true, &dummy, find_next_block ());
+ tar_stat_destroy (&dummy);
+
+ if (real_s_name)
+ add_chunk_header ();
+ wrt = bytes_written;
+ header = find_next_block ();
+ bufsize = available_space_after (header);
+ while (bufsize < copy_size)
{
- int wait_status;
-
- while (waitpid (child_pid, &wait_status, 0) == -1)
- if (errno != EINTR)
- {
- ERROR ((0, errno, _("While waiting for child")));
- 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)));
- }
+ memcpy (header->buffer, copy_ptr, bufsize);
+ copy_ptr += bufsize;
+ copy_size -= bufsize;
+ set_next_block_after (header + (bufsize - 1) / BLOCKSIZE);
+ header = find_next_block ();
+ bufsize = available_space_after (header);
}
-#endif /* !MSDOS */
-
- if (current_file_name)
- free (current_file_name);
- if (current_link_name)
- free (current_link_name);
- if (save_name)
- free (save_name);
- free (multi_volume_option ? record_start - 2 : record_start);
+ memcpy (header->buffer, copy_ptr, copy_size);
+ memset (header->buffer + copy_size, 0, bufsize - copy_size);
+ set_next_block_after (header + (copy_size - 1) / BLOCKSIZE);
+ if (multi_volume_option && wrt < bytes_written)
+ {
+ /* The value of bytes_written has changed while moving data;
+ that means that flush_archive was executed at least once in
+ between, and, as a consequence, copy_size bytes were not written
+ to disk. We need to update sizeleft variables to compensate for
+ that. */
+ save_sizeleft += copy_size;
+ multi_volume_sync ();
+ }
+ find_next_block ();
}
-/*------------------------------------------------.
-| Called to initialize the global volume number. |
-`------------------------------------------------*/
+static void
+gnu_flush_write (size_t buffer_level)
+{
+ flush_write_ptr = simple_flush_write; /* Avoid recursion */
+ _gnu_flush_write (buffer_level);
+ flush_write_ptr = gnu_flush_write;
+}
void
-init_volume_number (void)
+flush_read ()
{
- FILE *file = fopen (volno_file_option, "r");
-
- if (file)
- {
- fscanf (file, "%d", &global_volno);
- if (fclose (file) == EOF)
- ERROR ((0, errno, "%s", volno_file_option));
- }
- else if (errno != ENOENT)
- ERROR ((0, errno, "%s", volno_file_option));
+ flush_read_ptr ();
}
-/*-------------------------------------------------------.
-| Called to write out the closing global volume number. |
-`-------------------------------------------------------*/
-
void
-closeout_volume_number (void)
+flush_write ()
{
- FILE *file = fopen (volno_file_option, "w");
-
- if (file)
- {
- fprintf (file, "%d\n", global_volno);
- if (fclose (file) == EOF)
- ERROR ((0, errno, "%s", volno_file_option));
- }
- else
- ERROR ((0, errno, "%s", volno_file_option));
+ flush_write_ptr (record_size);
}
-/*-----------------------------------------------------------------------.
-| 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)
+void
+open_archive (enum access_mode wanted_access)
{
- static FILE *read_file = NULL;
- static int looped = 0;
-
- 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;
- if (verify_option)
- verify_volume ();
-
- if (status = rmtclose (archive), status < 0)
- WARN ((0, errno, _("WARNING: Cannot close %s (%d, %d)"),
- *archive_name_cursor, archive, status));
+ flush_read_ptr = gnu_flush_read;
+ flush_write_ptr = gnu_flush_write;
- global_volno++;
- volno++;
- archive_name_cursor++;
- if (archive_name_cursor == archive_name_array + archive_names)
+ _open_archive (wanted_access);
+ switch (wanted_access)
{
- archive_name_cursor = archive_name_array;
- looped = 1;
- }
-
- tryagain:
- if (looped)
- {
- /* We have to prompt from now on. */
-
- if (info_script_option)
- {
- if (volno_file_option)
- closeout_volume_number ();
- system (info_script_option);
- }
- else
- while (1)
- {
- char input_buffer[80];
-
- fputc ('\007', stderr);
- fprintf (stderr,
- _("Prepare volume #%d for %s and hit return: "),
- global_volno, *archive_name_cursor);
- fflush (stderr);
-
- if (fgets (input_buffer, sizeof (input_buffer), read_file) == 0)
- {
- fprintf (stderr, _("EOF where user reply was expected"));
-
- if (subcommand_option != EXTRACT_SUBCOMMAND
- && subcommand_option != LIST_SUBCOMMAND
- && subcommand_option != DIFF_SUBCOMMAND)
- WARN ((0, 0, _("WARNING: Archive is incomplete")));
-
- apply_delayed_set_stat ();
- exit (TAREXIT_FAILURE);
- }
- if (input_buffer[0] == '\n'
- || input_buffer[0] == 'y'
- || input_buffer[0] == 'Y')
- break;
-
- switch (input_buffer[0])
- {
- case '?':
- {
- fprintf (stderr, _("\
- n [name] Give a new file name for the next (and subsequent) volume(s)\n\
- q Abort tar\n\
- ! Spawn a subshell\n\
- ? Print this list\n"));
- }
- break;
-
- case 'q':
- /* Quit. */
-
- fprintf (stdlis, _("No new volume; exiting.\n"));
-
- if (subcommand_option != EXTRACT_SUBCOMMAND
- && subcommand_option != LIST_SUBCOMMAND
- && subcommand_option != DIFF_SUBCOMMAND)
- WARN ((0, 0, _("WARNING: Archive is incomplete")));
-
- apply_delayed_set_stat ();
- exit (TAREXIT_FAILURE);
-
- case 'n':
- /* Get new file name. */
-
- {
- char *name = &input_buffer[1];
- char *cursor;
-
- while (*name == ' ' || *name == '\t')
- name++;
- cursor = name;
- while (*cursor && *cursor != '\n')
- cursor++;
- *cursor = '\0';
-
- /* FIXME: the following allocation is never reclaimed. */
- *archive_name_cursor = xstrdup (name);
- }
- break;
-
- case '!':
-#if MSDOS
- spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
-#else /* not MSDOS */
- {
- pid_t child = fork ();
- switch (child)
- {
- case -1:
- WARN ((0, errno, _("Cannot fork!")));
- break;
-
- case 0:
- {
- const char *shell = getenv ("SHELL");
-
- if (shell == NULL)
- shell = "/bin/sh";
- execlp (shell, "-sh", "-i", 0);
- FATAL_ERROR ((0, errno, _("Cannot exec a shell %s"),
- shell));
- }
-
- default:
- {
- int wait_status;
- while (waitpid (child, &wait_status, 0) == -1)
- if (errno != EINTR)
- {
- ERROR ((0, errno,
- _("While waiting for child")));
- break;
- }
- }
- break;
- }
- }
-#endif /* not MSDOS */
- break;
- }
- }
- }
-
- if (verify_option)
- archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
- rsh_command_option);
- else
- switch (access)
- {
- case ACCESS_READ:
- archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
- rsh_command_option);
- break;
-
- case ACCESS_WRITE:
- if (backup_option)
- maybe_backup_file (*archive_name_cursor, 1);
- archive = rmtcreat (*archive_name_cursor, MODE_RW,
- rsh_command_option);
- break;
+ case ACCESS_READ:
+ if (volume_label_option)
+ match_volume_label ();
+ break;
- case ACCESS_UPDATE:
- archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
- rsh_command_option);
- break;
- }
+ case ACCESS_WRITE:
+ records_written = 0;
+ if (volume_label_option)
+ write_volume_label ();
+ break;
- if (archive < 0)
- {
- WARN ((0, errno, _("Cannot open %s"), *archive_name_cursor));
- if (!verify_option && access == ACCESS_WRITE && backup_option)
- undo_last_backup ();
- goto tryagain;
+ default:
+ break;
}
-
-#if MSDOS
- setmode (archive, O_BINARY);
-#endif
-
- return 1;
+ set_volume_start_time ();
}