X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=18b9873fdb558ddbfec7217857b5d887b65daf6b;hb=50901279d8e42ea4bccc2eef0a6b11e7c3dde4cf;hp=656ef410132f6b9b0ff897fcf349f1073e3fd806;hpb=7c3f8da8f075e3813ced160d5b53a28c6f7dfe78;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 656ef4101..18b9873fd 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, 2005 Free Software
+   Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2011 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,14 +14,11 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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"
@@ -32,10 +29,6 @@
 
 #include "xalloc.h"
 
-#ifndef ENAMETOOLONG
-# define ENAMETOOLONG 0
-#endif
-
 #ifndef INITIAL_HOSTNAME_LENGTH
 # define INITIAL_HOSTNAME_LENGTH 34
 #endif
@@ -52,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);
@@ -62,19 +55,19 @@ xgethostname (void)
       errno = 0;
 
       if (gethostname (hostname, size_1) == 0)
-	{
-	  if (! hostname[size_1 - 1])
-	    break;
-	}
+        {
+          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;
-	}
+               /* 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;