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

Improve --keep-directory-symlink performance

Browse Source 
* src/extract.c (is_directory_link): Remove; no longer needed.
(extract_dir): If --keep-directory-symlink, avoid the need
to call issymlinkat if either --dereference is not specified,
or if the plain stat fails.  This saves a syscall, simplifies
the code a bit, and should simplify future changes.
This commit is contained in:
Paul Eggert
2026-07-29 23:12:46 -07:00
parent 0ec9f0ebf6
commit d405469bf4
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extract.c
+10 -17
View File
@@ -1099,15 +1099,6 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool metadata_set)
}
}
static bool
is_directory_link (char const *file_name, struct stat *st)
{
struct fdbase f = fdbase (file_name);
return (f.fd != BADFD && issymlinkat (f.fd, f.base)
&& fstatat (f.fd, f.base, st, 0) == 0
&& S_ISDIR (st->st_mode));
}
/* Given struct stat of a directory (or directory member) whose ownership
or permissions of will be restored later, return the temporary permissions
@@ -1181,20 +1172,16 @@ extract_dir (char *file_name, char UNNAMED (typeflag))
|| old_files_option == OVERWRITE_OLD_FILES)
{
struct stat st;
st.st_mode = 0;
if (keep_directory_symlink_option
&& is_directory_link (file_name, &st))
return true;
if ((st.st_mode != 0 && fstatat_flags == 0)
|| deref_stat (file_name, &st) == 0)
if (fstatat (f.fd, f.base, &st, fstatat_flags) == 0)
{
current_mode = st.st_mode;
current_mode_mask = all_mode_bits;
if (S_ISDIR (current_mode))
{
if (keep_directory_symlink_option && !fstatat_flags
&& issymlinkat (f.fd, f.base))
return true;
if (interdir_made)
{
repair_delayed_set_stat (file_name, &st);
@@ -1202,6 +1189,12 @@ extract_dir (char *file_name, char UNNAMED (typeflag))
}
break;
}
struct stat dirst;
if (S_ISLNK (st.st_mode) && keep_directory_symlink_option
&& fstatat (f.fd, f.base, &dirst, 0) == 0
&& S_ISDIR (dirst.st_mode))
return true;
}
}
else if (update_interdir_set_stat (file_name))