X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=195a3750c3b8e4d89a726b27be48e178d866846b;hb=1d113b5a2cb7cbbea65d7ed9d7278880701fc742;hp=87e0ad9260cc2b9beceea4ea55d88b85d3884708;hpb=a62be9f4039b4499cfbb76e394cad2259d03fa84;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 87e0ad926..195a3750c 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,6 +1,6 @@
 /* xgethostname.c -- return current hostname with unlimited length
 
-   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004 Free Software
+   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,6 @@
 # include <unistd.h>
 #endif
 
-#include "error.h"
 #include "xalloc.h"
 
 #ifndef ENAMETOOLONG
@@ -70,7 +69,9 @@ xgethostname (void)
 	  if (! hostname[size_1 - 1])
 	    break;
 	}
-      else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL)
+      else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL
+	       /* OSX/Darwin does this when the buffer is not large enough */
+	       && errno != ENOMEM)
 	{
 	  int saved_errno = errno;
 	  free (hostname);