Merge branch 'doublecmd:master' into master

Author: deep-soft

.github/scripts/create_release.sh

@@ -54,7 +54,7 @@ build_doublecmd()
   # Create *.dmg package
   HDI_TRY=1
 
-  while [ $HDI_TRY -le 3 ]; do
+  while [ $HDI_TRY -le 5 ]; do
 
   echo "Try to create a package $HDI_TRY ..."
 

components/KASToolBar/kaspathedit.pas

@@ -208,7 +208,7 @@ function TKASPathEdit.isShowingListBox(): Boolean;
 end;
 
 procedure TKASPathEdit.AutoComplete(const Path: String);
-{$IF LCL_FULLVERSION >= 2020000}
+{$IF LCL_FULLVERSION < 4990000}
 const
   AFlags: array[Boolean] of TMaskOptions = (
     [moDisableSets], [moDisableSets, moCaseSensitive]
@@ -236,7 +236,7 @@ procedure TKASPathEdit.AutoComplete(const Path: String);
       try
         // Check mask and make absolute file name
         AMask:= TMask.Create(ExtractFileName(Path) + '*',
-{$IF LCL_FULLVERSION >= 2020000}
+{$IF LCL_FULLVERSION < 4990000}
                              AFlags[FileNameCaseSensitive]
 {$ELSE}
                              FileNameCaseSensitive

components/doublecmd/dcdarwin.pas

@@ -1,18 +1,73 @@
 unit DCDarwin;
 
 {$mode delphi}
+{$packrecords c}
+{$pointermath on}
 {$modeswitch objectivec1}
 
 interface
 
 uses
-  Classes, SysUtils, DCBasicTypes, CocoaAll;
+  Classes, SysUtils, DCBasicTypes, CocoaAll, BaseUnix;
+
+const
+  CLOSE_RANGE_CLOEXEC = (1 << 2);
+
+function CloseRange(first: cuint; last: cuint; flags: cint): cint; cdecl;
 
 // MacOS File Utils
 function MacosFileSetCreationTime( const path:String; const birthtime:TFileTimeEx ): Boolean;
 
 implementation
 
+uses
+  DCUnix;
+
+type
+  proc_fdinfo = record
+    proc_fd: Int32;
+    proc_fdtype: UInt32;
+  end;
+  Pproc_fdinfo = ^proc_fdinfo;
+
+const
+  PROC_PIDLISTFDS = 1;
+  PROC_PIDLISTFD_SIZE = SizeOf(proc_fdinfo);
+
+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;
+var
+  I: cint;
+  Handle: cint;
+  ProcessId: TPid;
+  bufferSize: cint;
+  pidInfo: Pproc_fdinfo;
+begin
+  Result:= -1;
+  ProcessId:= FpGetpid;
+  bufferSize:= proc_pidinfo(ProcessId, PROC_PIDLISTFDS, 0, nil, 0);
+  pidInfo:= GetMem(bufferSize);
+  if Assigned(pidInfo) then
+  begin
+    bufferSize:= proc_pidinfo(ProcessId, PROC_PIDLISTFDS, 0, pidInfo, bufferSize);
+    for I:= 0 to (bufferSize div PROC_PIDLISTFD_SIZE) - 1 do
+    begin
+      Handle:= pidInfo[I].proc_fd;
+      if (Handle >= first) and (Handle <= last) then
+      begin
+        if (flags and CLOSE_RANGE_CLOEXEC <> 0) then
+          FileCloseOnExec(Handle)
+        else begin
+          FileClose(Handle);
+        end;
+      end;
+    end;
+    Result:= 0;
+    FreeMem(pidInfo);
+  end;
+end;
+
 function StringToNSString(const S: String): NSString;
 begin
   Result:= NSString(NSString.stringWithUTF8String(PAnsiChar(S)));

components/doublecmd/dclinux.pas

@@ -29,6 +29,9 @@ interface
 uses
   Classes, SysUtils, BaseUnix, Unix;
 
+const
+  CLOSE_RANGE_CLOEXEC = (1 << 2);
+
 const
   FS_IOC_GETFLAGS = $80086601;
   FS_IOC_SETFLAGS = $40086602;
@@ -75,7 +78,7 @@ function mbFileCopyXattr(const Source, Target: String): Boolean;
 implementation
 
 uses
-  InitC, DCUnix, DCConvertEncoding, DCOSUtils;
+  InitC, DCConvertEncoding, DCOSUtils;
 
 function lremovexattr(const path, name: PAnsiChar): cint; cdecl; external clib;
 function llistxattr(const path: PAnsiChar; list: PAnsiChar; size: csize_t): ssize_t; cdecl; external clib;

components/doublecmd/dcunix.pas

@@ -45,6 +45,7 @@ interface
 {$ELSEIF DEFINED(FREEBSD)}
   O_CLOEXEC  = &04000000;
   _SC_NPROCESSORS_ONLN = 58;
+  CLOSE_RANGE_CLOEXEC = (1 << 2);
 {$ELSEIF DEFINED(NETBSD)}
   O_CLOEXEC  = $00400000;
 {$ELSEIF DEFINED(HAIKU)}
@@ -267,6 +268,9 @@ function fpMkTime(tm: PTimeStruct): TTime;
 function fpLocalTime(timer: PTime; tp: PTimeStruct): PTimeStruct;
 
 {$IF DEFINED(LINUX)}
+var
+  KernVersion: UInt16;
+
 function fpFDataSync(fd: cint): cint;
 function fpCloneFile(src_fd, dst_fd: cint): Boolean;
 function fpFAllocate(fd: cint; mode: cint; offset, len: coff_t): cint;
@@ -280,8 +284,12 @@ implementation
 
 uses
   Unix, DCConvertEncoding, LazUTF8
-{$IFDEF DARWIN}
+{$IF DEFINED(DARWIN)}
   , DCDarwin
+{$ELSEIF DEFINED(LINUX)}
+  , Dos, DCLinux, DCOSUtils
+{$ELSEIF DEFINED(FREEBSD)}
+  , DCOSUtils
 {$ENDIF}
   ;
 
@@ -387,8 +395,6 @@ function DC_FileSetTime(const FileName: String;
   {$ENDIF}
 end;
 
-
-
 {$IF DEFINED(BSD)}
 type rlim_t = Int64;
 {$ENDIF}
@@ -416,6 +422,21 @@ function fdatasync(fd: cint): cint; cdecl; external clib;
 function fallocate(fd: cint; mode: cint; offset, len: coff_t): cint; cdecl; external clib;
 {$ENDIF}
 
+{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)}
+var
+  hLibC: TLibHandle = NilHandle;
+
+procedure LoadCLibrary;
+begin
+  hLibC:= mbLoadLibrary(mbGetModuleName(@tzset));
+end;
+{$ENDIF}
+
+{$IF DEFINED(LINUX) OR DEFINED(BSD)}
+var
+  close_range: function(first: cuint; last: cuint; flags: cint): cint; cdecl = nil;
+{$ENDIF}
+
 procedure FileCloseOnExecAll;
 const
   MAX_FD = 1024;
@@ -424,6 +445,13 @@ procedure FileCloseOnExecAll;
   p: TRLimit;
   fd_max: rlim_t = RLIM_INFINITY;
 begin
+{$IF DEFINED(LINUX) OR DEFINED(BSD)}
+  if Assigned(close_range) then
+  begin
+    close_range(3, High(Int32), CLOSE_RANGE_CLOEXEC);
+    Exit;
+  end;
+{$ENDIF}
   if (FpGetRLimit(RLIMIT_NOFILE, @p) = 0) and (p.rlim_cur <> RLIM_INFINITY) then
     fd_max:= p.rlim_cur
   else begin
@@ -571,8 +599,26 @@ function fpFAllocate(fd: cint; mode: cint; offset, len: coff_t): cint;
 end;
 {$ENDIF}
 
-initialization
+procedure Initialize;
+begin
   tzset();
+{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)}
+  LoadCLibrary;
+  {$IF DEFINED(LINUX)}
+  KernVersion:= BEtoN(DosVersion);
+  // Linux kernel >= 5.11
+  if KernVersion >= $50B then
+  {$ENDIF}
+  begin
+    Pointer(close_range):= GetProcAddress(hLibC, 'close_range');
+  end;
+{$ELSEIF DEFINED(DARWIN)}
+  close_range:= @CloseRange;
+{$ENDIF}
+end;
+
+initialization
+  Initialize;
 
 end.
 

components/viewer/viewercontrol.pas

@@ -452,9 +452,7 @@   TViewerControl = class(TCustomControl)
     function DoMouseWheelUp(Shift: TShiftState; MousePos: TPoint): Boolean; override;
     function DoMouseWheelLeft(Shift: TShiftState; MousePos: TPoint): Boolean; override;
     function DoMouseWheelRight(Shift: TShiftState; MousePos: TPoint): Boolean; override;
-{$if lcl_fullversion >= 1070000}
     procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double); override;
