Merge branch 'doublecmd:master' into master

Author: deep-soft

.github/scripts/create_release.sh

@@ -106,7 +106,7 @@ build_doublecmd
 export CPU_TARGET=x86_64
 export TARGET=x86_64-apple-darwin
 # Set minimal Mac OS X target version
-export MACOSX_DEPLOYMENT_TARGET=10.11
+export MACOSX_DEPLOYMENT_TARGET=11.0
 
 build_unrar
 build_doublecmd

.github/scripts/create_snapshot.sh

@@ -107,6 +107,6 @@ build_doublecmd
 # Set processor architecture
 export CPU_TARGET=x86_64
 # Set minimal Mac OS X target version
-export MACOSX_DEPLOYMENT_TARGET=10.11
+export MACOSX_DEPLOYMENT_TARGET=11.0
 
 build_doublecmd

.github/workflows/release.yml

@@ -11,21 +11,23 @@ concurrency:
 
 jobs:
   build-mac:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - name: Install Free Pascal
       uses: doublecmd/lazarus-install@mac
       with:
         lazarus-version: "stable"
 
     - name: Get Lazarus source
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
             repository: 'fpc/Lazarus'
             ref: 'fixes_4'
 
     - name: Build and install Lazarus
-      run: make all install
+      run: |
+           make all
+           sudo make install
 
     - name: Create Lazarus config
       run: |
@@ -34,12 +36,12 @@ 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@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
     - name: Download unrar source code
-      run: wget https://www.rarlab.com/rar/unrarsrc-7.0.9.tar.gz -O /tmp/unrarsrc.tar.gz
+      run: wget https://www.rarlab.com/rar/unrarsrc-7.2.3.tar.gz -O /tmp/unrarsrc.tar.gz
 
     - name: Extract unrar source code
       run: cd /tmp && tar xzf unrarsrc.tar.gz

.github/workflows/snapshots.yml

@@ -25,7 +25,7 @@ jobs:
         lazarus-version: "stable"
 
     - name: Get Lazarus source
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
             repository: 'fpc/Lazarus'
 
@@ -41,7 +41,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@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -69,7 +69,7 @@ jobs:
         lazarus-version: "stable"
 
     - name: Checkout source
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 

components/doublecmd/dcdatetimeutils.pas

@@ -22,7 +22,8 @@
 
 unit DCDateTimeUtils;
 
-{$mode objfpc}{$H+}
+{$mode objfpc}
+{$H+}{$R-}{$Q-}
 
 interface
 
@@ -327,8 +328,20 @@ function WinFileTimeToFileTimeEx(FileTime: TWinFileTime): DCBasicTypes.TFileTime
 end;
 {$ELSEIF DEFINED(UNIX)}
 begin
-  Result.Sec:= Int64((FileTime - UnixWinEpoch) div 10000000);
-  Result.NanoSec:= Int64((FileTime - UnixWinEpoch) mod 10000000) * 100;
+  if (FileTime >= UnixWinEpoch) then
+  begin
+    Result.Sec:= Int64((FileTime - UnixWinEpoch) div 10000000);
+    Result.NanoSec:= Int64((FileTime - UnixWinEpoch) mod 10000000) * 100;
+  end
+  else begin
+    Result.Sec:= (Int64(FileTime) - Int64(UnixWinEpoch)) div 10000000;
+    if (Result.Sec = 0) then
+      Result.NanoSec:= 0
+    else begin
+      Result.NanoSec:= (Int64(UnixWinEpoch - FileTime) mod 10000000) * 100;
+      if (Result.NanoSec > 0) then Result.NanoSec:= 1000000000 - Result.NanoSec;
+    end;
+  end;
 end;
 {$ENDIF}
 
@@ -583,31 +596,10 @@ function UnixFileTimeToDateTime(UnixTime: TUnixFileTime) : TDateTime;
 function DateTimeToUnixFileTime(DateTime : TDateTime): TUnixFileTime;
 {$IF DEFINED(UNIX)}
 var
-  AUnixTime: TTime;
-  ATime: TTimeStruct;
-  Year, Month, Day: Word;
-  Hour, Minute, Second, MilliSecond: Word;
+  AUnixTime: TFileTimeEx;
 begin
-  DecodeDate(DateTime, Year, Month, Day);
-  DecodeTime(DateTime, Hour, Minute, Second, MilliSecond);
-
-  ATime.tm_isdst:= -1;
-
-  ATime.tm_year:= Year - 1900;
-  ATime.tm_mon:=  Month - 1;
-  ATime.tm_mday:= Day;
-
-  ATime.tm_hour:= Hour;
-  ATime.tm_min:= Minute;
-  ATime.tm_sec:= Second;
-
-  AUnixTime:= fpMkTime(@ATime);
-
-  if (AUnixTime = -1) then
-    Result:= 0
-  else begin
-    Result:= TUnixFileTime(AUnixTime);
-  end;
+  AUnixTime:= DateTimeToUnixFileTimeEx(DateTime);
+  Result:= TUnixFileTime(AUnixTime.Sec);
 end;
 {$ELSE}
 var
