mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix --exclude-ignore option.

Browse Source 
This fixes https://savannah.gnu.org/bugs/?64387.

* src/exclist.c (info_attach_exclist): Always use file->flags.
(exclude_vcs_ignores): Pass flags from struct vcs_ignore_file
to excfile_add.

* tests/exclude19.at: New test.
* tests/exclude20.at: New test.
* tests/Makefile.am: Add new tests.
* tests/testsuite.at: Add new tests.
This commit is contained in:
Sergey Poznyakoff
2024-01-15 21:24:34 +02:00
parent d763055edd
commit f622c07108
6 changed files with 97 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/exclist.c
View File

@@ -118,8 +118,7 @@ info_attach_exclist (struct tar_stat_info *dir)
ent = xmalloc (sizeof (*ent));
ent->excluded = ex;
ent->flags = file->flags == EXCL_DEFAULT
? file->flags : vcsfile->flags;
ent->flags = file->flags;
ent->prev = tail;
ent->next = NULL;
@@ -333,5 +332,5 @@ exclude_vcs_ignores (void)
struct vcs_ignore_file *p;
for (p = vcs_ignore_files; p->filename; p++)
excfile_add (p->filename, EXCL_DEFAULT);
excfile_add (p->filename, p->flags);
}

2
tests/Makefile.am
View File

@@ -108,6 +108,8 @@ TESTSUITE_AT = \
exclude16.at\
exclude17.at\
exclude18.at\
exclude19.at\
exclude20.at\
extrac01.at\
extrac02.at\
extrac03.at\

2
tests/exclude18.at
View File

@@ -28,7 +28,7 @@
# extracting.
AT_SETUP([--exclude-vcs extract list compare])
AT_KEYWORDS([exclude-vcs extract list compare exclude18])
AT_KEYWORDS([exclude exclude-vcs extract list compare exclude18])
AT_TAR_CHECK([
AT_SORT_PREREQ

47
tests/exclude19.at Normal file
View File

@@ -0,0 +1,47 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
# Copyright 2024 Free Software Foundation, Inc.
# This file is part of GNU tar.
# GNU tar 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 of the License, or
# (at your option) any later version.
# GNU tar 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/>.
# Test --exclude-ignore option.
# Ref: https://savannah.gnu.org/bugs/?64387
AT_SETUP([--exclude-ignore])
AT_KEYWORDS([exclude exclude-ignore extract exclude19])
AT_TAR_CHECK([
AT_SORT_PREREQ
mkdir dir dir/subdir
echo 1 > dir/file.ext
echo 2 > dir/subdir/file2.ext
echo '*.ext' > dir/ignorefile
tar -cf archive.tar --exclude-ignore=ignorefile dir
rm -rf dir
tar xfv archive.tar | sort
],
[0],
[dir/
dir/ignorefile
dir/subdir/
dir/subdir/file2.ext
])
AT_CLEANUP

43
tests/exclude20.at Normal file
View File

@@ -0,0 +1,43 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
# Copyright 2024 Free Software Foundation, Inc.
# This file is part of GNU tar.
# GNU tar 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 of the License, or
# (at your option) any later version.
# GNU tar 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/>.
AT_SETUP([--exclude-ignore-recursive])
AT_KEYWORDS([exclude exclude-ignore-recursive extract exclude20])
AT_TAR_CHECK([
AT_SORT_PREREQ
mkdir dir dir/subdir
echo 1 > dir/file.ext
echo 2 > dir/subdir/file2.ext
echo '*.ext' > dir/ignorefile
tar -cf archive.tar --exclude-ignore-recursive=ignorefile dir
rm -rf dir
tar xfv archive.tar | sort
],
[0],
[dir/
dir/ignorefile
dir/subdir/
])
AT_CLEANUP

2
tests/testsuite.at
View File

@@ -315,6 +315,8 @@ m4_include([exclude15.at])
m4_include([exclude16.at])
m4_include([exclude17.at])
m4_include([exclude18.at])
m4_include([exclude19.at])
m4_include([exclude20.at])
AT_BANNER([Deletions])
m4_include([delete01.at])