X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=src%2Fbuffer.c;h=95e8a26de1e42a5b2b922300c57dbd3e22db25f0;hp=50b474936939f0e606c8c2dc504581611ef09a00;hb=45ccda119355a1087450039a250359c1d0de0d08;hpb=dc6f7ebf20934b0d9975b0129b9d4c370d1d29bc
diff --git a/src/buffer.c b/src/buffer.c
index 50b4749..95e8a26 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,23 +1,24 @@
/* Buffer management for tar.
- Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
- 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2013-2014 Free
+ Software Foundation, Inc.
- Written by John Gilmore, on 1985-08-25.
+ This file is part of GNU tar.
- 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
- version.
+ GNU tar 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 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
+ GNU tar is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+ Written by John Gilmore, on 1985-08-25. */
#include
#include
@@ -26,7 +27,6 @@
#include
#include
-#include
#include
#include
@@ -34,30 +34,27 @@
#include
/* 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]*"
+#define READ_ERROR_MAX 10
/* 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 */
-union block *record_buffer_aligned[2];
+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 union block *record_buffer_aligned[2];
static int record_index;
/* 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 */
-off_t records_read; /* number of records read from this archive */
-off_t records_written; /* likewise, for records written */
+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 */
+ of the archive, defined in delete.c */
static off_t record_start_block; /* block ordinal at record_start */
@@ -75,23 +72,19 @@ static int read_error_count;
/* Have we hit EOF yet? */
static bool hit_eof;
-/* Checkpointing counter */
-static unsigned checkpoint;
-
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);
+static void (*flush_write_ptr) (size_t);
+static void (*flush_read_ptr) (void);
char *volume_label;
@@ -100,54 +93,129 @@ uintmax_t continued_file_size;
uintmax_t continued_file_offset;
-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 */
+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 */
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;
-static off_t real_s_totsize;
-static off_t real_s_sizeleft;
-
/* 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 */
+
+/* When creating a multi-volume archive, each 'bufmap' represents
+ a member stored (perhaps partly) in the current record buffer.
+ After flushing the record to the output media, all bufmaps that
+ represent fully written members are removed from the list, then
+ the sizeleft and start numbers in the remaining bufmaps are updated.
+
+ When reading from a multi-volume archive, the list degrades to a
+ single element, which keeps information about the member currently
+ being read.
+*/
+
+struct bufmap
+{
+ struct bufmap *next; /* Pointer to the next map entry */
+ size_t start; /* Offset of the first data block */
+ char *file_name; /* Name of the stored file */
+ off_t sizetotal; /* Size of the stored file */
+ off_t sizeleft; /* Size left to read/write */
+};
+static struct bufmap *bufmap_head, *bufmap_tail;
+
+/* This variable, when set, inhibits updating the bufmap chain after
+ a write. This is necessary when writing extended POSIX headers. */
+static int inhibit_map;
void
-mv_begin (struct tar_stat_info *st)
+mv_begin_write (const char *file_name, off_t totsize, off_t sizeleft)
{
if (multi_volume_option)
{
- assign_string (&save_name, st->orig_file_name);
- save_totsize = save_sizeleft = st->stat.st_size;
+ struct bufmap *bp = xmalloc (sizeof bp[0]);
+ if (bufmap_tail)
+ bufmap_tail->next = bp;
+ else
+ bufmap_head = bp;
+ bufmap_tail = bp;
+
+ bp->next = NULL;
+ bp->start = current_block - record_start;
+ bp->file_name = xstrdup (file_name);
+ bp->sizetotal = totsize;
+ bp->sizeleft = sizeleft;
+ }
+}
+
+static struct bufmap *
+bufmap_locate (size_t off)
+{
+ struct bufmap *map;
+
+ for (map = bufmap_head; map; map = map->next)
+ {
+ if (!map->next
+ || off < map->next->start * BLOCKSIZE)
+ break;
+ }
+ return map;
+}
+
+static void
+bufmap_free (struct bufmap *mark)
+{
+ struct bufmap *map;
+ for (map = bufmap_head; map && map != mark; )
+ {
+ struct bufmap *next = map->next;
+ free (map->file_name);
+ free (map);
+ map = next;
+ }
+ bufmap_head = map;
+ if (!bufmap_head)
+ bufmap_tail = bufmap_head;
+}
+
+static void
+bufmap_reset (struct bufmap *map, ssize_t fixup)
+{
+ bufmap_free (map);
+ if (map)
+ {
+ for (; map; map = map->next)
+ map->start += fixup;
}
}
+
+static struct tar_stat_info dummy;
+
void
-mv_end ()
+buffer_write_global_xheader (void)
{
- if (multi_volume_option)
- assign_string (&save_name, 0);
+ xheader_write_global (&dummy.xhdr);
+}
+
+void
+mv_begin_read (struct tar_stat_info *st)
+{
+ mv_begin_write (st->orig_file_name, st->stat.st_size, st->stat.st_size);
}
void
-mv_total_size (off_t size)
+mv_end (void)
{
- save_totsize = size;
+ if (multi_volume_option)
+ bufmap_free (NULL);
}
void
mv_size_left (off_t size)
{
- save_sizeleft = size;
+ if (bufmap_head)
+ bufmap_head->sizeleft = size;
}
@@ -162,118 +230,255 @@ clear_read_error_count (void)
/* Time-related functions */
-double duration;
+static double duration;
void
-set_start_time ()
+set_start_time (void)
{
gettime (&start_time);
volume_start_time = start_time;
last_stat_time = start_time;
}
-void
-set_volume_start_time ()
+static void
+set_volume_start_time (void)
{
gettime (&volume_start_time);
last_stat_time = volume_start_time;
}
-void
-compute_duration ()
+double
+compute_duration (void)
{
struct timespec now;
gettime (&now);
duration += ((now.tv_sec - last_stat_time.tv_sec)
- + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9);
+ + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9);
gettime (&last_stat_time);
+ return duration;
}
/* Compression detection */
enum compress_type {
- ct_none,
+ ct_none, /* Unknown compression type */
+ ct_tar, /* Plain tar file */
ct_compress,
ct_gzip,
- ct_bzip2
+ ct_bzip2,
+ ct_lzip,
+ ct_lzma,
+ ct_lzop,
+ ct_xz
};
+static enum compress_type archive_compression_type = ct_none;
+
struct zip_magic
{
enum compress_type type;
size_t length;
- char *magic;
- char *program;
- char *option;
+ char const *magic;
+};
+
+struct zip_program
+{
+ enum compress_type type;
+ char const *program;
+ char const *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" },
+ { ct_none, 0, 0 },
+ { ct_tar, 0, 0 },
+ { ct_compress, 2, "\037\235" },
+ { ct_gzip, 2, "\037\213" },
+ { ct_bzip2, 3, "BZh" },
+ { ct_lzip, 4, "LZIP" },
+ { ct_lzma, 6, "\xFFLZMA" },
+ { ct_lzop, 4, "\211LZO" },
+ { ct_xz, 6, "\xFD" "7zXZ" },
};
#define NMAGIC (sizeof(magic)/sizeof(magic[0]))
-#define compress_option(t) magic[t].option
-#define compress_program(t) magic[t].program
+static struct zip_program zip_program[] = {
+ { ct_compress, COMPRESS_PROGRAM, "-Z" },
+ { ct_compress, GZIP_PROGRAM, "-z" },
+ { ct_gzip, GZIP_PROGRAM, "-z" },
+ { ct_bzip2, BZIP2_PROGRAM, "-j" },
+ { ct_bzip2, "lbzip2", "-j" },
+ { ct_lzip, LZIP_PROGRAM, "--lzip" },
+ { ct_lzma, LZMA_PROGRAM, "--lzma" },
+ { ct_lzma, XZ_PROGRAM, "-J" },
+ { ct_lzop, LZOP_PROGRAM, "--lzop" },
+ { ct_xz, XZ_PROGRAM, "-J" },
+ { ct_none }
+};
+
+static struct zip_program const *
+find_zip_program (enum compress_type type, int *pstate)
+{
+ int i;
+
+ for (i = *pstate; zip_program[i].type != ct_none; i++)
+ {
+ if (zip_program[i].type == type)
+ {
+ *pstate = i + 1;
+ return zip_program + i;
+ }
+ }
+ *pstate = i;
+ return NULL;
+}
+
+const char *
+first_decompress_program (int *pstate)
+{
+ struct zip_program const *zp;
+
+ if (use_compress_program_option)
+ return use_compress_program_option;
+
+ if (archive_compression_type == ct_none)
+ return NULL;
+
+ *pstate = 0;
+ zp = find_zip_program (archive_compression_type, pstate);
+ return zp ? zp->program : NULL;
+}
+
+const char *
+next_decompress_program (int *pstate)
+{
+ struct zip_program const *zp;
+
+ if (use_compress_program_option)
+ return NULL;
+ zp = find_zip_program (archive_compression_type, pstate);
+ return zp ? zp->program : NULL;
+}
+
+static const char *
+compress_option (enum compress_type type)
+{
+ struct zip_program const *zp;
+ int i = 0;
+ zp = find_zip_program (type, &i);
+ return zp ? zp->option : NULL;
+}
/* Check if the file ARCHIVE is a compressed archive. */
-enum compress_type
-check_compressed_archive ()
+static 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 */
- find_next_block ();
+ 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_none;
+ return ct_tar;
- for (p = magic + 1; p < magic + NMAGIC; p++)
+ for (p = magic + 2; p < magic + NMAGIC; p++)
if (memcmp (record_start->buffer, p->magic, p->length) == 0)
return p->type;
return ct_none;
}
+/* Guess if the archive is seekable. */
+static void
+guess_seekable_archive (void)
+{
+ struct stat st;
+
+ if (subcommand_option == DELETE_SUBCOMMAND)
+ {
+ /* The current code in delete.c is based on the assumption that
+ skip_member() reads all data from the archive. So, we should
+ make sure it won't use seeks. On the other hand, the same code
+ depends on the ability to backspace a record in the archive,
+ so setting seekable_archive to false is technically incorrect.
+ However, it is tested only in skip_member(), so it's not a
+ problem. */
+ seekable_archive = false;
+ }
+
+ if (seek_option != -1)
+ {
+ seekable_archive = !!seek_option;
+ return;
+ }
+
+ if (!multi_volume_option && !use_compress_program_option
+ && fstat (archive, &st) == 0)
+ seekable_archive = S_ISREG (st.st_mode);
+ else
+ seekable_archive = false;
+}
+
/* 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 ()
+static int
+open_compressed_archive (void)
{
archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
- MODE_RW, rsh_command_option);
+ 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;
+ 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_compression_program_by_suffix (archive_name_array[0], NULL);
+ if (!use_compress_program_option)
+ return archive;
+ break;
+
+ default:
+ archive_compression_type = 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 */
+ check_compressed_archive */
/* Open compressed archive */
- use_compress_program_option = compress_program (type);
child_pid = sys_child_open_for_uncompress ();
read_full_records = true;
}
@@ -284,64 +489,98 @@ open_compressed_archive ()
return archive;
}
-
-static void
+static int
print_stats (FILE *fp, const char *text, tarlong numbytes)
{
- char bytes[sizeof (tarlong) * CHAR_BIT];
char abbr[LONGEST_HUMAN_READABLE + 1];
char rate[LONGEST_HUMAN_READABLE + 1];
-
+ int n = 0;
+
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)
- : "?"));
+ if (text && text[0])
+ n += fprintf (fp, "%s: ", gettext (text));
+ return n + fprintf (fp, TARLONG_FORMAT " (%s, %s/s)",
+ numbytes,
+ human_readable (numbytes, abbr, human_opts, 1, 1),
+ (0 < duration && numbytes / duration < (uintmax_t) -1
+ ? human_readable (numbytes / duration, rate, human_opts, 1, 1)
+ : "?"));
}
-void
-print_total_stats ()
+/* Format totals to file FP. FORMATS is an array of strings to output
+ before each data item (bytes read, written, deleted, in that order).
+ EOR is a delimiter to output after each item (used only if deleting
+ from the archive), EOL is a delimiter to add at the end of the output
+ line. */
+int
+format_total_stats (FILE *fp, const char **formats, int eor, int eol)
{
+ int n;
+
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);
+ n = print_stats (fp, formats[TF_WRITE],
+ 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));
+ char buf[UINTMAX_STRSIZE_BOUND];
+ n = print_stats (fp, formats[TF_READ],
+ records_read * record_size);
+
+ fputc (eor, fp);
+ n++;
+
+ n += print_stats (fp, formats[TF_WRITE],
+ prev_written + bytes_written);
+
+ fputc (eor, fp);
+ n++;
+
+ if (formats[TF_DELETED] && formats[TF_DELETED][0])
+ n += fprintf (fp, "%s: ", gettext (formats[TF_DELETED]));
+ n += fprintf (fp, "%s",
+ 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);
+ n = print_stats (fp, _(formats[TF_READ]),
+ records_read * record_size);
break;
default:
abort ();
}
+ if (eol)
+ {
+ fputc (eol, fp);
+ n++;
+ }
+ return n;
+}
+
+const char *default_total_format[] = {
+ N_("Total bytes read"),
+ /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */
+ N_("Total bytes written"),
+ N_("Total bytes deleted")
+};
+
+void
+print_total_stats (void)
+{
+ format_total_stats (stderr, default_total_format, '\n', '\n');
}
/* Compute and return the block ordinal at current_block. */
@@ -373,13 +612,13 @@ find_next_block (void)
if (current_block == record_end)
{
if (hit_eof)
- return 0;
+ return 0;
flush_archive ();
if (current_block == record_end)
- {
- hit_eof = true;
- return 0;
- }
+ {
+ hit_eof = true;
+ return 0;
+ }
}
return current_block;
}
@@ -418,7 +657,7 @@ xclose (int fd)
}
static void
-init_buffer ()
+init_buffer (void)
{
if (! record_buffer_aligned[record_index])
record_buffer_aligned[record_index] =
@@ -443,8 +682,6 @@ _open_archive (enum access_mode wanted_access)
FATAL_ERROR ((0, 0, _("No archive name given")));
tar_stat_destroy (¤t_stat_info);
- save_name = 0;
- real_s_name = 0;
record_index = 0;
init_buffer ();
@@ -459,93 +696,106 @@ _open_archive (enum access_mode wanted_access)
if (use_compress_program_option)
{
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;
- }
+ {
+ 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;
+ && 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")));
+ FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive")));
switch (wanted_access)
- {
- case ACCESS_READ:
- {
- enum compress_type type;
-
- archive = STDIN_FILENO;
-
- type = check_compressed_archive ();
- if (type != ct_none)
- FATAL_ERROR ((0, 0,
- _("Archive is compressed. Use %s option"),
- compress_option (type)));
- }
- 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;
- }
+ {
+ 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;
+ archive = open_compressed_archive ();
+ if (archive >= 0)
+ guess_seekable_archive ();
+ 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_array[0], 1);
+ backed_up_flag = 1;
+ }
+ if (verify_option)
+ archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
+ MODE_RW, rsh_command_option);
+ else
+ archive = rmtcreat (archive_name_array[0], 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);
-
- if (check_compressed_archive () != ct_none)
- FATAL_ERROR ((0, 0,
- _("Cannot update compressed archives")));
- break;
+ 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 (archive < 0
@@ -554,7 +804,7 @@ _open_archive (enum access_mode wanted_access)
int saved_errno = errno;
if (backed_up_flag)
- undo_last_backup ();
+ undo_last_backup ();
errno = saved_errno;
open_fatal (archive_name_array[0]);
}
@@ -566,7 +816,7 @@ _open_archive (enum access_mode wanted_access)
switch (wanted_access)
{
case ACCESS_READ:
- find_next_block (); /* read it in, check for EOF */
+ find_next_block (); /* read it in, check for EOF */
break;
case ACCESS_UPDATE:
@@ -576,43 +826,13 @@ _open_archive (enum access_mode wanted_access)
}
}
-static void
-do_checkpoint (bool write)
-{
- if (checkpoint_option && !(++checkpoint % checkpoint_option))
- {
- switch (checkpoint_style)
- {
- case checkpoint_dot:
- fputc ('.', stdlis);
- fflush (stdlis);
- break;
-
- case checkpoint_text:
- if (write)
- /* 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 %u"), checkpoint));
- else
- /* 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 %u"), checkpoint));
- break;
- }
- }
-}
-
/* Perform a write to flush the buffer. */
-ssize_t
+static ssize_t
_flush_write (void)
{
ssize_t status;
- do_checkpoint (true);
+ checkpoint_run (true);
if (tape_length_option && tape_length_option <= bytes_written)
{
errno = ENOSPC;
@@ -623,6 +843,20 @@ _flush_write (void)
else
status = sys_write_archive_buffer ();
+ if (status && multi_volume_option && !inhibit_map)
+ {
+ struct bufmap *map = bufmap_locate (status);
+ if (map)
+ {
+ size_t delta = status - map->start * BLOCKSIZE;
+ if (delta > map->sizeleft)
+ delta = map->sizeleft;
+ map->sizeleft -= delta;
+ if (map->sizeleft == 0)
+ map = map->next;
+ bufmap_reset (map, map ? (- map->start) : 0);
+ }
+ }
return status;
}
@@ -662,56 +896,66 @@ archive_read_error (void)
return;
}
+static bool
+archive_is_dev (void)
+{
+ struct stat st;
+
+ if (fstat (archive, &st))
+ {
+ stat_diag (*archive_name_cursor);
+ return false;
+ }
+ return S_ISBLK (st.st_mode) || S_ISCHR (st.st_mode);
+}
+
static void
short_read (size_t status)
{
- size_t left; /* bytes left */
- char *more; /* pointer to next byte to read */
+ size_t left; /* bytes left */
+ char *more; /* pointer to next byte to read */
more = record_start->buffer + status;
left = record_size - status;
+ if (left && left % BLOCKSIZE == 0
+ && (warning_option & WARN_RECORD_SIZE)
+ && record_start_block == 0 && status != 0
+ && archive_is_dev ())
+ {
+ unsigned long rsize = status / BLOCKSIZE;
+ WARN ((0, 0,
+ ngettext ("Record size = %lu block",
+ "Record size = %lu blocks",
+ rsize),
+ rsize));
+ }
+
while (left % BLOCKSIZE != 0
- || (left && status && read_full_records))
+ || (left && status && read_full_records))
{
if (status)
- while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR)
- archive_read_error ();
+ while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR)
+ archive_read_error ();
if (status == 0)
- break;
+ break;
if (! read_full_records)
- {
- 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));
- }
+ {
+ unsigned long rest = record_size - left;
- /* User warned us about this. Fix up. */
+ FATAL_ERROR ((0, 0,
+ ngettext ("Unaligned block (%lu byte) in archive",
+ "Unaligned block (%lu bytes) in archive",
+ rest),
+ rest));
+ }
left -= status;
more += status;
}
- /* FIXME: for size=0, multi-volume support. On the first record, warn
- about the problem. */
-
- 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));
- }
-
record_end = record_start + (record_size - left) / BLOCKSIZE;
records_read++;
}
@@ -776,16 +1020,16 @@ backspace_output (void)
position = 0;
if (rmtlseek (archive, position, SEEK_SET) != position)
{
- /* Lseek failed. Try a different method. */
+ /* Lseek failed. Try a different method. */
- WARN ((0, 0,
- _("Cannot backspace archive file; it may be unreadable without -i")));
+ WARN ((0, 0,
+ _("Cannot backspace archive file; it may be unreadable without -i")));
- /* Replace the first part of the record with NULs. */
+ /* Replace the first part of the record with NULs. */
- if (record_start->buffer != output_start)
- memset (record_start->buffer, 0,
- output_start - record_start->buffer);
+ if (record_start->buffer != output_start)
+ memset (record_start->buffer, 0,
+ output_start - record_start->buffer);
}
}
}
@@ -796,16 +1040,16 @@ 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));
-
- size -= skipped * BLOCKSIZE;
+ off_t skipped = (blocking_factor - (current_block - record_start))
+ * BLOCKSIZE;
- if (size < record_size)
+ if (size <= skipped)
return 0;
- /* FIXME: flush? */
/* Compute number of records to skip */
- nrec = size / record_size;
+ nrec = (size - skipped) / record_size;
+ if (nrec == 0)
+ return 0;
offset = rmtlseek (archive, nrec * record_size, SEEK_CUR);
if (offset < 0)
return offset;
@@ -834,27 +1078,22 @@ close_archive (void)
{
flush_archive ();
if (current_block > record_start)
- flush_archive ();
+ flush_archive ();
}
- sys_drain_input_pipe ();
-
compute_duration ();
if (verify_option)
verify_volume ();
if (rmtclose (archive) != 0)
- close_warn (*archive_name_cursor);
+ close_error (*archive_name_cursor);
- sys_wait_for_child (child_pid);
+ sys_wait_for_child (child_pid, hit_eof);
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]);
+ bufmap_free (NULL);
}
/* Called to initialize the global volume number. */
@@ -866,13 +1105,13 @@ init_volume_number (void)
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)));
+ || 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);
+ read_error (volno_file_option);
if (fclose (file) != 0)
- close_error (volno_file_option);
+ close_error (volno_file_option);
}
else if (errno != ENOENT)
open_error (volno_file_option);
@@ -888,9 +1127,9 @@ closeout_volume_number (void)
{
fprintf (file, "%d\n", global_volno);
if (ferror (file))
- write_error (volno_file_option);
+ write_error (volno_file_option);
if (fclose (file) != 0)
- close_error (volno_file_option);
+ close_error (volno_file_option);
}
else
open_error (volno_file_option);
@@ -898,7 +1137,7 @@ closeout_volume_number (void)
static void
-increase_volume_number ()
+increase_volume_number (void)
{
global_volno++;
if (global_volno < 0)
@@ -906,103 +1145,103 @@ increase_volume_number ()
volno++;
}
-void
+static 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));
+ _("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")));
+ {
+ 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")));
+ if (subcommand_option != EXTRACT_SUBCOMMAND
+ && subcommand_option != LIST_SUBCOMMAND
+ && subcommand_option != DIFF_SUBCOMMAND)
+ WARN ((0, 0, _("WARNING: Archive is incomplete")));
- fatal_exit ();
- }
+ fatal_exit ();
+ }
if (input_buffer[0] == '\n'
- || input_buffer[0] == 'y'
- || input_buffer[0] == 'Y')
- break;
+ || input_buffer[0] == 'y'
+ || input_buffer[0] == 'Y')
+ break;
switch (input_buffer[0])
- {
- case '?':
- {
- fprintf (stderr, _("\
+ {
+ 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"));
- }
+ 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);
}
@@ -1030,9 +1269,9 @@ new_volume (enum access_mode mode)
assign_string (&continued_file_name, NULL);
continued_file_size = continued_file_offset = 0;
current_block = record_start;
-
+
if (rmtclose (archive) != 0)
- close_warn (*archive_name_cursor);
+ close_error (*archive_name_cursor);
archive_name_cursor++;
if (archive_name_cursor == archive_name_array + archive_names)
@@ -1048,15 +1287,15 @@ new_volume (enum access_mode mode)
/* We have to prompt from now on. */
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)));
- }
+ {
+ 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);
+ change_tape_menu (read_file);
}
if (strcmp (archive_name_cursor[0], "-") == 0)
@@ -1066,33 +1305,34 @@ new_volume (enum access_mode mode)
}
else if (verify_option)
archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
- rsh_command_option);
+ rsh_command_option);
else
switch (mode)
{
case ACCESS_READ:
- archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
- rsh_command_option);
- break;
+ archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
+ rsh_command_option);
+ guess_seekable_archive ();
+ 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;
+ 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_cursor, O_RDWR | O_CREAT, MODE_RW,
- rsh_command_option);
- break;
+ archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
+ rsh_command_option);
+ break;
}
if (archive < 0)
{
open_warn (*archive_name_cursor);
if (!verify_option && mode == ACCESS_WRITE && backup_option)
- undo_last_backup ();
+ undo_last_backup ();
prompt = 1;
goto tryagain;
}
@@ -1108,7 +1348,7 @@ read_header0 (struct tar_stat_info *info)
enum read_header rc;
tar_stat_init (info);
- rc = read_header_primitive (false, info);
+ rc = read_header (¤t_header, info, read_header_auto);
if (rc == HEADER_SUCCESS)
{
set_next_block_after (current_header);
@@ -1118,32 +1358,31 @@ read_header0 (struct tar_stat_info *info)
return false;
}
-bool
-try_new_volume ()
+static bool
+try_new_volume (void)
{
size_t status;
union block *header;
- struct tar_stat_info dummy;
- int access;
-
+ enum access_mode acc;
+
switch (subcommand_option)
{
case APPEND_SUBCOMMAND:
case CAT_SUBCOMMAND:
case UPDATE_SUBCOMMAND:
- access = ACCESS_UPDATE;
+ acc = ACCESS_UPDATE;
break;
default:
- access = ACCESS_READ;
+ acc = ACCESS_READ;
break;
}
- if (!new_volume (access))
+ if (!new_volume (acc))
return true;
-
+
while ((status = rmtread (archive, record_start->buffer, record_size))
- == SAFE_READ_ERROR)
+ == SAFE_READ_ERROR)
archive_read_error ();
if (status != record_size)
@@ -1157,88 +1396,122 @@ try_new_volume ()
{
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)
+ tar_stat_init (&dummy);
+ if (read_header (&header, &dummy, read_header_x_global)
+ != HEADER_SUCCESS_EXTENDED)
{
- /* 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;
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ return false;
}
- break;
+
+ xheader_decode (&dummy); /* decodes values from the global header */
+ tar_stat_destroy (&dummy);
+
+ /* The initial global header must be immediately followed by
+ an extended PAX header for the first member in this volume.
+ However, in some cases tar may split volumes in the middle
+ of a PAX header. This is incorrect, and should be fixed
+ in the future versions. In the meantime we must be
+ prepared to correctly list and extract such archives.
+
+ If this happens, the following call to read_header returns
+ HEADER_FAILURE, which is ignored.
+
+ See also tests/multiv07.at */
+
+ switch (read_header (&header, &dummy, read_header_auto))
+ {
+ case HEADER_SUCCESS:
+ set_next_block_after (header);
+ break;
+
+ case HEADER_FAILURE:
+ break;
+
+ default:
+ ERROR ((0, 0, _("This does not look like a tar archive")));
+ return false;
+ }
+ break;
}
case GNUTYPE_VOLHDR:
if (!read_header0 (&dummy))
- return false;
+ 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;
+ break;
/* FALL THROUGH */
case GNUTYPE_MULTIVOL:
if (!read_header0 (&dummy))
- return false;
+ 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);
+ UINTMAX_FROM_HEADER (current_header->header.size);
continued_file_offset =
- UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset);
+ UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset);
break;
default:
break;
}
- if (real_s_name)
+ if (bufmap_head)
{
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,
+ || strcmp (continued_file_name, bufmap_head->file_name))
+ {
+ if ((archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT)
+ && strlen (bufmap_head->file_name) >= NAME_FIELD_SIZE
+ && strncmp (continued_file_name, bufmap_head->file_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;
- }
- }
+ quote (bufmap_head->file_name)));
+ else
+ {
+ WARN ((0, 0, _("%s is not continued on this volume"),
+ quote (bufmap_head->file_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)
- {
- WARN ((0, 0, _("This volume is out of sequence")));
- return false;
- }
+ if (bufmap_head->sizetotal != 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 (bufmap_head->sizetotal, totsizebuf),
+ STRINGIFY_BIGINT (continued_file_size, s1buf),
+ STRINGIFY_BIGINT (continued_file_offset, s2buf)));
+ return false;
+ }
+
+ if (bufmap_head->sizetotal - bufmap_head->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 (bufmap_head->sizetotal, totsizebuf),
+ STRINGIFY_BIGINT (bufmap_head->sizeleft, s1buf),
+ STRINGIFY_BIGINT (continued_file_offset, s2buf)));
+
+ return false;
+ }
}
increase_volume_number ();
@@ -1246,31 +1519,57 @@ try_new_volume ()
}
-/* Check the LABEL block against the volume label, seen as a globbing
+#define VOLUME_TEXT " Volume "
+#define VOLUME_TEXT_LEN (sizeof VOLUME_TEXT - 1)
+
+char *
+drop_volume_label_suffix (const char *label)
+{
+ const char *p;
+ size_t len = strlen (label);
+
+ if (len < 1)
+ return NULL;
+
+ for (p = label + len - 1; p > label && isdigit ((unsigned char) *p); p--)
+ ;
+ if (p > label && p - (VOLUME_TEXT_LEN - 1) > label)
+ {
+ p -= VOLUME_TEXT_LEN - 1;
+ if (memcmp (p, VOLUME_TEXT, VOLUME_TEXT_LEN) == 0)
+ {
+ char *s = xmalloc ((len = p - label) + 1);
+ memcpy (s, label, len);
+ s[len] = 0;
+ return s;
+ }
+ }
+
+ return NULL;
+}
+
+/* Check LABEL 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)
+check_label_pattern (const char *label)
{
char *string;
- bool result;
-
- if (! memchr (label->header.name, '\0', sizeof label->header.name))
- return false;
+ bool result = false;
- if (fnmatch (volume_label_option, label->header.name, 0) == 0)
+ if (fnmatch (volume_label_option, label, 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);
+ string = drop_volume_label_suffix (label);
+ if (string)
+ {
+ result = fnmatch (string, volume_label_option, 0) == 0;
+ free (string);
+ }
return result;
}
@@ -1279,15 +1578,44 @@ check_label_pattern (union block *label)
static void
match_volume_label (void)
{
- union block *label = find_next_block ();
+ if (!volume_label)
+ {
+ union block *label = find_next_block ();
+
+ if (!label)
+ FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
+ quote (volume_label_option)));
+ if (label->header.typeflag == GNUTYPE_VOLHDR)
+ {
+ if (memchr (label->header.name, '\0', sizeof label->header.name))
+ assign_string (&volume_label, label->header.name);
+ else
+ {
+ volume_label = xmalloc (sizeof (label->header.name) + 1);
+ memcpy (volume_label, label->header.name,
+ sizeof (label->header.name));
+ volume_label[sizeof (label->header.name)] = 0;
+ }
+ }
+ else if (label->header.typeflag == XGLTYPE)
+ {
+ struct tar_stat_info st;
+ tar_stat_init (&st);
+ xheader_read (&st.xhdr, label,
+ OFF_FROM_HEADER (label->header.size));
+ xheader_decode (&st);
+ tar_stat_destroy (&st);
+ }
+ }
- if (!label)
+ if (!volume_label)
FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
- quote (volume_label_option)));
- if (!check_label_pattern (label))
+ quote (volume_label_option)));
+
+ if (!check_label_pattern (volume_label))
FATAL_ERROR ((0, 0, _("Volume %s does not match %s"),
- quote_n (0, label->header.name),
- quote_n (1, volume_label_option)));
+ quote_n (0, volume_label),
+ quote_n (1, volume_label_option)));
}
/* Mark the archive with volume label STR. */
@@ -1295,18 +1623,18 @@ static void
_write_volume_label (const char *str)
{
if (archive_format == POSIX_FORMAT)
- xheader_store ("GNU.volume.label", NULL, str);
+ xheader_store ("GNU.volume.label", &dummy, str);
else
{
union block *label = find_next_block ();
memset (label, 0, BLOCKSIZE);
- strcpy (label->header.name, volume_label_option);
+ strcpy (label->header.name, str);
assign_string (¤t_stat_info.file_name,
- label->header.name);
+ label->header.name);
current_stat_info.had_trailing_slash =
- strip_trailing_slashes (current_stat_info.file_name);
+ strip_trailing_slashes (current_stat_info.file_name);
label->header.typeflag = GNUTYPE_VOLHDR;
TIME_TO_CHARS (start_time.tv_sec, label->header.mtime);
@@ -1324,38 +1652,36 @@ 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);
+ + strlen (p) + 2);
sprintf (s, "%s %s %s", volume_label_option, VOL_SUFFIX, p);
_write_volume_label (s);
free (s);
}
static void
-add_chunk_header ()
+add_chunk_header (struct bufmap *map)
{
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.orig_file_name = st.file_name = map->file_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);
+ "%d/GNUFileParts.%p/%f.%n",
+ volno);
st.file_name = st.orig_file_name;
- st.archive_file_size = st.stat.st_size = real_s_sizeleft;
+ st.archive_file_size = st.stat.st_size = map->sizeleft;
block_ordinal = current_block_ordinal ();
blk = start_header (&st);
if (!blk)
- abort (); /* FIXME */
+ abort (); /* FIXME */
finish_header (&st, blk, block_ordinal);
free (st.orig_file_name);
}
@@ -1374,28 +1700,24 @@ write_volume_label (void)
/* Write GNU multi-volume header */
static void
-gnu_add_multi_volume_header (void)
+gnu_add_multi_volume_header (struct bufmap *map)
{
int tmp;
union block *block = find_next_block ();
- if (strlen (real_s_name) > NAME_FIELD_SIZE)
+ if (strlen (map->file_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)));
+ _("%s: file name too long to be stored in a GNU multivolume header, truncated"),
+ quotearg_colon (map->file_name)));
memset (block, 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. */
-
- strncpy (block->header.name, real_s_name, NAME_FIELD_SIZE);
+ strncpy (block->header.name, map->file_name, NAME_FIELD_SIZE);
block->header.typeflag = GNUTYPE_MULTIVOL;
- OFF_TO_CHARS (real_s_sizeleft, block->header.size);
- OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
- block->oldgnu_header.offset);
+ OFF_TO_CHARS (map->sizeleft, block->header.size);
+ OFF_TO_CHARS (map->sizetotal - map->sizeleft,
+ block->oldgnu_header.offset);
tmp = verbose_option;
verbose_option = 0;
@@ -1407,40 +1729,17 @@ gnu_add_multi_volume_header (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)
+add_multi_volume_header (struct bufmap *map)
{
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);
+ off_t d = map->sizetotal - map->sizeleft;
+ xheader_store ("GNU.volume.filename", &dummy, map->file_name);
+ xheader_store ("GNU.volume.size", &dummy, &map->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)
- {
- 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;
- }
- }
+ gnu_add_multi_volume_header (map);
}
@@ -1450,14 +1749,14 @@ multi_volume_sync ()
static void
simple_flush_read (void)
{
- size_t status; /* result from system call */
+ size_t status; /* result from system call */
+
+ checkpoint_run (false);
- do_checkpoint (false);
-
/* Clear the count of errors. This only applies to a single call to
flush_read. */
- read_error_count = 0; /* clear error count */
+ read_error_count = 0; /* clear error count */
if (write_archive_to_stdout && record_start_block != 0)
{
@@ -1465,22 +1764,22 @@ simple_flush_read (void)
status = sys_write_archive_buffer ();
archive = STDIN_FILENO;
if (status != record_size)
- archive_write_error (status);
+ archive_write_error (status);
}
for (;;)
{
status = rmtread (archive, record_start->buffer, record_size);
if (status == record_size)
- {
- records_read++;
- return;
- }
+ {
+ records_read++;
+ return;
+ }
if (status == SAFE_READ_ERROR)
- {
- archive_read_error ();
- continue; /* try again */
- }
+ {
+ archive_read_error ();
+ continue; /* try again */
+ }
break;
}
short_read (status);
@@ -1509,14 +1808,14 @@ simple_flush_write (size_t level __attribute__((unused)))
static void
_gnu_flush_read (void)
{
- size_t status; /* result from system call */
+ size_t status; /* result from system call */
+
+ checkpoint_run (false);
- do_checkpoint (false);
-
/* Clear the count of errors. This only applies to a single call to
flush_read. */
- read_error_count = 0; /* clear error count */
+ read_error_count = 0; /* clear error count */
if (write_archive_to_stdout && record_start_block != 0)
{
@@ -1524,38 +1823,39 @@ _gnu_flush_read (void)
status = sys_write_archive_buffer ();
archive = STDIN_FILENO;
if (status != record_size)
- archive_write_error (status);
+ archive_write_error (status);
}
- multi_volume_sync ();
-
for (;;)
{
status = rmtread (archive, record_start->buffer, record_size);
if (status == record_size)
- {
- records_read++;
- return;
- }
+ {
+ 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 */
+ || (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;
- }
+ || (status == SAFE_READ_ERROR && errno == ENOSPC))
+ && multi_volume_option)
+ {
+ while (!try_new_volume ())
+ ;
+ if (current_block == record_end)
+ /* Necessary for blocking_factor == 1 */
+ flush_archive();
+ return;
+ }
else if (status == SAFE_READ_ERROR)
- {
- archive_read_error ();
- continue;
- }
+ {
+ archive_read_error ();
+ continue;
+ }
break;
}
short_read (status);
@@ -1577,22 +1877,31 @@ _gnu_flush_write (size_t buffer_level)
char *copy_ptr;
size_t copy_size;
size_t bufsize;
+ struct bufmap *map;
status = _flush_write ();
if (status != record_size && !multi_volume_option)
archive_write_error (status);
else
{
- records_written++;
+ if (status)
+ records_written++;
bytes_written += status;
}
if (status == record_size)
{
- multi_volume_sync ();
return;
}
+ map = bufmap_locate (status);
+
+ if (status % BLOCKSIZE)
+ {
+ ERROR ((0, 0, _("write did not end on a block boundary")));
+ archive_write_error (status);
+ }
+
/* In multi-volume mode. */
/* ENXIO is for the UNIX PC. */
if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
@@ -1601,7 +1910,7 @@ _gnu_flush_write (size_t buffer_level)
if (!new_volume (ACCESS_WRITE))
return;
- xheader_destroy (&extended_header);
+ tar_stat_destroy (&dummy);
increase_volume_number ();
prev_written += bytes_written;
@@ -1609,21 +1918,28 @@ _gnu_flush_write (size_t buffer_level)
copy_ptr = record_start->buffer + status;
copy_size = buffer_level - status;
+
/* Switch to the next buffer */
record_index = !record_index;
init_buffer ();
+ inhibit_map = 1;
+
if (volume_label_option)
add_volume_label ();
- if (real_s_name)
- add_multi_volume_header ();
+ if (map)
+ add_multi_volume_header (map);
+
+ write_extended (true, &dummy, find_next_block ());
+ tar_stat_destroy (&dummy);
- write_extended (true, NULL, find_next_block ());
- if (real_s_name)
- add_chunk_header ();
+ if (map)
+ add_chunk_header (map);
header = find_next_block ();
+ bufmap_reset (map, header - record_start);
bufsize = available_space_after (header);
+ inhibit_map = 0;
while (bufsize < copy_size)
{
memcpy (header->buffer, copy_ptr, bufsize);
@@ -1648,13 +1964,13 @@ gnu_flush_write (size_t buffer_level)
}
void
-flush_read ()
+flush_read (void)
{
flush_read_ptr ();
}
void
-flush_write ()
+flush_write (void)
{
flush_write_ptr (record_size);
}
@@ -1669,17 +1985,15 @@ open_archive (enum access_mode wanted_access)
switch (wanted_access)
{
case ACCESS_READ:
+ case ACCESS_UPDATE:
if (volume_label_option)
- match_volume_label ();
+ match_volume_label ();
break;
case ACCESS_WRITE:
records_written = 0;
if (volume_label_option)
- write_volume_label ();
- break;
-
- default:
+ write_volume_label ();
break;
}
set_volume_start_time ();