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

Fix spurious diagnostic during extraction of . with --keep-newer-files

Browse Source 
Bug reported in https://savannah.gnu.org/bugs/?65838.

Bug introduced by 79d1ac38c1.

* src/extract.c (make_directories): Restore second argument.  This
reverts the change made in 79d1ac38c1.
(maybe_recoverable, rename_directory): Update calls to make_directories.
* tests/extrac27.at: New file.
* tests/Makefile.am: Add new test.
* tests/testsuite.at: Likewise.
This commit is contained in:
Sergey Poznyakoff
2024-06-05 18:19:10 +03:00
parent 883f2e6dca
commit 1e6ce98e3a
4 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/extract.c
View File

@@ -709,9 +709,9 @@ fixup_delayed_set_stat (char const *src, char const *dst)
/* After a file/link/directory creation has failed due to ENOENT,
create all required directories. Return zero if all the required
directories were created, nonzero (issuing a diagnostic) otherwise.
Set *INTERDIR_MADE if at least one directory was created. */
Set *INTERDIR_MADE (unless NULL) if at least one directory was created. */
static int
make_directories (char *file_name)
make_directories (char *file_name, bool *interdir_made)
{
char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
char *cursor; /* points into the file name */
@@ -753,7 +753,8 @@ make_directories (char *file_name)
delay_set_stat (file_name,
0, mode & ~ current_umask, MODE_RWX,
desired_mode, AT_SYMLINK_NOFOLLOW);
if (interdir_made)
*interdir_made = true;
print_for_mkdir (file_name, desired_mode);
parent_end = NULL;
}
@@ -793,6 +794,9 @@ make_directories (char *file_name)
errno = parent_errno;
mkdir_error (file_name);
}
else if (interdir_made)
*interdir_made = true;
*parent_end = '/';
return stat_status;
@@ -910,11 +914,8 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)
case ENOENT:
/* Attempt creating missing intermediate directories. */
if (make_directories (file_name) == 0)
{
*interdir_made = true;
return RECOVER_OK;
}
if (make_directories (file_name, interdir_made) == 0 && *interdir_made)
return RECOVER_OK;
break;
default:
@@ -2011,7 +2012,7 @@ rename_directory (char *src, char *dst)
switch (e)
{
case ENOENT:
if (make_directories (dst) == 0)
if (make_directories (dst, NULL) == 0)
{
if (renameat (chdir_fd, src, chdir_fd, dst) == 0)
return true;