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

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 87e0ad926..5d5a07c76 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,12 +1,12 @@
 /* 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-2006, 2009-2013 Free Software
    Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,32 +14,21 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xgethostname.h"
 
 #include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "error.h"
 #include "xalloc.h"
 
-#ifndef ENAMETOOLONG
-# define ENAMETOOLONG 0
-#endif
-
 #ifndef INITIAL_HOSTNAME_LENGTH
 # define INITIAL_HOSTNAME_LENGTH 34
 #endif
@@ -56,8 +45,8 @@ xgethostname (void)
   while (1)
     {
       /* Use SIZE_1 here rather than SIZE to work around the bug in
-	 SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
-	 even when the name is as long as the supplied buffer.  */
+         SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
+         even when the name is as long as the supplied buffer.  */
       size_t size_1;
 
       hostname = x2realloc (hostname, &size);
@@ -66,17 +55,19 @@ xgethostname (void)
       errno = 0;
 
       if (gethostname (hostname, size_1) == 0)
-	{
-	  if (! hostname[size_1 - 1])
-	    break;
-	}
-      else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL)
-	{
-	  int saved_errno = errno;
-	  free (hostname);
-	  errno = saved_errno;
-	  return NULL;
-	}
+        {
+          if (! hostname[size_1 - 1])
+            break;
+        }
+      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);
+          errno = saved_errno;
+          return NULL;
+        }
     }
 
   return hostname;