X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=1139a1b19c2703492951147671652f56c4bc249d;hb=1fa55b5e0731bc535c7f3be42d30cf2ac8725085;hp=7038ea42cec5d45b18d2152c3c908c3e1256daee;hpb=0e4e2981cca391f0a8a61662971242545599477d;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 7038ea42c..1139a1b19 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -15,7 +15,7 @@
    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>
@@ -39,7 +39,7 @@ char *xmalloc ();
 char *xrealloc ();
 
 #ifndef INITIAL_HOSTNAME_LENGTH
-# define INITIAL_HOSTNAME_LENGTH 33
+# define INITIAL_HOSTNAME_LENGTH 34
 #endif
 
 char *
@@ -53,10 +53,15 @@ xgethostname ()
   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;
+
       errno = 0;
-      hostname[size - 1] = '\0';
+      hostname[k] = '\0';
       err = gethostname (hostname, size);
-      if (err == 0 && hostname[size - 1] == '\0')
+      if (err == 0 && hostname[k] == '\0')
 	break;
 #ifdef ENAMETOOLONG
       else if (err != 0 && errno != ENAMETOOLONG && errno != 0)