-{$endif}
 
   public
     constructor Create(AOwner: TComponent); override;
@@ -556,6 +554,9 @@ implementation
 uses
   Math, LCLType, Graphics, Forms, LCLProc, Clipbrd, LConvEncoding,
   DCUnicodeUtils, LCLIntf, LazUTF8, DCOSUtils , DCConvertEncoding
+  {$IF LCL_FULLVERSION >= 4990000}
+  , LazUTF16
+  {$ENDIF}
   {$IF DEFINED(UNIX)}
   , BaseUnix, Unix, DCUnix
   {$ELSEIF DEFINED(WINDOWS)}
@@ -2745,14 +2746,12 @@ function TViewerControl.DoMouseWheelRight(Shift: TShiftState; MousePos: TPoint):
     Result := HScroll(Mouse.WheelScrollLines);
 end;
 
-{$if lcl_fullversion >= 1070000}
 procedure TViewerControl.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double);
 begin
   FScrollBarVert.Width  := LCLIntf.GetSystemMetrics(SM_CYVSCROLL);
   FScrollBarHorz.Height := LCLIntf.GetSystemMetrics(SM_CYHSCROLL);
   inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion);
 end;
-{$endif}
 
 function TViewerControl.XYPos2Adr(x, y: Integer; out CharSide: TCharSide): PtrInt;
 var