@@ -626,9 +618,6 @@ function DateTimeToUnixFileTimeEx(DateTime : TDateTime): DCBasicTypes.TFileTimeE
   Year, Month, Day: Word;
   Hour, Minute, Second, MilliSecond: Word;
 begin
-  if DateTime < UnixEpoch then
-    raise EDateOutOfRange.Create(DateTime);
-
   DecodeDate(DateTime, Year, Month, Day);
   DecodeTime(DateTime, Hour, Minute, Second, MilliSecond);
 
@@ -647,6 +636,7 @@ function DateTimeToUnixFileTimeEx(DateTime : TDateTime): DCBasicTypes.TFileTimeE
   if (AUnixTime = -1) then
     Result:= TFileTimeExNull
   else begin
+    if (AUnixTime < 0) then MilliSecond:= 0;
     Result:= TFileTimeEx.Create(AUnixTime, MilliSecond * 1000 * 1000);
   end;
 end;

components/doublecmd/dcosutils.pas

@@ -49,6 +49,7 @@ interface
   fmOpenSync    = $10000;
   fmOpenDirect  = $20000;
   fmOpenNoATime = $40000;
+  fmOpenSpecial = $80000;
 
 {$IF DEFINED(UNIX)}
   ERROR_NOT_SAME_DEVICE = ESysEXDEV;
@@ -182,6 +183,8 @@ function MapFile(const sFileName : String; out FileMapRec : TFileMapRec) : Boole
 }
 procedure UnMapFile(var FileMapRec : TFileMapRec);
 
+function NormalizeFileName(const Source: String): String;
+
 {en
    Convert from console to UTF8 encoding.
 }
@@ -335,6 +338,9 @@ implementation
 {$ENDIF}
 {$IF DEFINED(UNIX)}
   Unix, dl,
+{$ENDIF}
+{$IF DEFINED(DARWIN)}
+  LazFileUtils,
 {$ENDIF}
   DCStrUtils, LazUTF8;
 
@@ -845,6 +851,17 @@ procedure UnMapFile(var FileMapRec : TFileMapRec);
 end;
 {$ENDIF}  
 
+function NormalizeFileName(const Source: String): String; inline;
+{$IF DEFINED(DARWIN)}
+begin
+  Result:= GetDarwinNormalizedFileName(Source);
+end;
+{$ELSE}
+begin
+  Result:= Source;
+end;
+{$ENDIF}
+
 function ConsoleToUTF8(const Source: String): RawByteString;
 {$IFDEF MSWINDOWS}
 begin
@@ -874,6 +891,8 @@ function mbFileOpen(const FileName: String; Mode: LongWord): System.THandle;
   end;
 end;
 {$ELSE}
