mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-09-06 08:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extraction from concatenated incremental archives with renamed directories.

Browse Source 
Complements 15c02c2b.

* src/extract.c (delayed_set_stat): Change type of file_name.
(delay_set_stat): Allocate file_name member.
(free_delayed_set_stat): Free file_name.
(fixup_delayed_set_stat): New function.
(rename_directory): Call fixup_delayed_set_stat on success.

* tests/incr11.at: New testcase.
* tests/incr10.at: Improve description.
* tests/Makefile.am: Add incr11.at
* tests/testsuite.at: Add incr11.at
This commit is contained in:
Sergey Poznyakoff
2015-11-29 21:11:08 +02:00
parent e426787454
commit d02c81df15
5 changed files with 102 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extract.c
+24 -5
View File
@@ -109,7 +109,7 @@ struct delayed_set_stat
struct xattr_array *xattr_map;
/* Length and contents of name. */
size_t file_name_len;
char file_name[1];
char *file_name;
};
static struct delayed_set_stat *delayed_set_stat_head;
@@ -441,9 +441,7 @@ delay_set_stat (char const *file_name, struct tar_stat_info const *st,
mode_t mode, int atflag)
{
size_t file_name_len = strlen (file_name);
struct delayed_set_stat *data =
xmalloc (offsetof (struct delayed_set_stat, file_name)
+ file_name_len + 1);
struct delayed_set_stat *data = xmalloc (sizeof (*data));
data->next = delayed_set_stat_head;
data->mode = mode;
if (st)
@@ -456,6 +454,7 @@ delay_set_stat (char const *file_name, struct tar_stat_info const *st,
data->mtime = st->mtime;
}
data->file_name_len = file_name_len;
data->file_name = xstrdup (file_name);
data->current_mode = current_mode;
data->current_mode_mask = current_mode_mask;
data->interdir = ! st;
@@ -540,6 +539,7 @@ repair_delayed_set_stat (char const *dir,
static void
free_delayed_set_stat (struct delayed_set_stat *data)
{
free (data->file_name);
xheader_xattr_free (data->xattr_map, data->xattr_map_size);
free (data->cntx_name);
free (data->acls_a_ptr);
@@ -569,6 +569,23 @@ remove_delayed_set_stat (const char *fname)
}
}
static void
fixup_delayed_set_stat (char const *src, char const *dst)
{
struct delayed_set_stat *data;
for (data = delayed_set_stat_head; data; data = data->next)
{
if (chdir_current == data->change_dir
&& strcmp (data->file_name, src) == 0)
{
free (data->file_name);
data->file_name = xstrdup (dst);
data->file_name_len = strlen (dst);
return;
}
}
}
/* After a file/link/directory creation has failed, see if
it's because some required directory was not present, and if so,
create all required directories. Return zero if all the required
@@ -1769,7 +1786,9 @@ extract_finish (void)
bool
rename_directory (char *src, char *dst)
{
if (renameat (chdir_fd, src, chdir_fd, dst) != 0)
if (renameat (chdir_fd, src, chdir_fd, dst) == 0)
fixup_delayed_set_stat (src, dst);
else
{
int e = errno;
bool interdir_made;