Skip to content

src: fix cpSyncCopyDir to dereference symlinks when dereference option is set #62402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crawfordxx wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −5
Open

src: fix cpSyncCopyDir to dereference symlinks when dereference option is set #62402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3595,16 +3595,43 @@ static void CpSyncCopyDir(const FunctionCallbackInfo<Value>& args) {
}
auto symlink_target_absolute = std::filesystem::weakly_canonical(
std::filesystem::absolute(src / symlink_target));
if (dir_entry.is_directory()) {
if (dereference) {
// When dereference is true, copy the actual content the symlink
// points to rather than creating a new symlink at the destination.
error.clear();
if (std::filesystem::is_directory(symlink_target_absolute, error)) {
std::filesystem::create_directory(dest_file_path, error);
if (error) {
env->ThrowStdErrException(error, "cp", dest_str.c_str());
return false;
}
auto success =
copy_dir_contents(symlink_target_absolute, dest_file_path);
if (!success) return false;
} else {
error.clear();
std::filesystem::copy_file(
symlink_target_absolute, dest_file_path, file_copy_opts,
error);
if (error) {
env->ThrowStdErrException(error, "cp", dest_str.c_str());
return false;
}
}
} else if (dir_entry.is_directory()) {
std::filesystem::create_directory_symlink(
symlink_target_absolute, dest_file_path, error);
if (error) {
env->ThrowStdErrException(error, "cp", dest_str.c_str());
return false;
}
} else {
std::filesystem::create_symlink(
symlink_target_absolute, dest_file_path, error);
}
if (error) {
env->ThrowStdErrException(error, "cp", dest_str.c_str());
return false;
if (error) {
env->ThrowStdErrException(error, "cp", dest_str.c_str());
return false;
}
}
}
} else if (dir_entry.is_directory()) {
Expand Down