language/doublecmd.be.po

@@ -1006,6 +1006,10 @@ msgctxt "tfrmeditor.acteditselectall.hint"
 msgid "Select All"
 msgstr "Абраць усё"
 
+#: tfrmeditor.actedittimedate.caption
+msgid "Time/Date"
+msgstr ""
+
 #: tfrmeditor.acteditundo.caption
 msgctxt "TFRMEDITOR.ACTEDITUNDO.CAPTION"
 msgid "Undo"
@@ -10917,6 +10921,16 @@ msgstr ""
 msgid "HorzSplit"
 msgstr ""
 
+#: ulng.rsmfstbiiclouddrivertips
+msgctxt "ulng.rsmfstbiiclouddrivertips"
+msgid "iCloud Driver"
+msgstr ""
+
+#: ulng.rsmfstbiiclouddrivertitle
+msgctxt "ulng.rsmfstbiiclouddrivertitle"
+msgid "iCloud Driver"
+msgstr ""
+
 #: ulng.rsmfstbiprivilegetips
 msgid "As a file manager, Double Command requires full disk access permissions. Clicking this button will pop up the macOS system settings page. Please add \"Double Commander.app\" to the \"Full Disk Access\" list to complete the authorization."
 msgstr ""
@@ -11055,6 +11069,14 @@ msgstr "Выняць"
 msgid "Extract here..."
 msgstr "Распакаваць сюды..."
 
