From 148d4298db5e8b05a8c787e482d7d9bd40d5f460 Mon Sep 17 00:00:00 2001 From: alexs75 Date: Thu, 5 May 2016 13:14:22 +0000 Subject: [PATCH] RxFPC:GetFileOwnerData now work on linux git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4640 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/Demos/RxFileUtils/unit1.pas | 3 +-- components/rx/trunk/rxfileutils.pas | 14 +++++++++----- components/rx/trunk/rxnew.lpk | 2 +- components/rx/trunk/rxtools.lpk | 5 +++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/components/rx/trunk/Demos/RxFileUtils/unit1.pas b/components/rx/trunk/Demos/RxFileUtils/unit1.pas index 6df602934..e0ad88efb 100644 --- a/components/rx/trunk/Demos/RxFileUtils/unit1.pas +++ b/components/rx/trunk/Demos/RxFileUtils/unit1.pas @@ -37,8 +37,7 @@ var Form1: TForm1; implementation -uses rxFileUtils - , LazUTF8; +uses rxFileUtils; {$R *.lfm} diff --git a/components/rx/trunk/rxfileutils.pas b/components/rx/trunk/rxfileutils.pas index 22bca0688..9eabd7ce8 100644 --- a/components/rx/trunk/rxfileutils.pas +++ b/components/rx/trunk/rxfileutils.pas @@ -45,11 +45,12 @@ function GetUserName:string; implementation -{$IFDEF WINDOWS} uses - Windows; +{$IFDEF WINDOWS} + Windows {$ELSE} -{$ENDIF} + BaseUnix, users +{$ENDIF}; (* FileUtil, LazFileUtils, LazUTF8; *) @@ -153,6 +154,8 @@ end; procedure GetFileOwnerData(const SearchDomain, FileName: String; out UserName, DomainName: string); +var + SR: stat; begin {$IF DEFINED(WINDOWS) AND NOT DEFINED(WINCE)} { GetFileNameOwner(UTF8ToSys(SearchDomain), UTF8ToSys(FileName), UserName, DomainName); @@ -160,8 +163,9 @@ begin DomainName:=UTF8Encode(DomainName);} GetFileNameOwner(SearchDomain, FileName, UserName, DomainName); {$ELSE} - UserName:=''; - DomainName:=''; + FpStat(FileName, SR); + UserName:=users.GetUserName(SR.uid); + DomainName:='';//IntToStr( SR.gid); {$ENDIF} end; diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk index 8922ad449..39ce4e41d 100644 --- a/components/rx/trunk/rxnew.lpk +++ b/components/rx/trunk/rxnew.lpk @@ -24,7 +24,7 @@ Copyright (c) 1998 Master-Bank translate to Lazarus by alexs in 2005 - 2016 "/> - + diff --git a/components/rx/trunk/rxtools.lpk b/components/rx/trunk/rxtools.lpk index ec4bc1f53..fe04d14b9 100644 --- a/components/rx/trunk/rxtools.lpk +++ b/components/rx/trunk/rxtools.lpk @@ -3,6 +3,7 @@ + @@ -10,6 +11,10 @@ + + +