pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:try to fix compile on MacOS

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5837 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2017-04-19 05:31:06 +00:00
parent b50c32d866
commit de744bedf1
2 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
components/rx/trunk/rxtools/rxfileutils.pas
View File

@ -56,14 +56,15 @@ const
implementation
uses
strutils
{$IFDEF WINDOWS}
Windows
{$ELSE}
BaseUnix, users, strutils
{$ENDIF};
(*
FileUtil, LazFileUtils, LazUTF8;
*)
, Windows
{$ENDIF}
{$IFDEF LINUX}
, BaseUnix, users
{$ENDIF}
;
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
function LStrError(const Ernum: Longint; const UseUTF8: Boolean = False): string;
const
@ -150,36 +151,40 @@ end;
function GetFileOwnerUser(const SearchDomain, FileName: String): String;
var
S:string;
{$IFNDEF WINDOWS}
{$IFDEF LINUX}
FStat: stat;
{$ENDIF}
begin
Result:='';
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
(* GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), Result, S);
Result:=UTF8Encode(Result);*)
GetFileNameOwner(SearchDomain, FileName, Result, S);
{$ELSE}
{$ENDIF}
{$IFDEF LINUX}
if FpStat(FileName, FStat) = 0 then
Result:=users.GetUserName(FStat.uid)
else
Result:='';
Result:=users.GetUserName(FStat.uid);
{$ENDIF}
end;
procedure GetFileOwnerData(const SearchDomain, FileName: String; out UserName,
DomainName: string);
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
{$ELSE}
{$ENDIF}
{$IFDEF LINUX}
var
SR: stat;
{$ENDIF}
{$ENDIF}
begin
UserName:='';
DomainName:='';
{$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)}
{ GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), UserName, DomainName);
UserName:=UTF8Encode(UserName);
DomainName:=UTF8Encode(DomainName);}
GetFileNameOwner(SearchDomain, FileName, UserName, DomainName);
{$ELSE}
{$ENDIF}
{$IFDEF LINUX}
FpStat(FileName, SR);
UserName:=users.GetUserName(SR.uid);
if Pos('\', UserName) > 0 then