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

Update invocations of safer_name_suffix()

Browse Source
This commit is contained in:
Sergey Poznyakoff
2005-05-21 23:10:42 +00:00
parent 9129c846e7
commit f2c8b1dff3
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/buffer.c
View File

@@ -587,7 +587,9 @@ flush_write (void)
{
if (save_name)
{
assign_string (&real_s_name, safer_name_suffix (save_name, false));
assign_string (&real_s_name,
safer_name_suffix (save_name, false,
absolute_names_option));
real_s_totsize = save_totsize;
real_s_sizeleft = save_sizeleft;
}
@@ -693,7 +695,9 @@ flush_write (void)
assign_string (&real_s_name, 0);
else
{
assign_string (&real_s_name, safer_name_suffix (save_name, false));
assign_string (&real_s_name,
safer_name_suffix (save_name, false,
absolute_names_option));
real_s_sizeleft = save_sizeleft;
real_s_totsize = save_totsize;
}
@@ -821,7 +825,9 @@ flush_read (void)
{
if (save_name)
{
assign_string (&real_s_name, safer_name_suffix (save_name, false));
assign_string (&real_s_name,
safer_name_suffix (save_name, false,
absolute_names_option));
real_s_sizeleft = save_sizeleft;
real_s_totsize = save_totsize;
}

6
src/create.c
View File

@@ -1263,7 +1263,8 @@ dump_hard_link (struct tar_stat_info *st)
if ((duplicate = hash_lookup (link_table, &lp)))
{
/* We found a link. */
char const *link_name = safer_name_suffix (duplicate->name, true);
char const *link_name = safer_name_suffix (duplicate->name, true,
absolute_names_option);
duplicate->nlink--;
@@ -1361,7 +1362,8 @@ dump_file0 (struct tar_stat_info *st, char *p,
return;
assign_string (&st->orig_file_name, p);
assign_string (&st->file_name, safer_name_suffix (p, false));
assign_string (&st->file_name,
safer_name_suffix (p, false, absolute_names_option));
if (deref_stat (dereference_option, p, &st->stat) != 0)
{

6
src/extract.c
View File

@@ -778,7 +778,8 @@ extract_file (char *file_name, int typeflag)
static int
extract_link (char *file_name, int typeflag)
{
char const *link_name = safer_name_suffix (current_stat_info.link_name, true);
char const *link_name = safer_name_suffix (current_stat_info.link_name,
true, absolute_names_option);
int interdir_made = 0;
do
@@ -1133,7 +1134,8 @@ extract_archive (void)
if (verbose_option)
print_header (&current_stat_info, -1);
file_name = safer_name_suffix (current_stat_info.file_name, false);
file_name = safer_name_suffix (current_stat_info.file_name,
false, absolute_names_option);
if (strip_name_components)
{
size_t prefix_len = stripped_prefix_len (file_name, strip_name_components);

3
src/xheader.c
View File

@@ -246,7 +246,8 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, bool allow_n)
case 'd':
if (st)
{
dir = safer_name_suffix (dir_name (st->orig_file_name), false);
dir = safer_name_suffix (dir_name (st->orig_file_name),
false, absolute_names_option);
len += strlen (dir) - 1;
}
break;