+var
+  Info: BaseUnix.Stat;
 begin
   repeat
     Result:= fpOpen(UTF8ToSys(FileName), AccessModes[Mode and 3] or
@@ -882,6 +901,18 @@ function mbFileOpen(const FileName: String; Mode: LongWord): System.THandle;
   if Result <> feInvalidHandle then
   begin
     FileCloseOnExec(Result);
+    if (Mode and fmOpenSpecial = 0) then
+    begin
+      if fpFStat(Result, Info) = 0 then
+      begin
+        if FPS_ISFIFO(Info.st_mode) then
+        begin
+          FileClose(Result);
+          errno:= ESysEINVAL;
+          Exit(feInvalidHandle);
+        end;
+      end;
+    end;
 {$IF DEFINED(DARWIN)}
     if (Mode and (fmOpenSync or fmOpenDirect) <> 0) then
     begin
@@ -1605,8 +1636,16 @@ function mbFileSystemEntryExists(const Path: String): Boolean;
   Result := mbFileGetAttr(Path) <> faInvalidAttributes;
 end;
 
-function mbCompareFileNames(const FileName1, FileName2: String): Boolean; inline;
-{$IF DEFINED(WINDOWS) OR DEFINED(DARWIN)}
+function mbCompareFileNames(const FileName1, FileName2: String): Boolean;
+{$IF DEFINED(DARWIN)}
+begin
+  if (Length(FileName1) = 0) or (Length(FileName2) = 0) then
+    Result:= (FileName1 = FileName2)
+  else begin
+    Result:= CompareFilenamesIgnoreCase(FileName1, FileName2) = 0;
+  end;
+end;
+{$ELSEIF DEFINED(MSWINDOWS)}
 begin
   Result:= (UnicodeCompareText(CeUtf8ToUtf16(FileName1), CeUtf8ToUtf16(FileName2)) = 0);
 end;

components/doublecmd/dcstringhashlistutf8.pas

@@ -42,12 +42,14 @@   TStringHashListUtf8 = class(TObject)
   private
     FList: PStringHashItemList;
     FCount: Integer;
+    fNormalize: Boolean;
     fCaseSensitive: Boolean;
     function BinarySearch(HashValue: Cardinal): Integer;
     function CompareString(const Low, Key: String): Boolean;
     function CompareValue(const Value1, Value2: Cardinal): Integer;
     procedure FindHashBoundaries(HashValue: Cardinal; StartFrom: Integer; out First, Last: Integer);
     function GetData(const S: String): Pointer;
+    procedure SetNormalize(AValue: Boolean);
     procedure SetCaseSensitive(const Value: Boolean);
     procedure Delete(Index: Integer);
     procedure SetData(const S: String; const AValue: Pointer);
@@ -66,6 +68,7 @@   TStringHashListUtf8 = class(TObject)
     function Remove(const S: String): Integer;
     function Remove(const S: String; Data: Pointer): Integer;
     procedure FindBoundaries(StartFrom: Integer; out First, Last: Integer);
+    property Normalize: Boolean read fNormalize write SetNormalize;
     property CaseSensitive: Boolean read fCaseSensitive write SetCaseSensitive;
     property Count: Integer read FCount;
     property Data[const S: String]: Pointer read GetData write SetData; default;
@@ -75,7 +78,7 @@   TStringHashListUtf8 = class(TObject)
 implementation
 
 uses
-  LazUTF8;
+  LazUTF8, DCOSUtils;
 
 { TStringHashListUtf8 }
 
@@ -97,6 +100,10 @@ function TStringHashListUtf8.Add(const S: String; ItemData: Pointer): Integer;
   else begin
     Text:= UTF8LowerCase(S);
   end;
+  if fNormalize then
+  begin
+    Text:= NormalizeFileName(Text);
+  end;
   New(Item);
   Val:= HashOf(Text);
   Item^.HashValue := Val;
@@ -180,13 +187,20 @@ function TStringHashListUtf8.CompareString(const Low, Key: String): Boolean;
 begin
   P:= Pointer(Low);
   Len:= Length(Low);
+  if not fNormalize then
+  begin
+    LKey:= Key;
+  end
+  else begin
+    LKey:= NormalizeFileName(Key);
+  end;
   if fCaseSensitive then
   begin
-    Result:= (Len = Length(Key));
-    if Result then Result:= (CompareByte(P^, Pointer(Key)^, Len) = 0);
+    Result:= (Len = Length(LKey));
+    if Result then Result:= (CompareByte(P^, Pointer(LKey)^, Len) = 0);
   end
   else begin
-    LKey:= UTF8LowerCase(Key);
+    LKey:= UTF8LowerCase(LKey);
     Result:= (Len = Length(LKey));
     if Result then Result:= (CompareByte(P^, Pointer(LKey)^, Len) = 0);
   end;
@@ -232,6 +246,18 @@ procedure TStringHashListUtf8.SetData(const S: String; const AValue: Pointer);
     Add(S,AValue);
 end;
 
+procedure TStringHashListUtf8.SetNormalize(AValue: Boolean);
+begin
+  if fNormalize <> AValue then
+  begin
+    if Count > 0 then
+    begin
+      raise EListError.Create(lrsListMustBeEmpty);
+    end;
+    fNormalize := AValue;
+  end;
+end;
+
 destructor TStringHashListUtf8.Destroy;
 begin
   Clear;
@@ -249,6 +275,10 @@ function TStringHashListUtf8.Find(const S: String): Integer;
   else begin
     Text:= UTF8LowerCase(S);
   end;
+  if fNormalize then
+  begin
+    Text:= NormalizeFileName(Text);
+  end;
   Value:= HashOf(Text);
   Result:= BinarySearch(Value);
   if (Result <> -1) and not CompareString(Text, FList[Result]^.Key) then
@@ -275,6 +305,10 @@ function TStringHashListUtf8.Find(const S: String; Data: Pointer): Integer;
   else begin
     Text:= UTF8LowerCase(S);
   end;
+  if fNormalize then
+  begin
+    Text:= NormalizeFileName(Text);
+  end;
   Value:= HashOf(Text);
   Result:= BinarySearch(Value);
   if (Result <> -1) and
@@ -335,7 +369,8 @@ procedure TStringHashListUtf8.Insert(Index: Integer; Item: PStringHashItem);
 
 constructor TStringHashListUtf8.Create(CaseSensitivity: boolean);
 begin
-  fCaseSensitive:=CaseSensitivity;
+  fNormalize:= True;
+  fCaseSensitive:= CaseSensitivity;
   inherited Create;
 end;