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.
52 lines
1.3 KiB
Plaintext
52 lines
1.3 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: Tar 1.23 would in some cases silently fail to create
|
|
# a continuation header in multivolume archives.
|
|
#
|
|
# In this testcase, the file `a' is 18.5 blocks long and the file `b'
|
|
# is 19.5 blocks long.
|
|
|
|
AT_SETUP([multivolume header creation])
|
|
AT_KEYWORDS([multivolume multiv multiv08])
|
|
|
|
AT_TAR_CHECK([
|
|
genfile --length 9472 --file a
|
|
genfile --length 9984 --file b
|
|
decho Creating
|
|
tar -c -M -L10 -f A.tar -f B.tar -f C.tar a b
|
|
decho Testing
|
|
tar -tMR -f A.tar -f B.tar -f C.tar
|
|
],
|
|
[0],
|
|
[Creating
|
|
Testing
|
|
block 0: a
|
|
block 21: b
|
|
block 43: ** Block of NULs **
|
|
],
|
|
[Creating
|
|
Testing
|
|
],
|
|
[],
|
|
[],
|
|
[gnu])
|
|
|
|
AT_CLEANUP
|
|
|
|
|
|
|