/* Buffer management for tar.
Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
- 2003 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Written by John Gilmore, on 1985-08-25.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include "system.h"
+#include <system.h>
#include <signal.h>
-#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 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
/* 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 void *record_buffer[2]; /* allocated memory */
+static int record_index;
/* FIXME: The following variables should ideally be static to this
module. However, this cannot be done yet. The cleanup continues! */
off_t records_read; /* number of records read from this archive */
off_t records_written; /* likewise, for records written */
-static struct stat archive_stat; /* stat block for archive file */
-
static off_t record_start_block; /* block ordinal at record_start */
/* Where we write list messages (not errors, not interactions) to. */
FILE *stdlis;
static void backspace_output (void);
-static int new_volume (enum access_mode);
-static void archive_write_error (ssize_t) __attribute__ ((noreturn));
-static void archive_read_error (void);
-
-#if !MSDOS
-/* Obnoxious test to see if dimwit is trying to dump the archive. */
-dev_t ar_dev;
-ino_t ar_ino;
-#endif
/* 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;
/* 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;
+static bool read_full_records = false;
+
+/* We're reading, but we just read the last block and it's time to update.
+ Declared in update.c
+
+ 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;
+
+bool write_archive_to_stdout;
+
+void (*flush_write_ptr) (size_t);
+void (*flush_read_ptr) (void);
-int file_to_switch_to = -1; /* if remote update, close archive, and use
- this descriptor to write to */
+\f
+char *volume_label;
+char *continued_file_name;
+uintmax_t continued_file_size;
+uintmax_t continued_file_offset;
+\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 */
-/* 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.) */
-
-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 nonzero */
-off_t save_sizeleft; /* where we are in the file we are writing,
- only valid if save_name is nonzero */
-
bool write_archive_to_stdout;
/* Used by flush_read and flush_write to store the real info about saved
static char *real_s_name;
static off_t real_s_totsize;
static off_t real_s_sizeleft;
+
+\f
+/* 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 */
+
+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;
+}
+
+\f
+/* Time-related functions */
+
+double duration;
+
+void
+set_start_time ()
+{
+ gettime (&start_time);
+}
+
+void
+compute_duration ()
+{
+ struct timespec now;
+ gettime (&now);
+ duration += ((now.tv_sec - start_time.tv_sec)
+ + (now.tv_nsec - start_time.tv_nsec) / 1e9);
+ set_start_time ();
+}
+
+\f
+/* Compression detection */
+
+enum compress_type {
+ ct_none,
+ ct_compress,
+ ct_gzip,
+ ct_bzip2
+};
+
+struct zip_magic
+{
+ enum compress_type type;
+ size_t length;
+ char *magic;
+ char *program;
+ char *option;
+};
+
+static struct zip_magic const magic[] = {
+ { ct_none, },
+ { ct_compress, 2, "\037\235", "compress", "-Z" },
+ { ct_gzip, 2, "\037\213", "gzip", "-z" },
+ { ct_bzip2, 3, "BZh", "bzip2", "-j" },
+};
+
+#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 ()
+{
+ struct zip_magic const *p;
+ bool sfr;
+
+ /* 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 */
+ find_next_block ();
+
+ /* Restore global values */
+ read_full_records = sfr;
+
+ if (tar_checksum (record_start, true) == HEADER_SUCCESS)
+ /* Probably a valid header */
+ return ct_none;
+
+ for (p = magic + 1; 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)
+ {
+ enum compress_type type = check_compressed_archive ();
+
+ if (type == ct_none)
+ return archive;
+
+ /* 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 */
+ use_compress_program_option = compress_program (type);
+ 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
+
void
print_total_written (void)
{
char bytes[sizeof (tarlong) * CHAR_BIT];
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;
- if (clock_gettime (CLOCK_REALTIME, &now) == 0)
- seconds = ((now.tv_sec - start_timespec.tv_sec)
- + (now.tv_nsec - start_timespec.tv_nsec) / 1e9);
- else
-#endif
- seconds = time (0) - start_time;
+ int human_opts = human_autoscale | human_base_1024 | human_SI | human_B;
sprintf (bytes, TARLONG_FORMAT, written);
/* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */
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 (written / seconds, rate, human_opts, 1, 1)
+ (0 < duration && written / duration < (uintmax_t) -1
+ ? human_readable (written / duration, rate, human_opts, 1, 1)
: "?"));
}
{
if (hit_eof)
{
- hit_eof = 0;
+ hit_eof = false;
current_block = record_start;
record_end = record_start + blocking_factor;
access_mode = ACCESS_WRITE;
flush_archive ();
if (current_block == record_end)
{
- hit_eof = 1;
+ 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)
{
/* 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. */
+ usually (but not always) the result of previous find_next_block call. */
size_t
available_space_after (union block *pointer)
{
}
/* Close file having descriptor FD, and abort if close unsuccessful. */
-static void
+void
xclose (int fd)
{
if (close (fd) != 0)
close_error (_("(pipe)"));
}
-/* Duplicate file descriptor FROM into becoming INTO.
- INTO is closed first and has to be the next available slot. */
static void
-xdup2 (int from, int into)
+init_buffer ()
{
- if (from != into)
- {
- int status = close (into);
-
- if (status != 0 && errno != EBADF)
- {
- int e = errno;
- FATAL_ERROR ((0, e, _("Cannot close")));
- }
- status = dup (from);
- if (status != into)
- {
- if (status < 0)
- {
- int e = errno;
- FATAL_ERROR ((0, e, _("Cannot dup")));
- }
- abort ();
- }
- xclose (from);
- }
-}
+ if (!record_buffer[record_index])
+ page_aligned_alloc (&record_buffer[record_index], record_size);
-#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")));
+ record_start = record_buffer[record_index];
+ current_block = record_start;
+ record_end = record_start + blocking_factor;
}
-/* Set ARCHIVE for uncompressing, then reading an archive. */
+/* Open an archive file. The argument specifies whether we are
+ reading or writing, or both. */
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)
+_open_archive (enum access_mode wanted_access)
{
- ssize_t status;
- ssize_t written = 0;
+ int backed_up_flag = 0;
- while (0 <= (status = rmtwrite (archive, record_start->buffer + written,
- record_size - written)))
+ if (index_file_name)
{
- written += status;
- if (written == record_size
- || _isrmt (archive)
- || ! (S_ISFIFO (archive_stat.st_mode)
- || S_ISSOCK (archive_stat.st_mode)))
- break;
+ stdlis = freopen (index_file_name, "w", stdout);
+ if (! stdlis)
+ open_error (index_file_name);
+ close_stdout_set_file_name (index_file_name);
}
+ else
+ stdlis = to_stdout_option ? stderr : stdout;
- 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;
- int wait_status;
-
- xpipe (parent_pipe);
- child_pid = xfork ();
+ if (record_size == 0)
+ FATAL_ERROR ((0, 0, _("Invalid value for record_size")));
- if (child_pid > 0)
- {
- /* The parent tar is still here! Just clean up. */
+ if (archive_names == 0)
+ FATAL_ERROR ((0, 0, _("No archive name given")));
- archive = parent_pipe[PWRITE];
- xclose (parent_pipe[PREAD]);
- return;
- }
+ tar_stat_destroy (¤t_stat_info);
+ save_name = 0;
+ real_s_name = 0;
- /* The new born child tar is here! */
+ record_index = 0;
+ init_buffer ();
- program_name = _("tar (child)");
+ /* When updating the archive, we start with reading. */
+ access_mode = wanted_access == ACCESS_UPDATE ? ACCESS_READ : wanted_access;
- xdup2 (parent_pipe[PREAD], STDIN_FILENO);
- xclose (parent_pipe[PWRITE]);
+ read_full_records = read_full_records_option;
- /* 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. */
+ records_read = 0;
- if (strcmp (archive_name_array[0], "-") != 0
- && !_remdev (archive_name_array[0])
- && is_regular_file (archive_name_array[0]))
+ if (use_compress_program_option)
{
- 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)
+ switch (wanted_access)
{
- int saved_errno = errno;
-
- if (backup_option)
- undo_last_backup ();
- errno = saved_errno;
- open_fatal (archive_name_array[0]);
- }
- xdup2 (archive, STDOUT_FILENO);
- 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 newborn grandchild tar is here! Launch the compressor. */
-
- program_name = _("tar (grandchild)");
-
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO);
- xclose (child_pipe[PREAD]);
- execlp (use_compress_program_option, use_compress_program_option,
- (char *) 0);
- exec_fatal (use_compress_program_option);
- }
-
- /* The child tar is still here! */
+ 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;
- /* Prepare for reblocking the data from the compressor into the archive. */
+ case ACCESS_WRITE:
+ child_pid = sys_child_open_for_compress ();
+ break;
- xdup2 (child_pipe[PREAD], STDIN_FILENO);
- xclose (child_pipe[PWRITE]);
+ case ACCESS_UPDATE:
+ abort (); /* Should not happen */
+ break;
+ }
- 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]);
+ if (wanted_access == ACCESS_WRITE
+ && strcmp (archive_name_array[0], "-") == 0)
+ stdlis = stderr;
}
-
- /* Let's read out of the stdin pipe and write an archive. */
-
- while (1)
+ else if (strcmp (archive_name_array[0], "-") == 0)
{
- ssize_t status = 0;
- char *cursor;
- size_t length;
-
- /* Assemble a record. */
+ read_full_records = true; /* could be a pipe, be safe */
+ if (verify_option)
+ FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive")));
- for (length = 0, cursor = record_start->buffer;
- length < record_size;
- length += status, cursor += status)
+ switch (wanted_access)
{
- size_t size = record_size - length;
-
- status = safe_read (STDIN_FILENO, cursor, size);
- if (status <= 0)
- break;
- }
-
- if (status < 0)
- read_fatal (use_compress_program_option);
+ case ACCESS_READ:
+ {
+ enum compress_type type;
- /* Copy the record. */
+ archive = STDIN_FILENO;
- 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. */
+ type = check_compressed_archive (archive);
+ if (type != ct_none)
+ FATAL_ERROR ((0, 0,
+ _("Archive is compressed. Use %s option"),
+ compress_option (type)));
+ }
+ break;
- if (length > 0)
- {
- memset (record_start->buffer + length, 0, record_size - length);
- status = write_archive_buffer ();
- if (status != record_size)
- archive_write_error (status);
- }
+ case ACCESS_WRITE:
+ archive = STDOUT_FILENO;
+ stdlis = stderr;
+ break;
- /* There is nothing else to read, break out. */
+ case ACCESS_UPDATE:
+ archive = STDIN_FILENO;
+ stdlis = stderr;
+ write_archive_to_stdout = true;
break;
}
-
- status = write_archive_buffer ();
- if (status != record_size)
- archive_write_error (status);
}
+ 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;
-#if 0
- close_archive ();
-#endif
-
- /* Propagate any failure of the grandchild back to the parent. */
+ 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;
- while (waitpid (grandchild_pid, &wait_status, 0) == -1)
- if (errno != EINTR)
- {
- waitpid_error (use_compress_program_option);
+ case ACCESS_UPDATE:
+ archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
+ MODE_RW, rsh_command_option);
break;
}
- if (WIFSIGNALED (wait_status))
+ if (archive < 0
+ || (! _isrmt (archive) && !sys_get_archive_stat ()))
{
- kill (child_pid, WTERMSIG (wait_status));
- exit_status = TAREXIT_FAILURE;
- }
- else if (WEXITSTATUS (wait_status) != 0)
- exit_status = WEXITSTATUS (wait_status);
-
- exit (exit_status);
-}
+ int saved_errno = errno;
-/* 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;
- int wait_status;
+ if (backed_up_flag)
+ undo_last_backup ();
+ errno = saved_errno;
+ open_fatal (archive_name_array[0]);
+ }
- xpipe (parent_pipe);
- child_pid = xfork ();
+ sys_detect_dev_null_output ();
+ sys_save_archive_dev_ino ();
+ SET_BINARY_MODE (archive);
- if (child_pid > 0)
+ switch (wanted_access)
{
- /* The parent tar is still here! Just clean up. */
-
- read_full_records_option = 1;
- archive = parent_pipe[PREAD];
- xclose (parent_pipe[PWRITE]);
- return;
- }
+ case ACCESS_UPDATE:
+ records_written = 0;
+ record_end = record_start; /* set up for 1st record = # 0 */
- /* The newborn child tar is here! */
+ case ACCESS_READ:
+ find_next_block (); /* read it in, check for EOF */
+ break;
- program_name = _("tar (child)");
+ case ACCESS_WRITE:
+ records_written = 0;
+ break;
+ }
+}
- xdup2 (parent_pipe[PWRITE], STDOUT_FILENO);
- xclose (parent_pipe[PREAD]);
+/* Perform a write to flush the buffer. */
+ssize_t
+_flush_write (void)
+{
+ ssize_t status;
- /* 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 (checkpoint_option && !(++checkpoint % 10))
+ /* TRANSLATORS: This is a ``checkpoint of write operation'',
+ *not* ``Writing a checkpoint''.
+ E.g. in Spanish ``Punto de comprobaci@'on de escritura'',
+ *not* ``Escribiendo un punto de comprobaci@'on'' */
+ WARN ((0, 0, _("Write checkpoint %d"), checkpoint));
- if (strcmp (archive_name_array[0], "-") != 0
- && !_remdev (archive_name_array[0])
- && is_regular_file (archive_name_array[0]))
+ if (tape_length_option && tape_length_option <= bytes_written)
{
- /* 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);
- execlp (use_compress_program_option, use_compress_program_option,
- "-d", (char *) 0);
- exec_fatal (use_compress_program_option);
+ errno = ENOSPC;
+ status = 0;
}
+ else if (dev_null_output)
+ status = record_size;
+ else
+ status = sys_write_archive_buffer ();
- /* We do need a grandchild tar. */
-
- xpipe (child_pipe);
- grandchild_pid = xfork ();
+ return status;
+}
- 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 newborn grandchild tar is here! Launch the uncompressor. */
-
- program_name = _("tar (grandchild)");
-
- xdup2 (child_pipe[PREAD], STDIN_FILENO);
- xclose (child_pipe[PWRITE]);
- execlp (use_compress_program_option, use_compress_program_option,
- "-d", (char *) 0);
- exec_fatal (use_compress_program_option);
+ int e = errno;
+ print_total_written ();
+ errno = e;
}
- /* The child tar is still here! */
+ write_fatal_details (*archive_name_cursor, status, record_size);
+}
- /* Prepare for unblocking the data from the archive into the
- uncompressor. */
+/* 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);
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO);
- xclose (child_pipe[PREAD]);
+ if (record_start_block == 0)
+ FATAL_ERROR ((0, 0, _("At beginning of tape, quitting now")));
- 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]);
+ /* Read error in mid archive. We retry up to READ_ERROR_MAX times and
+ then give up on reading the archive. */
- /* Let's read the archive and pipe it into stdout. */
+ if (read_error_count++ > READ_ERROR_MAX)
+ FATAL_ERROR ((0, 0, _("Too many errors, quitting")));
+ return;
+}
- while (1)
- {
- char *cursor;
- size_t maximum;
- size_t count;
- ssize_t status;
+static void
+short_read (size_t status)
+{
+ size_t left; /* bytes left */
+ char *more; /* pointer to next byte to read */
- read_error_count = 0;
+ more = record_start->buffer + status;
+ left = record_size - status;
- error_loop:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
- {
+ while (left % BLOCKSIZE != 0
+ || (left && status && read_full_records))
+ {
+ if (status)
+ while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR)
archive_read_error ();
- goto error_loop;
- }
+
if (status == 0)
break;
- cursor = record_start->buffer;
- maximum = status;
- while (maximum)
+
+ if (! read_full_records)
{
- count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE;
- if (full_write (STDOUT_FILENO, cursor, count) != count)
- write_error (use_compress_program_option);
- cursor += count;
- maximum -= count;
+ 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));
}
- }
- xclose (STDOUT_FILENO);
-#if 0
- close_archive ();
-#endif
+ /* User warned us about this. Fix up. */
- /* Propagate any failure of the grandchild back to the parent. */
+ left -= status;
+ more += status;
+ }
- while (waitpid (grandchild_pid, &wait_status, 0) == -1)
- if (errno != EINTR)
- {
- waitpid_error (use_compress_program_option);
- break;
- }
+ /* FIXME: for size=0, multi-volume support. On the first record, warn
+ about the problem. */
- if (WIFSIGNALED (wait_status))
+ if (!read_full_records && verbose_option > 1
+ && record_start_block == 0 && status != 0)
{
- kill (child_pid, WTERMSIG (wait_status));
- exit_status = TAREXIT_FAILURE;
+ unsigned long rsize = (record_size - left) / BLOCKSIZE;
+ WARN ((0, 0,
+ ngettext ("Record size = %lu block",
+ "Record size = %lu blocks",
+ rsize),
+ rsize));
}
- else if (WEXITSTATUS (wait_status) != 0)
- exit_status = WEXITSTATUS (wait_status);
- exit (exit_status);
+ record_end = record_start + (record_size - left) / BLOCKSIZE;
+ records_read++;
}
-#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_label_pattern (union block *label)
+/* Perform a read to flush the buffer. */
+size_t
+_flush_read (void)
{
- char *string;
- int result;
+ size_t status; /* result from system call */
- if (! memchr (label->header.name, '\0', sizeof label->header.name))
- return 0;
+ if (checkpoint_option && !(++checkpoint % 10))
+ /* TRANSLATORS: This is a ``checkpoint of read operation'',
+ *not* ``Reading a checkpoint''.
+ E.g. in Spanish ``Punto de comprobaci@'on de lectura'',
+ *not* ``Leyendo un punto de comprobaci@'on'' */
+ WARN ((0, 0, _("Read checkpoint %d"), checkpoint));
- if (fnmatch (volume_label_option, label->header.name, 0) == 0)
- return 1;
+ /* Clear the count of errors. This only applies to a single call to
+ flush_read. */
- if (!multi_volume_option)
- return 0;
+ read_error_count = 0; /* clear error count */
- 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 (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);
+ }
+
+ status = rmtread (archive, record_start->buffer, record_size);
+ if (status == record_size)
+ records_read++;
+ return status;
}
-/* Open an archive file. The argument specifies whether we are
- reading or writing, or both. */
+/* Flush the current buffer to/from the archive. */
void
-open_archive (enum access_mode wanted_access)
+flush_archive (void)
{
- int backed_up_flag = 0;
+ 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;
- if (index_file_name)
+ if (access_mode == ACCESS_READ && time_to_start_writing)
{
- stdlis = fopen (index_file_name, "w");
- if (! stdlis)
- open_error (index_file_name);
+ access_mode = ACCESS_WRITE;
+ time_to_start_writing = false;
+ backspace_output ();
}
- 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")));
+ switch (access_mode)
+ {
+ case ACCESS_READ:
+ flush_read ();
+ break;
- current_file_name = 0;
- current_link_name = 0;
- save_name = 0;
- real_s_name = 0;
+ case ACCESS_WRITE:
+ flush_write_ptr (buffer_level);
+ break;
- 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;
+ case ACCESS_UPDATE:
+ abort ();
}
- else
- record_start = valloc (record_size);
- if (!record_start)
- FATAL_ERROR ((0, 0, _("Cannot 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 = wanted_access == ACCESS_UPDATE ? ACCESS_READ : wanted_access;
+/* 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;
- 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")));
+ 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
- switch (wanted_access)
- {
- case ACCESS_READ:
- child_open_for_uncompress ();
- break;
+ {
+ off_t position = rmtlseek (archive, (off_t) 0, SEEK_CUR);
- case ACCESS_WRITE:
- child_open_for_compress ();
- break;
+ /* Seek back to the beginning of this record and start writing there. */
- case ACCESS_UPDATE:
- FATAL_ERROR ((0, 0, _("Cannot update compressed archives")));
- break;
- }
+ position -= record_size;
+ if (position < 0)
+ position = 0;
+ if (rmtlseek (archive, position, SEEK_SET) != position)
+ {
+ /* Lseek failed. Try a different method. */
- if (wanted_access == ACCESS_WRITE
- && strcmp (archive_name_array[0], "-") == 0)
- stdlis = stderr;
- }
- else if (strcmp (archive_name_array[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")));
+ WARN ((0, 0,
+ _("Cannot backspace archive file; it may be unreadable without -i")));
- switch (wanted_access)
- {
- case ACCESS_READ:
- archive = STDIN_FILENO;
- break;
+ /* Replace the first part of the record with NULs. */
- case ACCESS_WRITE:
- archive = STDOUT_FILENO;
- stdlis = stderr;
- break;
+ if (record_start->buffer != output_start)
+ memset (record_start->buffer, 0,
+ output_start - record_start->buffer);
+ }
+ }
+}
- case ACCESS_UPDATE:
- archive = STDIN_FILENO;
- stdlis = stderr;
- write_archive_to_stdout = 1;
- 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 = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
- MODE_RW, rsh_command_option);
- break;
+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));
- 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;
+ size -= skipped * BLOCKSIZE;
- case ACCESS_UPDATE:
- archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
- MODE_RW, rsh_command_option);
- break;
- }
+ if (size < record_size)
+ return 0;
+ /* FIXME: flush? */
- if (archive < 0
- || (! _isrmt (archive) && fstat (archive, &archive_stat) < 0))
- {
- int saved_errno = errno;
+ /* Compute number of records to skip */
+ nrec = size / record_size;
+ offset = rmtlseek (archive, nrec * record_size, SEEK_CUR);
+ if (offset < 0)
+ return offset;
- if (backed_up_flag)
- undo_last_backup ();
- errno = saved_errno;
- open_fatal (archive_name_array[0]);
- }
+ if (offset % record_size)
+ FATAL_ERROR ((0, 0, _("rmtlseek not stopped at a record boundary")));
-#if !MSDOS
+ /* Convert to number of records */
+ offset /= BLOCKSIZE;
+ /* Compute number of skipped blocks */
+ nblk = offset - start;
- /* 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
- && archive_stat.st_dev == dev_null_stat.st_dev
- && archive_stat.st_ino == dev_null_stat.st_ino));
- }
+ /* Update buffering info */
+ records_read += nblk / blocking_factor;
+ record_start_block = offset - blocking_factor;
+ current_block = record_end;
- 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;
+ return nblk;
+}
-#endif /* not MSDOS */
+/* 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 MSDOS
- setmode (archive, O_BINARY);
-#endif
+ sys_drain_input_pipe ();
- switch (wanted_access)
- {
- 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 */
+ compute_duration ();
+ if (verify_option)
+ verify_volume ();
- if (volume_label_option)
- {
- 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)));
- }
- break;
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
- case ACCESS_WRITE:
- records_written = 0;
- if (volume_label_option)
- {
- memset (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);
- current_trailing_slash = strip_trailing_slashes (current_file_name);
-
- record_start->header.typeflag = GNUTYPE_VOLHDR;
- TIME_TO_CHARS (start_time, record_start->header.mtime);
- finish_header (record_start, -1);
-#if 0
- current_block++;
-#endif
- }
- break;
- }
+ sys_wait_for_child (child_pid);
+
+ 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]);
}
-/* Perform a write to flush the buffer. */
+/* Called to initialize the global volume number. */
void
-flush_write (void)
+init_volume_number (void)
{
- int copy_back;
- ssize_t status;
-
- if (checkpoint_option && !(++checkpoint % 10))
- WARN ((0, 0, _("Write checkpoint %d"), checkpoint));
+ FILE *file = fopen (volno_file_option, "r");
- if (tape_length_option && tape_length_option <= bytes_written)
+ if (file)
{
- errno = ENOSPC;
- status = 0;
+ 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 (dev_null_output)
- status = record_size;
- else
- status = write_archive_buffer ();
- if (status != record_size && !multi_volume_option)
- archive_write_error (status);
+ else if (errno != ENOENT)
+ open_error (volno_file_option);
+}
- if (status > 0)
- {
- records_written++;
- bytes_written += status;
- }
+/* Called to write out the closing global volume number. */
+void
+closeout_volume_number (void)
+{
+ FILE *file = fopen (volno_file_option, "w");
- if (status == record_size)
+ if (file)
{
- if (multi_volume_option)
- {
- if (save_name)
- {
- assign_string (&real_s_name, safer_name_suffix (save_name, 0));
- real_s_totsize = save_totsize;
- real_s_sizeleft = save_sizeleft;
- }
- else
- {
- assign_string (&real_s_name, 0);
- real_s_totsize = 0;
- real_s_sizeleft = 0;
- }
- }
- return;
+ 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);
+}
- /* We're multivol. Panic if we didn't get the right kind of response. */
-
- /* ENXIO is for the UNIX PC. */
- if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
- archive_write_error (status);
-
- /* If error indicates a short write, we just move to the next tape. */
-
- if (!new_volume (ACCESS_WRITE))
- return;
+\f
+static void
+increase_volume_number ()
+{
+ global_volno++;
+ if (global_volno < 0)
+ FATAL_ERROR ((0, 0, _("Volume number overflow")));
+ volno++;
+}
- if (totals_option)
- prev_written += bytes_written;
- bytes_written = 0;
+void
+change_tape_menu (FILE *read_file)
+{
+ char *input_buffer = NULL;
+ size_t size = 0;
- if (volume_label_option && real_s_name)
- {
- copy_back = 2;
- record_start -= 2;
- }
- else if (volume_label_option || real_s_name)
+ while (1)
{
- copy_back = 1;
- record_start--;
- }
- else
- copy_back = 0;
+ fputc ('\007', stderr);
+ fprintf (stderr,
+ _("Prepare volume #%d for %s and hit return: "),
+ global_volno + 1, quote (*archive_name_cursor));
+ fflush (stderr);
- if (volume_label_option)
- {
- memset (record_start, 0, BLOCKSIZE);
- sprintf (record_start->header.name, "%s Volume %d",
- volume_label_option, volno);
- TIME_TO_CHARS (start_time, record_start->header.mtime);
- record_start->header.typeflag = GNUTYPE_VOLHDR;
- finish_header (record_start, -1);
- }
+ if (getline (&input_buffer, &size, read_file) <= 0)
+ {
+ WARN ((0, 0, _("EOF where user reply was expected")));
- if (real_s_name)
- {
- int tmp;
+ if (subcommand_option != EXTRACT_SUBCOMMAND
+ && subcommand_option != LIST_SUBCOMMAND
+ && subcommand_option != DIFF_SUBCOMMAND)
+ WARN ((0, 0, _("WARNING: Archive is incomplete")));
- if (volume_label_option)
- record_start++;
+ fatal_exit ();
+ }
- memset (record_start, 0, BLOCKSIZE);
+ if (input_buffer[0] == '\n'
+ || input_buffer[0] == 'y'
+ || input_buffer[0] == 'Y')
+ break;
- /* 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. */
+ 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;
- 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, -1);
- verbose_option = tmp;
+ case 'q':
+ /* Quit. */
- if (volume_label_option)
- record_start--;
- }
+ WARN ((0, 0, _("No new volume; exiting.\n")));
- status = write_archive_buffer ();
- if (status != record_size)
- archive_write_error (status);
+ if (subcommand_option != EXTRACT_SUBCOMMAND
+ && subcommand_option != LIST_SUBCOMMAND
+ && subcommand_option != DIFF_SUBCOMMAND)
+ WARN ((0, 0, _("WARNING: Archive is incomplete")));
- bytes_written += status;
+ fatal_exit ();
- if (copy_back)
- {
- record_start += copy_back;
- memcpy (current_block,
- record_start + blocking_factor - copy_back,
- 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)
- assign_string (&real_s_name, 0);
- else
- {
- assign_string (&real_s_name, safer_name_suffix (save_name, 0));
- real_s_sizeleft = save_sizeleft;
- real_s_totsize = save_totsize;
- }
- copy_back = 0;
- }
-}
+ case 'n':
+ /* Get new 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. */
-static void
-archive_write_error (ssize_t status)
-{
- /* It might be useful to know how much was written before the error
- occurred. */
- if (totals_option)
- {
- int e = errno;
- print_total_written ();
- errno = e;
- }
+ {
+ char *name;
+ char *cursor;
- write_fatal_details (*archive_name_cursor, status, record_size);
-}
+ for (name = input_buffer + 1;
+ *name == ' ' || *name == '\t';
+ name++)
+ ;
-/* Handle read errors on the archive. If the read should be retried,
- return to the caller. */
-static void
-archive_read_error (void)
-{
- read_error (*archive_name_cursor);
+ for (cursor = name; *cursor && *cursor != '\n'; cursor++)
+ ;
+ *cursor = '\0';
- if (record_start_block == 0)
- FATAL_ERROR ((0, 0, _("At beginning of tape, quitting now")));
+ /* FIXME: the following allocation is never reclaimed. */
+ *archive_name_cursor = xstrdup (name);
+ }
+ break;
- /* Read error in mid archive. We retry up to READ_ERROR_MAX times and
- then give up on reading the archive. */
+ case '!':
+ if (!restrict_option)
+ {
+ sys_spawn_shell ();
+ break;
+ }
+ /* FALL THROUGH */
- if (read_error_count++ > READ_ERROR_MAX)
- FATAL_ERROR ((0, 0, _("Too many errors, quitting")));
- return;
+ default:
+ fprintf (stderr, _("Invalid input. Type ? for help.\n"));
+ }
+ }
+ free (input_buffer);
}
-/* Perform a read to flush the buffer. */
-void
-flush_read (void)
+/* 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)
{
- ssize_t status; /* result from system call */
- size_t left; /* bytes left */
- char *more; /* pointer to next byte to read */
+ static FILE *read_file;
+ static int looped;
- if (checkpoint_option && !(++checkpoint % 10))
- WARN ((0, 0, _("Read checkpoint %d"), checkpoint));
+ 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;
- /* Clear the count of errors. This only applies to a single call to
- flush_read. */
+ if (now_verifying)
+ return false;
+ if (verify_option)
+ verify_volume ();
- read_error_count = 0; /* clear error count */
+ assign_string (&volume_label, NULL);
+ assign_string (&continued_file_name, NULL);
+ continued_file_size = continued_file_offset = 0;
- if (write_archive_to_stdout && record_start_block != 0)
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
+
+ archive_name_cursor++;
+ if (archive_name_cursor == archive_name_array + archive_names)
{
- archive = STDOUT_FILENO;
- status = write_archive_buffer ();
- archive = STDIN_FILENO;
- if (status != record_size)
- archive_write_error (status);
+ archive_name_cursor = archive_name_array;
+ looped = 1;
}
- if (multi_volume_option)
+
+ tryagain:
+ if (looped)
{
- if (save_name)
+ /* We have to prompt from now on. */
+
+ if (info_script_option)
{
- assign_string (&real_s_name, safer_name_suffix (save_name, 0));
- real_s_sizeleft = save_sizeleft;
- real_s_totsize = save_totsize;
+ 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
- {
- assign_string (&real_s_name, 0);
- real_s_totsize = 0;
- real_s_sizeleft = 0;
- }
+ change_tape_menu (read_file);
}
- error_loop:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status == record_size)
+ if (strcmp (archive_name_cursor[0], "-") == 0)
{
- records_read++;
- return;
+ read_full_records = true;
+ archive = STDIN_FILENO;
}
+ else if (verify_option)
+ archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
+ rsh_command_option);
+ else
+ switch (mode)
+ {
+ case ACCESS_READ:
+ archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
+ rsh_command_option);
+ break;
- if ((status == 0
- || (status < 0 && errno == ENOSPC)
- || (status > 0 && !read_full_records_option))
- && multi_volume_option)
- {
- union block *cursor;
+ case ACCESS_WRITE:
+ if (backup_option)
+ maybe_backup_file (*archive_name_cursor, 1);
+ archive = rmtcreat (*archive_name_cursor, MODE_RW,
+ rsh_command_option);
+ break;
- try_volume:
- switch (subcommand_option)
- {
- case APPEND_SUBCOMMAND:
- case CAT_SUBCOMMAND:
- case UPDATE_SUBCOMMAND:
- if (!new_volume (ACCESS_UPDATE))
- return;
- break;
+ case ACCESS_UPDATE:
+ archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
+ rsh_command_option);
+ break;
+ }
- default:
- if (!new_volume (ACCESS_READ))
- return;
- break;
- }
+ if (archive < 0)
+ {
+ open_warn (*archive_name_cursor);
+ if (!verify_option && mode == ACCESS_WRITE && backup_option)
+ undo_last_backup ();
+ goto tryagain;
+ }
- vol_error:
- status = rmtread (archive, record_start->buffer, record_size);
- if (status < 0)
- {
- archive_read_error ();
- goto vol_error;
- }
- if (status != record_size)
- goto short_read;
+ SET_BINARY_MODE (archive);
- cursor = record_start;
+ return true;
+}
- if (cursor->header.typeflag == GNUTYPE_VOLHDR)
- {
- if (volume_label_option)
- {
- if (!check_label_pattern (cursor))
- {
- WARN ((0, 0, _("Volume %s does not match %s"),
- quote_n (0, cursor->header.name),
- quote_n (1, volume_label_option)));
- volno--;
- global_volno--;
- goto try_volume;
- }
- }
- if (verbose_option)
- fprintf (stdlis, _("Reading %s\n"), quote (cursor->header.name));
- cursor++;
- }
- else if (volume_label_option)
- WARN ((0, 0, _("WARNING: No volume header")));
+static bool
+read_header0 ()
+{
+ enum read_header rc = read_header (false);
- if (real_s_name)
- {
- 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"),
- quote (real_s_name)));
- volno--;
- global_volno--;
- goto try_volume;
- }
- s1 = UINTMAX_FROM_HEADER (cursor->header.size);
- s2 = UINTMAX_FROM_HEADER (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)"),
- quote (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_HEADER (cursor->oldgnu_header.offset))
- {
- WARN ((0, 0, _("This volume is out of sequence")));
- volno--;
- global_volno--;
- goto try_volume;
- }
- cursor++;
- }
- current_block = cursor;
- records_read++;
- return;
+ if (rc == HEADER_SUCCESS)
+ {
+ set_next_block_after (current_header);
+ return true;
}
- else if (status < 0)
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ return false;
+}
+
+bool
+try_new_volume ()
+{
+ size_t status;
+ union block *header;
+
+ switch (subcommand_option)
{
- archive_read_error ();
- goto error_loop; /* try again */
+ case APPEND_SUBCOMMAND:
+ case CAT_SUBCOMMAND:
+ case UPDATE_SUBCOMMAND:
+ if (!new_volume (ACCESS_UPDATE))
+ return true;
+ break;
+
+ default:
+ if (!new_volume (ACCESS_READ))
+ return true;
+ break;
}
- short_read:
- more = record_start->buffer + status;
- left = record_size - status;
+ while ((status = rmtread (archive, record_start->buffer, record_size))
+ == SAFE_READ_ERROR)
+ archive_read_error ();
- while (left % BLOCKSIZE != 0
- || (left && status && read_full_records_option))
+ if (status != record_size)
+ short_read (status);
+
+ header = find_next_block ();
+ if (!header)
+ return false;
+ switch (header->header.typeflag)
{
- if (status)
- while ((status = rmtread (archive, more, left)) < 0)
- archive_read_error ();
+ case XGLTYPE:
+ {
+ struct tar_stat_info dummy;
+ if (!read_header0 ())
+ return false;
+ tar_stat_init (&dummy);
+ 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)
+ case GNUTYPE_VOLHDR:
+ if (!read_header0 ())
+ return false;
+ 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 ())
+ return false;
+ 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 (! read_full_records_option)
- FATAL_ERROR ((0, 0, _("Unaligned block (%lu bytes) in archive"),
- (unsigned long) (record_size - left)));
+ default:
+ break;
+ }
- /* User warned us about this. Fix up. */
+ if (real_s_name)
+ {
+ uintmax_t s;
+ if (!continued_file_name
+ || strcmp (continued_file_name, real_s_name))
+ {
+ WARN ((0, 0, _("%s is not continued on this volume"),
+ quote (real_s_name)));
+ return false;
+ }
- left -= status;
- more += status;
+ 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)
+ {
+ WARN ((0, 0, _("This volume is out of sequence")));
+ return false;
+ }
}
- /* FIXME: for size=0, multi-volume support. On the first record, warn
- about the problem. */
+ increase_volume_number ();
+ return true;
+}
+
+\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 (!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)));
+ if (! memchr (label->header.name, '\0', sizeof label->header.name))
+ return false;
- record_end = record_start + (record_size - left) / BLOCKSIZE;
- records_read++;
+ if (fnmatch (volume_label_option, label->header.name, 0) == 0)
+ return true;
+
+ if (!multi_volume_option)
+ return false;
+
+ 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;
}
-/* Flush the current buffer to/from the archive. */
-void
-flush_archive (void)
+/* 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)
{
- record_start_block += record_end - record_start;
- current_block = record_start;
- record_end = record_start + blocking_factor;
+ 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 (access_mode == ACCESS_READ && time_to_start_writing)
+/* 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", NULL, str);
+ else
{
- access_mode = ACCESS_WRITE;
- time_to_start_writing = 0;
+ union block *label = find_next_block ();
- if (file_to_switch_to >= 0)
- {
- if (rmtclose (archive) != 0)
- close_warn (*archive_name_cursor);
+ memset (label, 0, BLOCKSIZE);
- archive = file_to_switch_to;
- }
- else
- backspace_output ();
+ 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);
+
+ 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);
}
+}
- switch (access_mode)
- {
- case ACCESS_READ:
- flush_read ();
- break;
+#define VOL_SUFFIX "Volume"
- case ACCESS_WRITE:
- flush_write ();
- break;
+/* 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);
+}
- case ACCESS_UPDATE:
- abort ();
+static void
+add_chunk_header ()
+{
+ if (archive_format == POSIX_FORMAT)
+ {
+ 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);
+ free (st.orig_file_name);
+ if (!blk)
+ abort (); /* FIXME */
+ finish_header (&st, blk, block_ordinal);
}
}
-/* 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! */
+
+/* Add a volume label to the current archive */
static void
-backspace_output (void)
+write_volume_label (void)
{
-#ifdef MTIOCTOP
- {
- struct mtop operation;
+ if (multi_volume_option)
+ add_volume_label ();
+ else
+ _write_volume_label (volume_label_option);
+}
- 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
+/* Write GNU multi-volume header */
+static void
+gnu_add_multi_volume_header (void)
+{
+ int tmp;
+ union block *block = find_next_block ();
- {
- off_t position = rmtlseek (archive, (off_t) 0, SEEK_CUR);
+ 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)));
- /* Seek back to the beginning of this record and start writing there. */
+ memset (block, 0, BLOCKSIZE);
- position -= record_size;
- if (position < 0)
- position = 0;
- if (rmtlseek (archive, position, SEEK_SET) != position)
- {
- /* Lseek failed. Try a different method. */
+ /* 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. */
- WARN ((0, 0,
- _("Cannot backspace archive file; it may be unreadable without -i")));
+ strncpy (block->header.name, real_s_name, NAME_FIELD_SIZE);
+ block->header.typeflag = GNUTYPE_MULTIVOL;
- /* Replace the first part of the record with NULs. */
+ OFF_TO_CHARS (real_s_sizeleft, block->header.size);
+ OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
+ block->oldgnu_header.offset);
- if (record_start->buffer != output_start)
- memset (record_start->buffer, 0,
- output_start - record_start->buffer);
- }
- }
+ tmp = verbose_option;
+ verbose_option = 0;
+ finish_header (¤t_stat_info, block, -1);
+ verbose_option = tmp;
+ set_next_block_after (block);
}
-/* Close the archive file. */
-void
-close_archive (void)
+/* 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 (time_to_start_writing || access_mode == ACCESS_WRITE)
- flush_archive ();
+ if (archive_format == POSIX_FORMAT)
+ {
+ off_t d = real_s_totsize - real_s_sizeleft;
+ xheader_store ("GNU.volume.filename", NULL, real_s_name);
+ xheader_store ("GNU.volume.size", NULL, &real_s_sizeleft);
+ xheader_store ("GNU.volume.offset", NULL, &d);
+ }
+ else
+ gnu_add_multi_volume_header ();
+}
-#if !MSDOS
+/* Synchronize multi-volume globals */
+static void
+multi_volume_sync ()
+{
+ if (multi_volume_option)
+ {
+ if (save_name)
+ {
+ 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
+ {
+ assign_string (&real_s_name, 0);
+ real_s_totsize = 0;
+ real_s_sizeleft = 0;
+ }
+ }
+}
- /* 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. */
+\f
+/* Low-level flush functions */
- if (access_mode == ACCESS_READ
- && ! _isrmt (archive)
- && (S_ISFIFO (archive_stat.st_mode) || S_ISSOCK (archive_stat.st_mode)))
- while (rmtread (archive, record_start->buffer, record_size) > 0)
- continue;
-#endif
+/* Simple flush read (no multi-volume or label extensions) */
+static void
+simple_flush_read (void)
+{
+ size_t status; /* result from system call */
- if (verify_option)
- verify_volume ();
+ if (checkpoint_option && !(++checkpoint % 10))
+ /* TRANSLATORS: This is a ``checkpoint of read operation'',
+ *not* ``Reading a checkpoint''.
+ E.g. in Spanish ``Punto de comprobaci@'on de lectura'',
+ *not* ``Leyendo un punto de comprobaci@'on'' */
+ WARN ((0, 0, _("Read checkpoint %d"), checkpoint));
- if (rmtclose (archive) != 0)
- close_warn (*archive_name_cursor);
+ /* Clear the count of errors. This only applies to a single call to
+ flush_read. */
-#if !MSDOS
+ read_error_count = 0; /* clear error count */
- if (child_pid)
+ if (write_archive_to_stdout && record_start_block != 0)
{
- 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))
- ERROR ((0, 0, _("Child died with signal %d"),
- WTERMSIG (wait_status)));
- else if (WEXITSTATUS (wait_status) != 0)
- ERROR ((0, 0, _("Child returned status %d"),
- WEXITSTATUS (wait_status)));
+ archive = STDOUT_FILENO;
+ status = sys_write_archive_buffer ();
+ archive = STDIN_FILENO;
+ if (status != record_size)
+ archive_write_error (status);
}
-#endif /* !MSDOS */
- if (current_file_name)
- free (current_file_name);
- if (current_link_name)
- free (current_link_name);
- 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. */
-void
-init_volume_number (void)
-{
- FILE *file = fopen (volno_file_option, "r");
-
- if (file)
+ for (;;)
{
- 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);
+ 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;
}
- else if (errno != ENOENT)
- open_error (volno_file_option);
+ short_read (status);
}
-/* Called to write out the closing global volume number. */
-void
-closeout_volume_number (void)
+/* Simple flush write (no multi-volume or label extensions) */
+static void
+simple_flush_write (size_t level __attribute__((unused)))
{
- FILE *file = fopen (volno_file_option, "w");
+ ssize_t status;
- if (file)
+ status = _flush_write ();
+ if (status != record_size)
+ archive_write_error (status);
+ else
{
- fprintf (file, "%d\n", global_volno);
- if (ferror (file))
- write_error (volno_file_option);
- if (fclose (file) != 0)
- close_error (volno_file_option);
+ records_written++;
+ bytes_written += status;
}
- else
- 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)
+\f
+/* GNU flush functions. These support multi-volume and archive labels in
+ GNU and PAX archive formats. */
+
+static void
+_gnu_flush_read (void)
{
- static FILE *read_file;
- static int looped;
+ size_t status; /* result from system call */
- 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 (checkpoint_option && !(++checkpoint % 10))
+ /* TRANSLATORS: This is a ``checkpoint of read operation'',
+ *not* ``Reading a checkpoint''.
+ E.g. in Spanish ``Punto de comprobaci@'on de lectura'',
+ *not* ``Leyendo un punto de comprobaci@'on'' */
+ WARN ((0, 0, _("Read checkpoint %d"), checkpoint));
- if (now_verifying)
- return 0;
- if (verify_option)
- verify_volume ();
+ /* Clear the count of errors. This only applies to a single call to
+ flush_read. */
- if (rmtclose (archive) != 0)
- close_warn (*archive_name_cursor);
+ read_error_count = 0; /* clear error count */
- 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 (write_archive_to_stdout && record_start_block != 0)
{
- archive_name_cursor = archive_name_array;
- looped = 1;
+ archive = STDOUT_FILENO;
+ status = sys_write_archive_buffer ();
+ archive = STDIN_FILENO;
+ if (status != record_size)
+ archive_write_error (status);
}
- tryagain:
- if (looped)
- {
- /* We have to prompt from now on. */
+ multi_volume_sync ();
- if (info_script_option)
+ for (;;)
+ {
+ status = rmtread (archive, record_start->buffer, record_size);
+ if (status == record_size)
{
- if (volno_file_option)
- closeout_volume_number ();
- if (system (info_script_option) != 0)
- FATAL_ERROR ((0, 0, _("`%s' command failed"), info_script_option));
+ records_read++;
+ return;
}
- else
- while (1)
- {
- char input_buffer[80];
-
- fputc ('\007', stderr);
- fprintf (stderr,
- _("Prepare volume #%d for %s and hit return: "),
- global_volno, quote (*archive_name_cursor));
- fflush (stderr);
-
- if (fgets (input_buffer, sizeof input_buffer, 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\
- ! Spawn a subshell\n\
- ? 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 = &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;
- 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 */
- break;
- }
- }
+ /* 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;
}
+ short_read (status);
+}
- if (verify_option)
- archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
- rsh_command_option);
+static void
+gnu_flush_read (void)
+{
+ flush_read_ptr = simple_flush_read; /* Avoid recursion */
+ _gnu_flush_read ();
+ flush_read_ptr = gnu_flush_read;
+}
+
+static void
+_gnu_flush_write (size_t buffer_level)
+{
+ ssize_t status;
+ union block *header;
+ char *copy_ptr;
+ size_t copy_size;
+ size_t bufsize;
+
+ status = _flush_write ();
+ if (status != record_size && !multi_volume_option)
+ archive_write_error (status);
else
- switch (access)
- {
- case ACCESS_READ:
- archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
- rsh_command_option);
- break;
+ {
+ records_written++;
+ bytes_written += status;
+ }
- case ACCESS_WRITE:
- if (backup_option)
- maybe_backup_file (*archive_name_cursor, 1);
- archive = rmtcreat (*archive_name_cursor, MODE_RW,
- rsh_command_option);
- break;
+ if (status == record_size)
+ {
+ multi_volume_sync ();
+ return;
+ }
- case ACCESS_UPDATE:
- archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
- rsh_command_option);
- break;
- }
+ /* In multi-volume mode. */
+ /* ENXIO is for the UNIX PC. */
+ if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
+ archive_write_error (status);
- if (archive < 0)
+ if (!new_volume (ACCESS_WRITE))
+ return;
+
+ xheader_destroy (&extended_header);
+
+ increase_volume_number ();
+ if (totals_option)
+ prev_written += bytes_written;
+ bytes_written = 0;
+
+ copy_ptr = record_start->buffer + status;
+ copy_size = buffer_level - status;
+ /* Switch to the next buffer */
+ record_index = !record_index;
+ init_buffer ();
+
+ if (volume_label_option)
+ add_volume_label ();
+
+ if (real_s_name)
+ add_multi_volume_header ();
+
+ write_extended (true, NULL, find_next_block ());
+ if (real_s_name)
+ add_chunk_header ();
+ header = find_next_block ();
+ bufsize = available_space_after (header);
+ while (bufsize < copy_size)
{
- open_warn (*archive_name_cursor);
- if (!verify_option && access == ACCESS_WRITE && backup_option)
- undo_last_backup ();
- goto tryagain;
+ 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);
}
+ 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);
+ find_next_block ();
+}
-#if MSDOS
- setmode (archive, O_BINARY);
-#endif
+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;
+}
- return 1;
+void
+flush_read ()
+{
+ flush_read_ptr ();
+}
+
+void
+flush_write ()
+{
+ flush_write_ptr (record_size);
+}
+
+void
+open_archive (enum access_mode wanted_access)
+{
+ flush_read_ptr = gnu_flush_read;
+ flush_write_ptr = gnu_flush_write;
+
+ _open_archive (wanted_access);
+ switch (wanted_access)
+ {
+ case ACCESS_READ:
+ if (volume_label_option)
+ match_volume_label ();
+ break;
+
+ case ACCESS_WRITE:
+ records_written = 0;
+ if (volume_label_option)
+ write_volume_label ();
+ break;
+
+ default:
+ break;
+ }
}
projects / chaz / tar / blobdiff