/* Buffer management for tar.
Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
- 2003, 2004 Free Software Foundation, Inc.
+ 2003, 2004, 2005 Free Software Foundation, Inc.
Written by John Gilmore, on 1985-08-25.
struct zip_magic
{
enum compress_type type;
- unsigned char *magic;
size_t length;
- char *program;
- char *option;
+ char magic[sizeof "BZh" - 1];
+ char program[sizeof "compress"];
+ char option[sizeof "-Z"];
};
-static struct zip_magic magic[] = {
+static struct zip_magic const magic[] = {
{ ct_none, },
- { ct_compress, "\037\235", 2, "compress", "-Z" },
- { ct_gzip, "\037\213", 2, "gzip", "-z" },
- { ct_bzip2, "BZh", 3, "bzip2", "-j" },
+ { 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_program(t) magic[t].program
/* Check if the file ARCHIVE is a compressed archive. */
-enum compress_type
+enum compress_type
check_compressed_archive ()
{
- struct zip_magic *p;
- size_t status;
+ struct zip_magic const *p;
bool sfr, srp;
/* Prepare global data needed for find_next_block: */
for (p = magic + 1; p < magic + NMAGIC; p++)
if (memcmp (record_start->buffer, p->magic, p->length) == 0)
- {
- hit_eof = false; /* It might have been set by find_next_block */
- return p->type;
- }
-
+ return p->type;
+
return ct_none;
}
int
open_compressed_archive ()
{
- enum compress_type type;
-
archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
MODE_RW, rsh_command_option);
if (archive == -1)
return archive;
- type = check_compressed_archive ();
-
- if (type == ct_none)
- 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 = reading_from_pipe = true;
+ }
- /* FD is not needed any more */
- rmtclose (archive);
-
- /* Open compressed archive */
- use_compress_program_option = compress_program (type);
- child_pid = sys_child_open_for_uncompress ();
- read_full_records = reading_from_pipe = true;
-
records_read = 0;
record_end = record_start; /* set up for 1st record = # 0 */
-
+
return archive;
}
\f
char bytes[sizeof (tarlong) * CHAR_BIT];
char abbr[LONGEST_HUMAN_READABLE + 1];
char rate[LONGEST_HUMAN_READABLE + 1];
-
+
int human_opts = human_autoscale | human_base_1024 | human_SI | human_B;
sprintf (bytes, TARLONG_FORMAT, written);
read_full_records = read_full_records_option;
reading_from_pipe = false;
-
+
records_read = 0;
-
+
if (use_compress_program_option)
{
switch (wanted_access)
case ACCESS_READ:
{
enum compress_type type;
-
+
archive = STDIN_FILENO;
type = check_compressed_archive (archive);
ssize_t status;
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 (tape_length_option && tape_length_option <= bytes_written)
FATAL_ERROR ((0, 0,
_("%s: file name too long to be stored in a GNU multivolume header"),
quotearg_colon (real_s_name)));
-
+
memset (record_start, 0, BLOCKSIZE);
/* FIXME: Michael P Urban writes: [a long name file] is being written
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 (¤t_stat_info, record_start, -1);
{
char buf[UINTMAX_STRSIZE_BOUND];
- WARN((0, 0, _("Read %s bytes from %s"),
+ WARN((0, 0,
+ ngettext ("Read %s byte from %s",
+ "Read %s bytes from %s",
+ record_size - left),
STRINGIFY_BIGINT (record_size - left, buf),
*archive_name_cursor));
}
size_t status; /* result from system call */
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));
/* Clear the count of errors. This only applies to a single call to
off_t offset;
off_t nrec, nblk;
off_t skipped = (blocking_factor - (current_block - record_start));
-
+
size -= skipped * BLOCKSIZE;
-
+
if (size < record_size)
return 0;
/* FIXME: flush? */
-
+
/* Compute number of records to skip */
nrec = size / record_size;
offset = rmtlseek (archive, nrec * record_size, SEEK_CUR);
records_read += nblk / blocking_factor;
record_start_block = offset - blocking_factor;
current_block = record_end;
-
+
return nblk;
}
sys_drain_input_pipe ();
compute_duration ();
- if (verify_option)
+ if (verify_option)
verify_volume ();
if (rmtclose (archive) != 0)
if (volno_file_option)
closeout_volume_number ();
if (system (info_script_option) != 0)
- FATAL_ERROR ((0, 0, _("`%s' command failed"), info_script_option));
+ FATAL_ERROR ((0, 0, _("%s command failed"),
+ quote (info_script_option)));
}
else
while (1)
return true;
}
-