X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=239d3f19f44f42580330add63bb01ec7c549a8d7;hb=f6edb92580aa886a2a0189463c19189a050dc62d;hp=ed7530342398c15f316c3c2e372db25a3c81a7f3;hpb=166b7c7d028c3dbcfded5c834b9bf752d2fb41f0;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index ed75303..239d3f1 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -36,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 */ @@ -57,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 */ @@ -178,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; @@ -204,6 +201,7 @@ enum compress_type { ct_compress, ct_gzip, ct_bzip2, + ct_lzip, ct_lzma, ct_lzop, ct_xz @@ -213,9 +211,9 @@ 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[] = { @@ -224,6 +222,7 @@ static struct zip_magic const magic[] = { { 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" }, @@ -235,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; @@ -244,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; @@ -268,7 +267,7 @@ check_compressed_archive (bool *pshort) /* Guess if the archive is seekable. */ static void -guess_seekable_archive () +guess_seekable_archive (void) { struct stat st; @@ -289,7 +288,7 @@ guess_seekable_archive () seekable_archive = !!seek_option; return; } - + if (!multi_volume_option && !use_compress_program_option && fstat (archive, &st) == 0) seekable_archive = S_ISREG (st.st_mode); @@ -300,8 +299,8 @@ guess_seekable_archive () /* 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); @@ -321,7 +320,7 @@ 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"))); @@ -335,10 +334,10 @@ open_compressed_archive () 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 */ @@ -487,7 +486,7 @@ xclose (int fd) } static void -init_buffer () +init_buffer (void) { if (! record_buffer_aligned[record_index]) record_buffer_aligned[record_index] = @@ -658,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; @@ -673,7 +672,7 @@ _flush_write (void) status = record_size; else status = sys_write_archive_buffer (); - + return status; } @@ -714,7 +713,7 @@ archive_read_error (void) } static bool -archive_is_dev () +archive_is_dev (void) { struct stat st; @@ -857,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; @@ -957,7 +956,7 @@ closeout_volume_number (void) static void -increase_volume_number () +increase_volume_number (void) { global_volno++; if (global_volno < 0) @@ -965,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); @@ -1089,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); @@ -1168,7 +1167,7 @@ read_header0 (struct tar_stat_info *info) enum read_header rc; tar_stat_init (info); - rc = read_header (¤t_header, info, false); + rc = read_header (¤t_header, info, read_header_auto); if (rc == HEADER_SUCCESS) { set_next_block_after (current_header); @@ -1178,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: @@ -1200,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 (); @@ -1216,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; } @@ -1303,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; } } @@ -1313,6 +1337,35 @@ try_new_volume () } +#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 @@ -1321,7 +1374,7 @@ static bool check_label_pattern (const char *label) { char *string; - bool result; + bool result = false; if (fnmatch (volume_label_option, label, 0) == 0) return true; @@ -1329,12 +1382,12 @@ check_label_pattern (const char *label) 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, 0) == 0; - free (string); + string = drop_volume_label_suffix (label); + if (string) + { + result = fnmatch (string, volume_label_option, 0) == 0; + free (string); + } return result; } @@ -1346,7 +1399,7 @@ match_volume_label (void) 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))); @@ -1372,11 +1425,11 @@ match_volume_label (void) 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 (volume_label)) FATAL_ERROR ((0, 0, _("Volume %s does not match %s"), quote_n (0, volume_label), @@ -1424,7 +1477,7 @@ add_volume_label (void) } static void -add_chunk_header () +add_chunk_header (void) { if (archive_format == POSIX_FORMAT) { @@ -1515,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) { @@ -1546,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. */ @@ -1605,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. */ @@ -1674,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; } @@ -1696,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) @@ -1714,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 (); @@ -1727,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; @@ -1788,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; @@ -1797,9 +1851,6 @@ open_archive (enum access_mode wanted_access) if (volume_label_option) write_volume_label (); break; - - default: - break; } set_volume_start_time (); }