paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 10:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* small fix for BSD getdomainname. BSD version is based on Sysctl

Browse Source
This commit is contained in:
marco 2004-07-18 11:27:54 +00:00
parent 5f8f040fdc
commit 8bf63be7c6
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rtl/unix/unix.pp
View File

@ -173,10 +173,8 @@ Function POpen (var F:file;const Prog:String;rw:char):cint;
function AssignStream(Var StreamIn,Streamout:text;Const Prog:String) : cint; function AssignStream(Var StreamIn,Streamout:text;Const Prog:String) : cint;
function AssignStream(var StreamIn, StreamOut, StreamErr: Text; const prog: String): cint; function AssignStream(var StreamIn, StreamOut, StreamErr: Text; const prog: String): cint;
{$ifndef BSD}
Function GetDomainName:String; Function GetDomainName:String;
Function GetHostName:String; Function GetHostName:String;
{$endif}
{************************** {**************************
@ -1477,7 +1475,7 @@ end;
General information calls General information calls
******************************************************************************} ******************************************************************************}
{$ifndef BSD} {$ifdef Linux}
Function GetDomainName:String; { linux only!} Function GetDomainName:String; { linux only!}
// domainname is a glibc extension. // domainname is a glibc extension.
@ -1494,6 +1492,26 @@ begin
end; end;
{$endif} {$endif}
{$ifdef BSD}
function intGetDomainName(Name:PChar; NameLen:Cint):cint; external name 'FPC_SYSC_GETDOMAINNAME';
Function GetDomainName:String; { linux only!}
// domainname is a glibc extension.
{
Get machines domain name. Returns empty string if not set.
}
begin
if intGetDomainName(@getdomainname[1],255)=-1 then
getdomainname:=''
else
getdomainname[0]:=chr(strlen(@getdomainname[1]));
end;
{$endif}
Function GetHostName:String; Function GetHostName:String;
{ {
Get machines name. Returns empty string if not set. Get machines name. Returns empty string if not set.
@ -1754,7 +1772,10 @@ End.
{ {
$Log$ $Log$
Revision 1.72 2004-07-03 13:18:06 daniel Revision 1.73 2004-07-18 11:27:54 marco
* small fix for BSD getdomainname. BSD version is based on Sysctl
Revision 1.72 2004/07/03 13:18:06 daniel
* Better fix. * Better fix.
Revision 1.71 2004/07/03 13:15:51 daniel Revision 1.71 2004/07/03 13:15:51 daniel