Merge branch 'doublecmd:master' into master

Author: deep-soft

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
         lazarus-version: "stable"
 
     - name: Get Lazarus source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
             repository: 'fpc/Lazarus'
             ref: 'fixes_4'
@@ -34,7 +34,7 @@ jobs:
            sudo sed -i -e "s|_PPCARCH_|fpc|g; s|/Developer/lazarus|/usr/local/share/lazarus|g" /etc/lazarus/environmentoptions.xml
 
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 

.github/workflows/snapshots.yml

@@ -25,7 +25,7 @@ jobs:
         lazarus-version: "stable"
 
     - name: Get Lazarus source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
             repository: 'fpc/Lazarus'
 
@@ -39,7 +39,7 @@ jobs:
            sudo sed -i -e "s|_PPCARCH_|fpc|g; s|/Developer/lazarus|/usr/local/share/lazarus|g" /etc/lazarus/environmentoptions.xml
 
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
@@ -67,7 +67,7 @@ jobs:
         lazarus-version: "stable"
 
     - name: Checkout source
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 

components/doublecmd/dcclasses.pas

@@ -0,0 +1,30 @@
+unit DCClasses;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, NullStream;
+
+type
+
+  { TNullStreamEx }
+
+  TNullStreamEx = class(TNullStream)
+  public
+    function Write(const Buffer; Count: LongInt): LongInt; override;
+  end;
+
+implementation
+
+{ TNullStreamEx }
+
+function TNullStreamEx.Write(const Buffer; Count: LongInt): LongInt;
+begin
+  Result:= Count;
+  inherited Write(Buffer, Count);
+end;
+
+end.
+

components/doublecmd/dcdarwin.pas

@@ -14,10 +14,19 @@ interface
   CLOSE_RANGE_CLOEXEC = (1 << 2);
 
 function CloseRange(first: cuint; last: cuint; flags: cint): cint; cdecl;
+function mbFileCopyXattr(const Source, Target: String): Boolean;
 
 // MacOS File Utils
 function MacosFileSetCreationTime( const path:String; const birthtime:TFileTimeEx ): Boolean;
 
+type
+
+  { TDarwinFileUtil }
+
+  TDarwinFileUtil = class
+    class function cloneFile( const fromPath: String; const toPath: String; const size: Int64 ): Boolean;
+  end;
+
 implementation
 
 uses
@@ -34,6 +43,32 @@   proc_fdinfo = record
   PROC_PIDLISTFDS = 1;
   PROC_PIDLISTFD_SIZE = SizeOf(proc_fdinfo);
 
+const
+  NSAppKitVersionNumber10_13 = 1561;
+
+const
+  COPYFILE_ACL   = 1 shl 0;
+  COPYFILE_STAT	 = 1 shl 1;
+  COPYFILE_XATTR = 1 shl 2;
+  COPYFILE_DATA	 = 1 shl 3;
+
+  COPYFILE_SECURITY = COPYFILE_STAT or COPYFILE_ACL;
+  COPYFILE_METADATA = COPYFILE_SECURITY or COPYFILE_XATTR;
+  COPYFILE_ALL	    = COPYFILE_METADATA or COPYFILE_DATA;
+
+  COPYFILE_UNLINK      = 1 shl 21;
+  COPYFILE_CLONE       = 1 shl 24;
+  COPYFILE_CLONE_FORCE = 1 shl 25;
+
+type
+  copyfile_state_t_o = record
+  end;
+  copyfile_state_t = ^copyfile_state_t_o;
+  copyfile_flags_t = UInt32;
+
+function copyfile( const fromPath: pchar; const toPath: pchar; state: copyfile_state_t; flags: copyfile_flags_t ): Integer;
+  cdecl; external name 'copyfile';
+
 function proc_pidinfo(pid: cint; flavor: cint; arg: cuint64; buffer: pointer; buffersize: cint): cint; cdecl; external 'proc';
 
 function CloseRange(first: cuint; last: cuint; flags: cint): cint; cdecl;
@@ -68,6 +103,16 @@ function CloseRange(first: cuint; last: cuint; flags: cint): cint; cdecl;
   end;
 end;
 
+function mbFileCopyXattr(const Source, Target: String): Boolean;
+var
+  ret: Integer;
+begin
+  Writeln( '>>3> mbFileCopyXattr' );
+  ret:= copyfile( pchar(Source), pchar(Target), nil, COPYFILE_XATTR );
+  fpseterrno( ret );
+  Result:= (ret=0);
+end;
+
 function StringToNSString(const S: String): NSString;
 begin
   Result:= NSString(NSString.stringWithUTF8String(PAnsiChar(S)));
