More host tweaks

Author: rfm

Source/NSHost.m

@@ -199,21 +199,10 @@ - (id) _initWithKey: (NSString*)key
   hints.ai_flags = AI_CANONNAME;
   hints.ai_family = AF_UNSPEC; 
 
-  if ([key isEqualToString: myHostName()])
+  if ([key isEqualToString: localHostName])
     {
-      [addresses addObject: @"127.0.0.1"];
-#if     defined(AF_INET6)
-      [addresses addObject: @"::1"];
-#endif
-      [names addObject: @"localhost"];
-    }
-  else if ([key isEqualToString: localHostName]
-    || [key isEqualToString: @"localhost"])
-    {
-#if     defined(AF_INET6)
-      [addresses addObject: @"::1"];
-#endif
-      ptr = "127.0.0.1";
+      [addresses unionSet: [hostClass _localAddresses]];
+      ptr = "localhost";
     }
 
   err = getaddrinfo(ptr, 0, &hints, &entry);

Tests/base/NSHost/basic.m

@@ -6,8 +6,11 @@
 
 int main()
 {
-  NSAutoreleasePool   *arp = [NSAutoreleasePool new];
-  test_NSObject(@"NSHost",[NSArray arrayWithObject:[NSHost currentHost]]); 
+  NSAutoreleasePool     *arp = [NSAutoreleasePool new];
+  NSHost                *h = [NSHost currentHost];
+
+  test_NSObject(@"NSHost", [NSArray arrayWithObject: h]);
+  NSLog(@"%@", h);
   [arp release]; arp = nil;
   return 0;
 }

Tests/base/NSHost/create.m

@@ -18,6 +18,7 @@ int main()
   localh = [NSHost localHost];
   PASS(localh != nil && [localh isKindOfClass: [NSHost class]],
        "NSHost understands +localHost");
+  NSLog(@"localHost: %@", localh);
 #else
   localh = current;
 #endif