mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-09-01 13:47:44 +00:00
Options to control option handling in file lists.
The --verbatim-files-from option disables option handling in
file lists. The --no-verbatim-files-from reverts its effect.
The --null option implies --verbatim-files-from. This restores
the documented behavior, broken by 26538c9b.
* src/common.h (verbatim_files_from_option): New global.
* src/names.c (name_elt): New member: file.verbatim
(name_add_file): Take 'verbatim' state as its third parameter.
(read_next_name): Don't call handle_option if file.verbatim
is set.
* src/tar.c: New options --verbatim-files-from and
--no-verbatim-files-from.
* doc/tar.texi: Document --verbatim-files-from and
--no-verbatim-files-from options.
* NEWS: Update.
* configure.ac: Version 1.28.90
* tests/T-null2.at: New testcase.
* tests/Makefile.am: Update.
* tests/testsuite.at: Update.
This commit is contained in:
+2
-1
@@ -1,6 +1,6 @@
|
||||
# Makefile for GNU tar regression tests.
|
||||
|
||||
# Copyright 1996-1997, 1999-2001, 2003-2007, 2009, 2012-2013 Free Software
|
||||
# Copyright 1996-1997, 1999-2001, 2003-2007, 2009, 2012-2015 Free Software
|
||||
|
||||
# This file is part of GNU tar.
|
||||
|
||||
@@ -47,6 +47,7 @@ TESTSUITE_AT = \
|
||||
T-dir01.at\
|
||||
T-empty.at\
|
||||
T-null.at\
|
||||
T-null2.at\
|
||||
T-rec.at\
|
||||
T-zfile.at\
|
||||
T-nonl.at\
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
# This file is part of test suite for GNU tar. -*- Autotest -*-
|
||||
# Copyright 2015 Free Software Foundation, Inc.
|
||||
#
|
||||
# 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([--null enables verbatim reading])
|
||||
AT_KEYWORDS([files-from null T-null2 T-verbatim])
|
||||
|
||||
# According to the docs, --null should read each line from the file
|
||||
# list verbatim. This feature was broken by commit 26538c9b (tar version
|
||||
# 1.27).
|
||||
|
||||
AT_TAR_CHECK([
|
||||
AT_DATA([file-list],[a
|
||||
-b
|
||||
--c d
|
||||
])
|
||||
|
||||
genfile -f a
|
||||
genfile -f -b
|
||||
genfile -f '--c d'
|
||||
|
||||
cat file-list | tr '\n' '\0' | tar -c -f archive -v --null -T -
|
||||
],
|
||||
[0],
|
||||
[a
|
||||
-b
|
||||
--c d
|
||||
],
|
||||
[],[],[],[ustar]) # Testing one format is enough
|
||||
|
||||
AT_CLEANUP
|
||||
+2
-1
@@ -1,7 +1,7 @@
|
||||
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
|
||||
# Test suite for GNU tar.
|
||||
# Copyright 2004-2008, 2010-2014 Free Software Foundation, Inc.
|
||||
# Copyright 2004-2008, 2010-2015 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU tar.
|
||||
|
||||
@@ -203,6 +203,7 @@ m4_include([T-rec.at])
|
||||
m4_include([T-cd.at])
|
||||
m4_include([T-empty.at])
|
||||
m4_include([T-null.at])
|
||||
m4_include([T-null2.at])
|
||||
m4_include([T-zfile.at])
|
||||
m4_include([T-nonl.at])
|
||||
m4_include([T-dir00.at])
|
||||
|
||||
Reference in New Issue
Block a user