Author: rfm
Date: Sat Apr 19 03:34:48 2014
New Revision: 37804
URL: http://svn.gna.org/viewcvs/gnustep?rev=37804&view=rev
Log:
Fixup host name
Modified:
libs/base/trunk/Source/NSHost.m
libs/base/trunk/Source/NSProcessInfo.m
libs/base/trunk/Tests/base/NSProcessInfo/general.m
Modified: libs/base/trunk/Source/NSHost.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSHost.m?rev=37804&r1=37803&r2=37804&view=diff
==============================================================================
--- libs/base/trunk/Source/NSHost.m (original)
+++ libs/base/trunk/Source/NSHost.m Sat Apr 19 03:34:48 2014
@@ -623,3 +623,9 @@
}
@end
+@implementation NSHost (NSProcessInfo)
++ (NSString*) _myHostName
+{
+ return myHostName();
+}
+@end
Modified: libs/base/trunk/Source/NSProcessInfo.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSProcessInfo.m?rev=37804&r1=37803&r2=37804&view=diff
==============================================================================
--- libs/base/trunk/Source/NSProcessInfo.m (original)
+++ libs/base/trunk/Source/NSProcessInfo.m Sat Apr 19 03:34:48 2014
@@ -154,6 +154,10 @@
For more detailed assistance, please report the error to
[email protected].\n\n"
#endif
#endif
+
+@interface NSHost (NSProcessInfo)
++ (NSString*) _myHostName;
+@end
/*************************************************************************
*** _NSConcreteProcessInfo
@@ -1085,7 +1089,7 @@
{
if (!_gnu_hostName)
{
- _gnu_hostName = [[[NSHost currentHost] localizedName] copy];
+ _gnu_hostName = [[NSHost _myHostName] copy];
}
return _gnu_hostName;
}
Modified: libs/base/trunk/Tests/base/NSProcessInfo/general.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSProcessInfo/general.m?rev=37804&r1=37803&r2=37804&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSProcessInfo/general.m (original)
+++ libs/base/trunk/Tests/base/NSProcessInfo/general.m Sat Apr 19 03:34:48 2014
@@ -36,12 +36,15 @@
"-globallyUniqueString works");
obj = [info operatingSystemName];
- PASS((obj != nil &&
- [obj isKindOfClass:[NSString class]] &&
- [obj length] > 0),
- "-operatingSystemName works");
+ PASS((obj != nil && [obj isKindOfClass:[NSString class]] && [obj length] >
0),
+ "-operatingSystemName works");
+ NSLog(@"operatingSystemName %@", obj);
val = [info operatingSystem];
PASS(val != 0, "-operatingSystem works");
+ obj = [info hostName];
+ PASS((obj != nil && [obj isKindOfClass:[NSString class]] && [obj length] >
0),
+ "-hostName works");
+ NSLog(@"hostName %@", obj);
[arp release]; arp = nil;
return 0;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
