X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=216e78be49b082318b15c228b44e7f29cd1b9143;hb=c48e3b6bc3bd5b075e45075c141f1b2b84b02b53;hp=f00d7bd5f53e35682b3abeef675ab8e94e00c4cc;hpb=a38bc613499aee7806cecf6615af4ad2a09def61;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index f00d7bd5f..216e78be4 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,10 +1,35 @@
+/* xgethostname.c -- return current hostname with unlimited length
+   Copyright (C) 1992 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.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+
+/* Written by Jim Meyering, meyering@comco.com */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 
 int gethostname ();
 char *xmalloc ();
 char *xrealloc ();
 
+#ifndef INITIAL_HOSTNAME_LENGTH
 #define INITIAL_HOSTNAME_LENGTH 33
+#endif
 
 char *
 xgethostname ()
@@ -14,12 +39,12 @@ xgethostname ()
   int err;
 
   size = INITIAL_HOSTNAME_LENGTH;
+  hostname = xmalloc (size);
   while (1)
     {
-      hostname = xmalloc (size);
       hostname[size - 1] = '\0';
       err = gethostname (hostname, size);
-      if (err || hostname[size - 1] == '\0')
+      if (err == 0 && hostname[size - 1] == '\0')
 	break;
       size *= 2;
       hostname = xrealloc (hostname, size);