A separate map (bufmap) provides information for creating multi-volume continuation headers. * src/buffer.c (bufmap): New struct. (bufmap_head, bufmap_tail, inhibit_map): New variables. (mv_begin_write): New function. (mv_begin): Rename to mv_begin_read. Rewrite using mv_begin_write. All callers changed. (mv_total_size): Remove. (bufmap_locate, bufmap_free, bufmap_reset): New functions. (_flush_write): Update bufmap. (close_archive): Free bufmap. (add_chunk_header): Take a bufmap argument. (gnu_add_multi_volume_header): Likewise. (add_multi_volume_header): Likewise. (_gnu_flush_write): Rewrite using bufmap. (real_s_name, real_s_totsize) (real_s_sizeleft) (save_name, save_totsize, save_sizeleft): Removed. All uses updated. (mv_size_left): Update bufmap_head. (mv_end): Rewrite. (multi_volume_sync): Remove. * src/common.h (mv_begin_write): New prototype. (mv_begin): Rename to mv_begin_read. * src/create.c: Use mv_begin_write instead of mv_begin. Remove calls to mv_size_left and mv_end. * src/sparse.c: Likewise. * tests/multiv07.at: Close stdin. * tests/spmvp00.at: Update AT_KEYWORDS. * tests/spmvp10.at: Likewise. * tests/multiv08.at: New testcase. * tests/Makefile.am, tests/testsuite.at: Add multiv08.at.
46 lines
1.6 KiB
Plaintext
46 lines
1.6 KiB
Plaintext
# Test suite for GNU tar. -*- Autotest -*-
|
|
# Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
|
# 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 3, 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.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# Description: When creating POSIX multivolume archives, tar may in
|
|
# some cases write an extended header at the end of one volume, and
|
|
# the corresponding ustar header at the beginning of the next volume.
|
|
# Such archives do not fully comply with the POSIX specs, but tar must
|
|
# be able to read them anyway. This is what this script tests.
|
|
#
|
|
# See function try_new_volume, in file src/buffer.c near line 1227
|
|
# for additional details.
|
|
|
|
AT_SETUP([volumes split at an extended header])
|
|
AT_KEYWORDS([multivolume multiv multiv07 xsplit])
|
|
|
|
AT_CHECK([
|
|
AT_XFAIL_IF(test -f $[]XFAILFILE)
|
|
AT_TARBALL_PREREQ([xsplit-1.tar],[0e008c84c517e48fbf23ca6a7033cde6])
|
|
AT_TARBALL_PREREQ([xsplit-2.tar],[03150b9852d285458f43734e9e0b9a45])
|
|
|
|
exec <&-
|
|
|
|
cd $TEST_DATA_DIR
|
|
tar -t -M -fxsplit-1.tar -fxsplit-2.tar
|
|
],
|
|
[0],
|
|
[Archive volumes split at an extended header Volume 1
|
|
foo
|
|
bar
|
|
])
|
|
|
|
AT_CLEANUP
|