X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=4db3bbd16a41f540a06a13a47c7e531c62dd45a7;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=9973b45bedc6eb17f2f577e30f97794177c235b2;hpb=789070f68be27d11c93d5792c14ba9d830cbfa08;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 9973b45be..4db3bbd16 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,5 +1,5 @@
 /* xgethostname.c -- return current hostname with unlimited length
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2001 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
@@ -12,30 +12,37 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+# include <config.h>
 #endif
 
 #include <sys/types.h>
 
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#include "error.h"
+#include "xalloc.h"
+
+#ifndef ENAMETOOLONG
+# define ENAMETOOLONG 9999
+#endif
+
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
 int gethostname ();
-char *xmalloc ();
-char *xrealloc ();
 
 #ifndef INITIAL_HOSTNAME_LENGTH
-#define INITIAL_HOSTNAME_LENGTH 33
+# define INITIAL_HOSTNAME_LENGTH 34
 #endif
 
 char *
@@ -43,18 +50,26 @@ xgethostname ()
 {
   char *hostname;
   size_t size;
-  int err;
 
   size = INITIAL_HOSTNAME_LENGTH;
-  hostname = xmalloc (size);
+  /* 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)
     {
-      hostname[size - 1] = '\0';
+      int k = size - 1;
+      int err;
+
+      errno = 0;
+      hostname[k] = '\0';
       err = gethostname (hostname, size);
-      if (err == 0 && hostname[size - 1] == '\0')
+      if (err >= 0 && hostname[k] == '\0')
 	break;
+      else if (err < 0 && errno != ENAMETOOLONG && errno != 0)
+	error (EXIT_FAILURE, errno, "gethostname");
       size *= 2;
-      hostname = xrealloc (hostname, size);
+      hostname = xrealloc (hostname, size + 1);
     }
 
   return hostname;