+#: ulng.rsmnuiclouddriverdownloadnow
+msgid "Download Now"
+msgstr ""
+
+#: ulng.rsmnuiclouddriverremovedownload
+msgid "Remove Download"
+msgstr ""
+
 #: ulng.rsmnumount
 msgid "Mount"
 msgstr "Прымантаваць"

language/doublecmd.bg.po

@@ -1027,6 +1027,10 @@ msgctxt "tfrmeditor.acteditselectall.hint"
 msgid "Select All"
 msgstr "Избор на всички"
 
+#: tfrmeditor.actedittimedate.caption
+msgid "Time/Date"
+msgstr ""
+
 #: tfrmeditor.acteditundo.caption
 msgctxt "TFRMEDITOR.ACTEDITUNDO.CAPTION"
 msgid "Undo"
@@ -11391,6 +11395,16 @@ msgstr ""
 msgid "HorzSplit"
 msgstr ""
 
+#: ulng.rsmfstbiiclouddrivertips
+msgctxt "ulng.rsmfstbiiclouddrivertips"
+msgid "iCloud Driver"
+msgstr ""
+
+#: ulng.rsmfstbiiclouddrivertitle
+msgctxt "ulng.rsmfstbiiclouddrivertitle"
+msgid "iCloud Driver"
+msgstr ""
+
 #: ulng.rsmfstbiprivilegetips
 msgid "As a file manager, Double Command requires full disk access permissions. Clicking this button will pop up the macOS system settings page. Please add \"Double Commander.app\" to the \"Full Disk Access\" list to complete the authorization."
 msgstr ""
@@ -11529,6 +11543,14 @@ msgstr "Изваждане"
 msgid "Extract here..."
 msgstr "Извличане тук..."
 
+#: ulng.rsmnuiclouddriverdownloadnow
+msgid "Download Now"
+msgstr ""
+
+#: ulng.rsmnuiclouddriverremovedownload
+msgid "Remove Download"
+msgstr ""
+
 #: ulng.rsmnumount
 msgid "Mount"
 msgstr "Прикачане"

language/doublecmd.ca.po

@@ -1102,6 +1102,10 @@ msgctxt "tfrmeditor.acteditselectall.hint"
 msgid "Select All"
 msgstr "Selecciona tot"
 
+#: tfrmeditor.actedittimedate.caption
+msgid "Time/Date"
+msgstr ""
+
 #: tfrmeditor.acteditundo.caption
 msgctxt "TFRMEDITOR.ACTEDITUNDO.CAPTION"
 msgid "Undo"
@@ -11880,6 +11884,16 @@ msgstr ""
 msgid "HorzSplit"
 msgstr ""
 
+#: ulng.rsmfstbiiclouddrivertips
+msgctxt "ulng.rsmfstbiiclouddrivertips"
+msgid "iCloud Driver"
+msgstr ""
+
+#: ulng.rsmfstbiiclouddrivertitle
+msgctxt "ulng.rsmfstbiiclouddrivertitle"
+msgid "iCloud Driver"
+msgstr ""
+
 #: ulng.rsmfstbiprivilegetips
 msgid "As a file manager, Double Command requires full disk access permissions. Clicking this button will pop up the macOS system settings page. Please add \"Double Commander.app\" to the \"Full Disk Access\" list to complete the authorization."
 msgstr ""
@@ -12017,6 +12031,14 @@ msgstr "Expulsa"
 msgid "Extract here..."
 msgstr ""
 
+#: ulng.rsmnuiclouddriverdownloadnow
+msgid "Download Now"
+msgstr ""
+
+#: ulng.rsmnuiclouddriverremovedownload
+msgid "Remove Download"
+msgstr ""
+
 #: ulng.rsmnumount
 msgid "Mount"
 msgstr "Munta"