@@ -88,5 +133,39 @@ function MacosFileSetCreationTime( const path:String; const birthtime:TFileTimeE
   Result:= NSFileManager.defaultManager.setAttributes_ofItemAtPath_error( attrs, nsPath, nil );
 end;
 
+{ TDarwinFileUtil }
+
+// the copyfile() api has two advantages:
+// 1. dramatically improve file copy speed on APFS
+// 2. supports copying macOS specific attributes
+// therefore, we should try copyfile() as much as possible on macOS
+class function TDarwinFileUtil.cloneFile( const fromPath: String; const toPath: String; const size: Int64 ): Boolean;
+const
+  NO_CALLBACK_MAXSIZE = 20*1024*1024;   // 20MB
+var
+  flags: copyfile_flags_t;
+  ret: Integer;
+begin
+  Result:= False;
+  flags:= COPYFILE_ALL;
+
+  // call copyfile() when:
+  // 1. macOS < 10.13 and filesize <= MAX_SIZE (copy only)
+  // 2. macOS >= 10.13 and filesize > MAX_SIZE (clone only, fail fast)
+  // 3. macOS >= 10.13 and filesize <= MAX_SIZE (try clone, then copy)
+  if NSAppKitVersionNumber < NSAppKitVersionNumber10_13 then begin
+    if size > NO_CALLBACK_MAXSIZE then
+      Exit;
+  end else begin
+    if size > NO_CALLBACK_MAXSIZE then
+      flags:= flags or COPYFILE_CLONE_FORCE or COPYFILE_UNLINK
+    else
+      flags:= flags or COPYFILE_CLONE;
+  end;
+
+  ret:= copyfile( pchar(fromPath), pchar(toPath), nil, flags );
+  Result:= (ret=0);
+end;
+
 end.
 

components/doublecmd/dcosutils.pas

@@ -34,6 +34,9 @@ interface
 {$IFDEF LINUX}
   , DCLinux
 {$ENDIF}
+{$IFDEF DARWIN}
+  , DCDarwin
+{$ENDIF}
 {$IFDEF HAIKU}
   , DCHaiku
 {$ENDIF}
@@ -654,7 +657,7 @@ function mbFileCopyAttr(const sSrc, sDst: String;
         end;
       end;
 
-{$IF DEFINED(LINUX) or DEFINED(HAIKU)}
+{$IF DEFINED(LINUX) or DEFINED(DARWIN) or DEFINED(HAIKU)}
       if caoCopyXattributes in Options then
       begin
         if not mbFileCopyXattr(sSrc, sDst) then

components/doublecmd/dcunix.pas

@@ -41,9 +41,11 @@ interface
   FD_CLOEXEC = 1;
   O_CLOEXEC  = &02000000;
   O_PATH     = &010000000;
+  _SC_NPROCESSORS_CONF = 83;
   _SC_NPROCESSORS_ONLN = 84;
 {$ELSEIF DEFINED(FREEBSD)}
   O_CLOEXEC  = &04000000;
+  _SC_NPROCESSORS_CONF = 57;
   _SC_NPROCESSORS_ONLN = 58;
   CLOSE_RANGE_CLOEXEC = (1 << 2);
 {$ELSEIF DEFINED(NETBSD)}
@@ -54,6 +56,7 @@ interface
 {$ELSEIF DEFINED(DARWIN)}
   F_NOCACHE  = 48;
   O_CLOEXEC  = $1000000;
+  _SC_NPROCESSORS_CONF = 57;
   _SC_NPROCESSORS_ONLN = 58;
 {$ELSE}
   O_CLOEXEC  = 0;

components/doublecmd/dcxmlconfig.pas

@@ -553,11 +553,12 @@ procedure TXmlConfig.ReadFromStream(AStream: TStream);
 
 procedure TXmlConfig.WriteToFile(const AFilename: String);
 var
-  FileStream: TStream;
+  FileStream: TFileStreamEx;
 begin
   FileStream := TFileStreamEx.Create(AFilename, fmCreate or fmShareDenyWrite);
   try
     WriteToStream(FileStream);
+    FileStream.Flush;
   finally
     FileStream.Free;
   end;

components/doublecmd/doublecmd_common.lpk

@@ -36,8 +36,8 @@ end"/>
     </CompilerOptions>
     <Description Value="Common units for Double Commander"/>
     <License Value="GNU GPL 2"/>
-    <Version Minor="4" Release="2"/>
-    <Files Count="12">
+    <Version Minor="4" Release="3"/>
+    <Files Count="13">
       <Item1>
         <Filename Value="dcclassesutf8.pas"/>
         <UnitName Value="DCClassesUtf8"/>
@@ -86,6 +86,10 @@ end"/>
         <Filename Value="dcjsonconfig.pas"/>
         <UnitName Value="DCJsonConfig"/>
       </Item12>
+      <Item13>
+        <Filename Value="dcclasses.pas"/>
+        <UnitName Value="DCClasses"/>
+      </Item13>
     </Files>
     <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="2">

components/doublecmd/doublecmd_common.pas

@@ -10,7 +10,7 @@ interface
 uses
   DCClassesUtf8, DCOSUtils, DCStrUtils, DCBasicTypes, DCFileAttributes, 
   DCConvertEncoding, DCDateTimeUtils, DCXmlConfig, DCProcessUtf8, 
-  DCUnicodeUtils, DCStringHashListUtf8, DCJsonConfig;
+  DCUnicodeUtils, DCStringHashListUtf8, DCJsonConfig, DCClasses;
 
 implementation