X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=0f7b178f380d77e77d03a96fd63e09582a8b5701;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=e24124c571fbe7a8c1eb807e5151d5a1cc120c3a;hpb=1c0d7dc343e0f293693e93f57a41ba9bfa92ea69;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index e24124c57..0f7b178f3 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,10 +1,12 @@
 /* xgethostname.c -- return current hostname with unlimited length
-   Copyright (C) 1992, 1996, 2000 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2014 Free Software
+   Foundation, Inc.
+
+   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
@@ -12,65 +14,60 @@
    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>
 
-#include <sys/types.h>
+/* Specification.  */
+#include "xgethostname.h"
 
+#include <stdlib.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#include "error.h"
+#include <unistd.h>
 
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
-
-int gethostname ();
-char *xmalloc ();
-char *xrealloc ();
+#include "xalloc.h"
 
 #ifndef INITIAL_HOSTNAME_LENGTH
 # define INITIAL_HOSTNAME_LENGTH 34
 #endif
 
+/* Return the current hostname in malloc'd storage.
+   If malloc fails, exit.
+   Upon any other failure, return NULL and set errno.  */
 char *
-xgethostname ()
+xgethostname (void)
 {
-  char *hostname;
-  size_t size;
-  int err;
+  char *hostname = NULL;
+  size_t size = INITIAL_HOSTNAME_LENGTH;
 
-  size = INITIAL_HOSTNAME_LENGTH;
-  /* Use size + 1 here rather than size to work around the bug
-     in SunOS5.5's gethostname whereby it NUL-terminates HOSTNAME
-     even when the name is longer than the supplied buffer.  */
-  hostname = xmalloc (size + 1);
   while (1)
     {
-      int k = size - 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.  */
+      size_t size_1;
 
+      hostname = x2realloc (hostname, &size);
+      size_1 = size - 1;
+      hostname[size_1 - 1] = '\0';
       errno = 0;
-      hostname[k] = '\0';
-      err = gethostname (hostname, size);
-      if (err >= 0 && hostname[k] == '\0')
-	break;
-#ifdef ENAMETOOLONG
-      else if (err < 0 && errno != ENAMETOOLONG && errno != 0)
-#else
-      else if (err < 0 && errno != 0)
-#endif
-	error (EXIT_FAILURE, errno, "gethostname");
-      size *= 2;
-      hostname = xrealloc (hostname, size + 1);
+
+      if (gethostname (hostname, size_1) == 0)
+        {
+          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;