mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Copy WSL/Cygwin symbolic links (issue #2171)

Browse source
This commit is contained in:
Alexander Koblov 2025-03-01 12:42:59 +03:00
commit 031cf26473
1 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/filesources/filesystem/ufilesystemfilesource.pas
View file

@ -170,25 +170,37 @@ begin
end;
end;
procedure FillLinkProperty(const AFilePath: String; dwAttrs: DWORD; LinkProperty: TFileLinkProperty);
procedure FillLinkProperty(const AFilePath: String; AFile: TFile; FindData: PWin32FindDataW);
var
LinkAttrs: TFileAttrs;
begin
LinkProperty.LinkTo := ReadSymLink(AFilePath);
if StrBegins(LinkProperty.LinkTo, 'Volume{') then
with AFile do
begin
LinkProperty.IsLinkToDirectory := True;
LinkProperty.IsValid:= mbDriveReady(AFilePath + PathDelim);
end
else begin
LinkAttrs := mbFileGetAttrNoLinks(AFilePath);
LinkProperty.IsValid := LinkAttrs <> faInvalidAttributes;
if LinkProperty.IsValid then
LinkProperty.IsLinkToDirectory := fpS_ISDIR(LinkAttrs)
LinkProperty.LinkTo := ReadSymLink(AFilePath);
if (FindData^.dwReserved0 = IO_REPARSE_TAG_SYMLINK) or
(FindData^.dwReserved0 = IO_REPARSE_TAG_MOUNT_POINT) then
begin
if (FindData^.dwReserved0 = IO_REPARSE_TAG_MOUNT_POINT) and
(StrBegins(LinkProperty.LinkTo, 'Volume{')) then
begin
LinkProperty.IsLinkToDirectory := True;
LinkProperty.IsValid:= mbDriveReady(AFilePath + PathDelim);
end
else begin
LinkAttrs := mbFileGetAttrNoLinks(AFilePath);
LinkProperty.IsValid := LinkAttrs <> faInvalidAttributes;
if LinkProperty.IsValid then
LinkProperty.IsLinkToDirectory := fpS_ISDIR(LinkAttrs)
else begin
// On Windows links to directories are marked with Directory flag on the link.
LinkProperty.IsLinkToDirectory := fpS_ISDIR(FindData^.dwFileAttributes);
end;
end;
end
// Unknown reparse point type
else begin
// On Windows links to directories are marked with Directory flag on the link.
LinkProperty.IsLinkToDirectory := fpS_ISDIR(dwAttrs);
AttributesProperty.Value:= AttributesProperty.Value - FILE_ATTRIBUTE_REPARSE_POINT;
end;
end;
end;
@ -201,7 +213,7 @@ begin
with AFile do
begin
AttributesProperty := TNtfsFileAttributesProperty.Create(
pFindData^.dwFileAttributes);
ExtractFileAttributes(pFindData^));
SizeProperty := TFileSizeProperty.Create(
QWord(pFindData^.nFileSizeHigh) shl 32 + pFindData^.nFileSizeLow);
@ -217,9 +229,9 @@ begin
LinkProperty := TFileLinkProperty.Create;
if fpS_ISLNK(pFindData^.dwFileAttributes) then
if fpS_ISLNK(AttributesProperty.Value) then
begin
FillLinkProperty(AFilePath, pFindData^.dwFileAttributes, LinkProperty);
FillLinkProperty(AFilePath, AFile, pFindData);
end;
end;
end;
@ -364,27 +376,18 @@ begin
if fpS_ISLNK(pSearchRecord^.Attr) then
begin
AFilePath:= Path + pSearchRecord^.Name;
{$IF DEFINED(MSWINDOWS)}
FillLinkProperty(AFilePath, Result, @pSearchRecord^.FindData);
{$ELSE}
LinkAttrs := mbFileGetAttrNoLinks(AFilePath);
LinkProperty.LinkTo := ReadSymLink(AFilePath);
LinkProperty.IsValid := LinkAttrs <> faInvalidAttributes;
{$IF DEFINED(UNIX)}
if LinkProperty.IsValid then
begin
LinkProperty.IsLinkToDirectory := fpS_ISDIR(LinkAttrs);
if LinkProperty.IsLinkToDirectory then SizeProperty.Value := 0;
end;
{$ELSE}
if StrBegins(LinkProperty.LinkTo, 'Volume{') then
begin
LinkProperty.IsLinkToDirectory := True;
LinkProperty.IsValid:= mbDriveReady(AFilePath + PathDelim);
end
else if LinkProperty.IsValid then
LinkProperty.IsLinkToDirectory := fpS_ISDIR(LinkAttrs)
else begin
// On Windows links to directories are marked with Directory flag on the link.
LinkProperty.IsLinkToDirectory := fpS_ISDIR(pSearchRecord^.Attr);
end;
{$ENDIF}
end;
end;
@ -557,7 +560,7 @@ begin
if fpS_ISLNK(Attrs) then
begin
FillLinkProperty(sFullPath, Attrs, LinkProperty);
FillLinkProperty(sFullPath, AFile, @FindData);
end;
end;