X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fbuffer.c;h=239d3f19f44f42580330add63bb01ec7c549a8d7;hb=f6edb92580aa886a2a0189463c19189a050dc62d;hp=a01af374c3b4a00d77992d057e739f4274757c75;hpb=be34933b638b75a40513ea2b724c756b1f8e3b85;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index a01af37..239d3f1 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,7 +1,8 @@ /* Buffer management for tar. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software + Foundation, Inc. Written by John Gilmore, on 1985-08-25. @@ -35,9 +36,6 @@ /* 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]*" - /* Variables. */ static tarlong prev_written; /* bytes written on previous volumes */ @@ -56,7 +54,7 @@ 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 */ @@ -177,8 +175,8 @@ set_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; @@ -203,6 +201,7 @@ enum compress_type { ct_compress, ct_gzip, ct_bzip2, + ct_lzip, ct_lzma, ct_lzop, ct_xz @@ -212,20 +211,21 @@ struct zip_magic { enum compress_type type; size_t length; - char *magic; - char *program; - char *option; + char const *magic; + char const *program; + char const *option; }; static struct zip_magic const magic[] = { { ct_tar }, { ct_none, }, - { ct_compress, 2, "\037\235", "compress", "-Z" }, - { ct_gzip, 2, "\037\213", "gzip", "-z" }, - { ct_bzip2, 3, "BZh", "bzip2", "-j" }, - { ct_lzma, 6, "\xFFLZMA", "lzma", "--lzma" }, /* FIXME: ???? */ - { ct_lzop, 4, "\211LZO", "lzop", "--lzop" }, - { ct_xz, 6, "\0xFD7zXZ", "-J" }, + { ct_compress, 2, "\037\235", COMPRESS_PROGRAM, "-Z" }, + { ct_gzip, 2, "\037\213", GZIP_PROGRAM, "-z" }, + { ct_bzip2, 3, "BZh", BZIP2_PROGRAM, "-j" }, + { ct_lzip, 4, "LZIP", LZIP_PROGRAM, "--lzip" }, + { ct_lzma, 6, "\xFFLZMA", LZMA_PROGRAM, "--lzma" }, + { ct_lzop, 4, "\211LZO", LZOP_PROGRAM, "--lzop" }, + { ct_xz, 6, "\0xFD7zXZ", XZ_PROGRAM, "-J" }, }; #define NMAGIC (sizeof(magic)/sizeof(magic[0])) @@ -234,7 +234,7 @@ static struct zip_magic const magic[] = { #define compress_program(t) magic[t].program /* Check if the file ARCHIVE is a compressed archive. */ -enum compress_type +static enum compress_type check_compressed_archive (bool *pshort) { struct zip_magic const *p; @@ -243,14 +243,14 @@ check_compressed_archive (bool *pshort) if (!pshort) pshort = &temp; - + /* Prepare global data needed for find_next_block: */ record_end = record_start; /* set up for 1st record = # 0 */ sfr = read_full_records; read_full_records = true; /* Suppress fatal error on reading a partial record */ *pshort = find_next_block () == 0; - + /* Restore global values */ read_full_records = sfr; @@ -265,11 +265,42 @@ check_compressed_archive (bool *pshort) 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); @@ -289,13 +320,13 @@ open_compressed_archive () if (shortfile) ERROR ((0, 0, _("This does not look like a tar archive"))); return archive; - + case ct_none: if (shortfile) ERROR ((0, 0, _("This does not look like a tar archive"))); set_comression_program_by_suffix (archive_name_array[0], NULL); if (!use_compress_program_option) - return archive; + return archive; break; default: @@ -303,7 +334,7 @@ open_compressed_archive () break; } } - + /* FD is not needed any more */ rmtclose (archive); @@ -455,7 +486,7 @@ xclose (int fd) } static void -init_buffer () +init_buffer (void) { if (! record_buffer_aligned[record_index]) record_buffer_aligned[record_index] = @@ -565,6 +596,8 @@ _open_archive (enum access_mode wanted_access) { case ACCESS_READ: archive = open_compressed_archive (); + if (archive >= 0) + guess_seekable_archive (); break; case ACCESS_WRITE: @@ -624,7 +657,7 @@ _open_archive (enum access_mode wanted_access) } /* Perform a write to flush the buffer. */ -ssize_t +static ssize_t _flush_write (void) { ssize_t status; @@ -639,7 +672,7 @@ _flush_write (void) status = record_size; else status = sys_write_archive_buffer (); - + return status; } @@ -680,7 +713,7 @@ archive_read_error (void) } static bool -archive_is_dev () +archive_is_dev (void) { struct stat st; @@ -823,16 +856,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; @@ -923,7 +956,7 @@ closeout_volume_number (void) static void -increase_volume_number () +increase_volume_number (void) { global_volno++; if (global_volno < 0) @@ -931,13 +964,13 @@ 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); @@ -1055,7 +1088,7 @@ 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_error (*archive_name_cursor); @@ -1098,6 +1131,7 @@ new_volume (enum access_mode mode) case ACCESS_READ: archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW, rsh_command_option); + guess_seekable_archive (); break; case ACCESS_WRITE: @@ -1133,7 +1167,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); @@ -1143,13 +1177,13 @@ 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; enum access_mode acc; - + switch (subcommand_option) { case APPEND_SUBCOMMAND: @@ -1165,7 +1199,7 @@ try_new_volume () if (!new_volume (acc)) return true; - + while ((status = rmtread (archive, record_start->buffer, record_size)) == SAFE_READ_ERROR) archive_read_error (); @@ -1181,17 +1215,42 @@ try_new_volume () { case XGLTYPE: { - if (!read_header0 (&dummy)) - return false; + tar_stat_init (&dummy); + if (read_header (&header, &dummy, read_header_x_global) + != HEADER_SUCCESS_EXTENDED) + { + ERROR ((0, 0, _("This does not look like a tar archive"))); + return false; + } + xheader_decode (&dummy); /* decodes values from the global header */ tar_stat_destroy (&dummy); - if (!real_s_name) - { - /* We have read the extended header of the first member in - this volume. Put it back, so next read_header works as - expected. */ - current_block = record_start; - } + + /* 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; } @@ -1268,7 +1327,7 @@ try_new_volume () STRINGIFY_BIGINT (real_s_totsize, totsizebuf), STRINGIFY_BIGINT (real_s_sizeleft, s1buf), STRINGIFY_BIGINT (continued_file_offset, s2buf))); - + return false; } } @@ -1278,31 +1337,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; } @@ -1311,14 +1396,43 @@ 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) + 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 (!volume_label) FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"), quote (volume_label_option))); - if (!check_label_pattern (label)) + + if (!check_label_pattern (volume_label)) FATAL_ERROR ((0, 0, _("Volume %s does not match %s"), - quote_n (0, label->header.name), + quote_n (0, volume_label), quote_n (1, volume_label_option))); } @@ -1363,7 +1477,7 @@ add_volume_label (void) } static void -add_chunk_header () +add_chunk_header (void) { if (archive_format == POSIX_FORMAT) { @@ -1454,7 +1568,7 @@ add_multi_volume_header (void) /* Synchronize multi-volume globals */ static void -multi_volume_sync () +multi_volume_sync (void) { if (multi_volume_option) { @@ -1485,7 +1599,7 @@ simple_flush_read (void) size_t status; /* result from system call */ checkpoint_run (false); - + /* Clear the count of errors. This only applies to a single call to flush_read. */ @@ -1544,7 +1658,7 @@ _gnu_flush_read (void) size_t status; /* result from system call */ checkpoint_run (false); - + /* Clear the count of errors. This only applies to a single call to flush_read. */ @@ -1613,14 +1727,14 @@ _gnu_flush_write (size_t buffer_level) size_t copy_size; size_t bufsize; tarlong wrt; - + status = _flush_write (); if (status != record_size && !multi_volume_option) archive_write_error (status); else { if (status) - records_written++; + records_written++; bytes_written += status; } @@ -1635,7 +1749,7 @@ _gnu_flush_write (size_t buffer_level) 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) @@ -1653,7 +1767,7 @@ _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 (); @@ -1666,7 +1780,7 @@ _gnu_flush_write (size_t buffer_level) write_extended (true, &dummy, find_next_block ()); tar_stat_destroy (&dummy); - + if (real_s_name) add_chunk_header (); wrt = bytes_written; @@ -1727,6 +1841,7 @@ open_archive (enum access_mode wanted_access) switch (wanted_access) { case ACCESS_READ: + case ACCESS_UPDATE: if (volume_label_option) match_volume_label (); break; @@ -1736,9 +1851,6 @@ open_archive (enum access_mode wanted_access) if (volume_label_option) write_volume_label (); break; - - default: - break; } set_volume_start_time (); }