X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=7b29176f2097ff58c9a5348f9a74723f200858ac;hb=dd9099e721075856534d551184fb02023a463e1a;hp=79da0ec9c2722dc0a77bfe6786b1d85c54a175aa;hpb=d3f0665a868c84f31b01c697f0526123b45beef5;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 79da0ec9c..7b29176f2 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,5 +1,7 @@
 /* xgethostname.c -- return current hostname with unlimited length
-   Copyright (C) 1992, 1996 Free Software Foundation, Inc.
+
+   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004 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
@@ -15,60 +17,65 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by Jim Meyering, meyering@comco.com */
+/* written by Jim Meyering */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <sys/types.h>
+/* Specification.  */
+#include "xgethostname.h"
 
+#include <stdlib.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
-#include "error.h"
+#include "xalloc.h"
 
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
+#ifndef ENAMETOOLONG
+# define ENAMETOOLONG 0
 #endif
 
-int gethostname ();
-char *xmalloc ();
-char *xrealloc ();
-
 #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;
-  hostname = xmalloc (size);
   while (1)
     {
-      /* Use size - 2 here rather than size - 1 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.  */
-      int k = size - 2;
+      /* 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)
-	error (EXIT_FAILURE, errno, "gethostname");
-#endif
-      size *= 2;
-      hostname = xrealloc (hostname, size);
+
+      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;
+	}
     }
 
   return hostname;