1bcbbcf1ff
The modified algorithm tries to avoid dumping the same directory twice and ensures the order of the directories in the resulting archive is the same, whatever their order on the command line. It also fixes the operation of --listed-incremental -C. * gnulib.modules: Add canonicalize * src/common.h (incremental_level): New global. (check_exclusion_tags): first argument is const. (get_directory_contents): Add third argument. (zap_slashes, normalize_filename): New prototypes. (chdir_count): New prototype. (WARN_VERBOSE_WARNINGS): New define. (WARN_ALL): Exclude WARN_VERBOSE_WARNINGS. * src/compare.c (diff_dumpdir): Update the call to get_directory_contents. * src/create.c (check_exclusion_tags): First argument is const. Use ISSLASH and DIRECTORY_SEPARATOR instead of referring to '/'. * src/incremen.c (struct directory): New member `caname'. (hash_directory_name): Rename to hash_directory_canonical_name. Operate on the canonical name. (compare_directory_names): Rename to compare_directory_canonical_names. Operate on the canonical name. (make_directory): Take two arguments. (free_directory): Free caname. (attach_directory): Create caname. (find_directory): Use caname for lookups. (PD_VERBOSE): Remove. (PD_FORCE_INIT): New define. (procdir): First argument is const. Reinitialize directory if PD_FORCE_INIT bit is set. Do not use PD_VERBOSE or verbose_option for issuing warnings. Rely on WARNOPT instead. Always set *entry. (scan_directory): Take three arguments. The third one is a boolean which is true if the directory is explicitly mentioned on the command line. (get_directory_contents): Remove. Use scan_directory instead. All callers updated. (read_directory_file): Truncate the file if --level=0 is given. * src/misc.c: Include canonicalize.h (zap_slashes, normalize_filename): New functions. (chdir_count): New function. * src/names.c (add_hierarchy_to_namelist): Take three arguments, as get_directory_contents and scan_directory. (collect_and_sort_names): Allow at most one -C, before file name arguments. Read directory file after eventual changing to another directory. Avoid adding the same directory under different pathnames to the list. * src/tar.c: New option --level. * tests/incr03.at, tests/incr04.at, tests/listed01.at, tests/listed02.at, tests/rename01.at, tests/rename02.at, tests/rename03.at: Update for new tar behavior. * tests/multiv01.at: Do not use --listed-incremental.
106 lines
2.2 KiB
Plaintext
106 lines
2.2 KiB
Plaintext
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
|
|
|
# Test suite for GNU tar.
|
|
# Copyright (C) 2006, 2007, 2009 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, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
# 02110-1301, USA.
|
|
|
|
# Description: Incremental archives should be able to handle directories
|
|
# moved between directory hierarchies.
|
|
|
|
AT_SETUP([move between hierarchies])
|
|
AT_KEYWORDS([incremental rename rename02])
|
|
|
|
AT_TAR_CHECK([
|
|
AT_SORT_PREREQ
|
|
mkdir foo
|
|
genfile --file foo/file1
|
|
genfile --file foo/file2
|
|
mkdir foo/bar
|
|
genfile --file foo/bar/file.r
|
|
mkdir foo/bar/baz
|
|
genfile --file foo/bar/baz/file.z
|
|
|
|
sleep 1
|
|
|
|
echo "Creating base archive"
|
|
tar -g incr -cf arch.1 -v foo
|
|
|
|
mv foo/bar/baz foo
|
|
|
|
echo "Creating incremental archive"
|
|
tar -g incr -cf arch.2 -v foo
|
|
|
|
mv foo old
|
|
|
|
tar xfg arch.1 /dev/null 2>tmperr
|
|
sort tmperr >&2
|
|
|
|
echo "Begin directory listing 1"
|
|
find foo | sort
|
|
echo "End directory listing 1"
|
|
|
|
tar xfgv arch.2 /dev/null
|
|
echo Begin directory listing 2
|
|
find foo | sort
|
|
echo End directory listing 2
|
|
],
|
|
[0],
|
|
[Creating base archive
|
|
foo/
|
|
foo/bar/
|
|
foo/bar/baz/
|
|
foo/file1
|
|
foo/file2
|
|
foo/bar/file.r
|
|
foo/bar/baz/file.z
|
|
Creating incremental archive
|
|
foo/
|
|
foo/bar/
|
|
foo/baz/
|
|
Begin directory listing 1
|
|
foo
|
|
foo/bar
|
|
foo/bar/baz
|
|
foo/bar/baz/file.z
|
|
foo/bar/file.r
|
|
foo/file1
|
|
foo/file2
|
|
End directory listing 1
|
|
foo/
|
|
foo/bar/
|
|
foo/baz/
|
|
Begin directory listing 2
|
|
foo
|
|
foo/bar
|
|
foo/bar/file.r
|
|
foo/baz
|
|
foo/baz/file.z
|
|
foo/file1
|
|
foo/file2
|
|
End directory listing 2
|
|
],
|
|
[tar: foo: Directory is new
|
|
tar: foo/bar: Directory is new
|
|
tar: foo/bar/baz: Directory is new
|
|
tar: foo/baz: Directory has been renamed from `foo/bar/baz'
|
|
],
|
|
[],[],[gnu, oldgnu, posix])
|
|
|
|
AT_CLEANUP
|
|
|
|
# End of rename02.at
|