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

UPD: Use close_range function (issue #2004)

Browse source
This commit is contained in:
Alexander Koblov 2025-01-17 19:12:36 +03:00
commit 37c22c3ef4
2 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/doublecmd/dclinux.pas
View file

@ -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;

54
components/doublecmd/dcunix.pas
View file

@ -45,6 +45,7 @@ const
{$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 @@ begin
{$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 @@ var
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 @@ begin
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.