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

Use relative addressing in deferred unlinks.

Browse Source 
* src/common.h (tar_dirname): New function.
* src/misc.c (normalize_filename_x): Make extern.
(tar_dirname): New function.
(tar_getcwd): Take into account absoulte pathnames.
* src/unlink.c (deferred_unlink) <dir_idx>: New member; keeps the
value of chdir_current at the moment of structure allocation.
(flush_deferred_unlinks): Use chdir_do and relative addressing.
(queue_deferred_unlink): Initialize dir_idx.
* tests/Makefile.am: Add new tests.
* tests/testsuite.at: Add new tests.
* tests/remfiles06.at: Fix description.
* tests/remfiles07.at: Fix description.
* tests/remfiles08.at: New test case.
This commit is contained in:
Sergey Poznyakoff
2013-09-26 15:41:47 +03:00
parent 5cb79ed519
commit f7077dd38b
8 changed files with 99 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/misc.c
View File

@@ -229,11 +229,12 @@ zap_slashes (char *name)
}
/* Normalize FILE_NAME by removing redundant slashes and "."
components, including redundant trailing slashes. Leave ".."
alone, as it may be significant in the presence of symlinks and on
platforms where "/.." != "/". Destructive version: modifies its
argument. */
static void
components, including redundant trailing slashes.
Leave ".." alone, as it may be significant in the presence
of symlinks and on platforms where "/.." != "/".
Destructive version: modifies its argument. */
void
normalize_filename_x (char *file_name)
{
char *name = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
@@ -267,8 +268,9 @@ normalize_filename_x (char *file_name)
}
/* Normalize NAME by removing redundant slashes and "." components,
including redundant trailing slashes. Return a normalized
newly-allocated copy. */
including redundant trailing slashes.
Return a normalized newly-allocated copy. */
char *
normalize_filename (const char *name)
@@ -978,6 +980,12 @@ chdir_do (int i)
}
}
const char *
tar_dirname (void)
{
return wd[chdir_current].name;
}
const char *
tar_getcwd (void)
{
@@ -993,8 +1001,10 @@ tar_getcwd (void)
if (0 == chdir_current || !wd[chdir_current].cwd)
{
if (IS_ABSOLUTE_FILE_NAME (wd[chdir_current].name))
return wd[chdir_current].name;
{
wd[chdir_current].cwd = xstrdup (wd[chdir_current].name);
return wd[chdir_current].cwd;
}
if (!wd[0].cwd)
wd[0].cwd = cwd;