mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-09-19 14:44:13 +00:00
Fix handling of filename-selection options.
Filename-selection options are --wildcards, --recursive, etc. (see names.c for a complete list). These options are position-sensitive, i.e. each such option affects all filenames and filename-selection options that appear after it until eventually cancelled by a corresponding counterpart option. These options can appear in "file-from" file lists, which means that they cannot be handled right away, but instead should be put on the "name_elt" list and processed sequentionally, as file name arguments are. * src/common.h (warn_regex_usage): Remove. (name_add_name): Change signature. (name_add_dir, name_add_file): Remove prototypes. * src/names.c (name_add_option, name_add_dir) (name_add_file): Static functions. (names_options, is_file_selection_option, names_parse_opt): Static functions. (names_argp_children): New variable. (NELT_NAME, NELT_CHDIR) (NELT_FILE, NELT_NOOP): Redefine as enum nelt_type. (NELT_FMASK): Remove. (NELT_OPTION): New constant. (name_elt) <type>: Change type. <v.opt>: New member. (name_elt_alloc_matflags): Remove. (name_add_name): Take one argument. (name_add_option): New static function. (name_add_file): Take one argument. (read_next_name): Use filename_terminator and verbatim_files_from_option to initialize file.term and file.verbatim. * src/tar.c: Move handling of filename-selection options to names.c * tests/T-dir00.at: Fix typo. * tests/T-recurse.at: Remove expected failure.
This commit is contained in:
+1
-1
@@ -18,7 +18,7 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Tar 1.27 and 1.28 did not extract files under directory memberes listed
|
||||
# Tar 1.27 and 1.28 did not extract files under directory members listed
|
||||
# in the file read by --file-from.
|
||||
#
|
||||
# Reported-by: Jean-Louis Martineau <martineau@zmanda.com>
|
||||
|
||||
@@ -85,7 +85,6 @@ AT_DATA([F2],[directory2/
|
||||
tar cf archive -T F1 --recursion -T F2
|
||||
tar tf archive
|
||||
|
||||
AT_XFAIL_IF([true])
|
||||
],
|
||||
[0],
|
||||
[directory1/
|
||||
|
||||
Reference in New Issue
Block a user