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

Fix --verbatim-files-from

Browse Source 
* src/names.c (read_next_name): Don't unquote name read from the
file, if --verbatim-files-from option is in effect.
(names_options): improve description of --verbatim-files-from
* tests/T-null2.at: Test the change.
This commit is contained in:
Sergey Poznyakoff
2017-11-09 08:59:36 +02:00
parent 13edc746f6
commit dee7e3f16e
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/names.c
View File

@@ -84,7 +84,7 @@ static struct argp_option names_options[] = {
{"no-unquote", NO_UNQUOTE_OPTION, 0, 0,
N_("do not unquote input file or member names"), GRID+1 },
{"verbatim-files-from", VERBATIM_FILES_FROM_OPTION, 0, 0,
N_("-T reads file names verbatim (no option handling)"), GRID+1 },
N_("-T reads file names verbatim (no escape or option handling)"), GRID+1 },
{"no-verbatim-files-from", NO_VERBATIM_FILES_FROM_OPTION, 0, 0,
N_("-T treats file names starting with dash as options (default)"),
GRID+1 },
@@ -1027,12 +1027,15 @@ read_next_name (struct name_elt *ent, struct name_elt *ret)
ent->v.file.term = 0;
/* fall through */
case file_list_success:
if (unquote_option)
unquote_string (name_buffer);
if (!ent->v.file.verbatim && handle_option (name_buffer, ent) == 0)
if (!ent->v.file.verbatim)
{
name_list_adjust ();
return 1;
if (unquote_option)
unquote_string (name_buffer);
if (handle_option (name_buffer, ent) == 0)
{
name_list_adjust ();
return 1;
}
}
ret->type = NELT_NAME;
ret->v.name = name_buffer;

3
tests/T-null2.at
View File

@@ -25,11 +25,13 @@ AT_TAR_CHECK([
AT_DATA([file-list],[a
-b
--c d
:\\.jpg
])
genfile -f a
genfile -f -b
genfile -f '--c d'
genfile -f ':\\.jpg'
cat file-list | tr '\n' '\0' | tar -c -f archive -v --null -T -
],
@@ -37,6 +39,7 @@ cat file-list | tr '\n' '\0' | tar -c -f archive -v --null -T -
[a
-b
--c d
:\\\\.jpg
],
[],[],[],[ustar]) # Testing one format is enough