Rewrite update algorithm.
* src/common.h (namebuf_t): New typedef. (namebuf_create, namebuf_free) (namebuf_name): New prototypes. (remname): New prototype. * src/misc.c (struct namebuf): New structure. (namebuf_create, namebuf_free) (namebuf_name): New functions. * src/create.c (dup_dir0): Remove is_avoided_name checks. This is taken care of in update_archive. * src/incremen.c (scan_directory): Use namebuf to produce full file names. * src/names.c (nametail): Remove extra level of indirection. All uses updated. (avoided_name_table, add_avoided_name) (is_avoided_name): Remove. * src/update.c (update_archive): Change algorithm. Instead of adding unmodified files to the avoided_name table, create namelist so that it contains only modified files. * tests/Makefile.am: Add update01.at, update02.at * tests/testsuite.at: Likewise. * tests/update.at (AT_KEYWORDS): Add update00.
This commit is contained in:
@@ -130,6 +130,8 @@ TESTSUITE_AT = \
|
||||
spmvp10.at\
|
||||
truncate.at\
|
||||
update.at\
|
||||
update01.at\
|
||||
update02.at\
|
||||
volsize.at\
|
||||
volume.at\
|
||||
verbose.at\
|
||||
|
||||
@@ -207,6 +207,8 @@ m4_include([spmvp01.at])
|
||||
m4_include([spmvp10.at])
|
||||
|
||||
m4_include([update.at])
|
||||
m4_include([update01.at])
|
||||
m4_include([update02.at])
|
||||
|
||||
m4_include([volume.at])
|
||||
m4_include([volsize.at])
|
||||
|
||||
@@ -23,9 +23,10 @@
|
||||
# References: <42AB0D28.6030706@mein-horde.de>
|
||||
# by Martin Lohmeier <martin@mein-horde.de>
|
||||
# on Sat, 11 Jun 2005 18:11:20 +0200
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2005-06/msg00024.html
|
||||
|
||||
AT_SETUP([update unchanged directories])
|
||||
AT_KEYWORDS([update])
|
||||
AT_KEYWORDS([update update00])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
|
||||
58
tests/update01.at
Normal file
58
tests/update01.at
Normal file
@@ -0,0 +1,58 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
|
||||
# Test suite for GNU tar.
|
||||
# Copyright (C) 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: If dir is a directory and arc is a tar archive which
|
||||
# contains that directory, and dir contains some modifications added
|
||||
# after adding it to the archive, then `tar -u dir' would add dir/ to
|
||||
# the archive.
|
||||
# Last-Affected-Version: 1.22.90
|
||||
# References: <4AD4E703.80500@teclabs.eu>
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2009-10/msg00017.html
|
||||
|
||||
AT_SETUP([update directories])
|
||||
AT_KEYWORDS([update update01])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
mkdir a
|
||||
genfile --file a/b
|
||||
|
||||
tar cf arc a
|
||||
|
||||
echo "separator"
|
||||
|
||||
sleep 2
|
||||
genfile --file a/c
|
||||
|
||||
tar ufv arc a
|
||||
echo "separator"
|
||||
tar tf arc | sort || exit 1
|
||||
],
|
||||
[0],
|
||||
[separator
|
||||
a/c
|
||||
separator
|
||||
a/
|
||||
a/b
|
||||
a/c
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
55
tests/update02.at
Normal file
55
tests/update02.at
Normal file
@@ -0,0 +1,55 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
|
||||
# Test suite for GNU tar.
|
||||
# Copyright (C) 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: See update01.at
|
||||
# Last-Affected-Version: 1.22.90
|
||||
# References: <4AD4E703.80500@teclabs.eu>
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2009-10/msg00017.html
|
||||
|
||||
AT_SETUP([update changed files])
|
||||
AT_KEYWORDS([update update02])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_SORT_PREREQ
|
||||
mkdir a
|
||||
genfile --file a/b
|
||||
|
||||
tar cf arc a
|
||||
|
||||
echo "separator"
|
||||
|
||||
sleep 2
|
||||
touch a/b
|
||||
|
||||
tar ufv arc a
|
||||
echo "separator"
|
||||
tar tf arc | sort || exit 1
|
||||
],
|
||||
[0],
|
||||
[separator
|
||||
a/b
|
||||
separator
|
||||
a/
|
||||
a/b
|
||||
a/b
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
Reference in New Issue
Block a user