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

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index e24124c57..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, 1996, 2000 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
@@ -29,14 +29,17 @@ 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 34
@@ -47,7 +50,6 @@ xgethostname ()
 {
   char *hostname;
   size_t size;
-  int err;
 
   size = INITIAL_HOSTNAME_LENGTH;
   /* Use size + 1 here rather than size to work around the bug
@@ -57,17 +59,14 @@ xgethostname ()
   while (1)
     {
       int k = size - 1;
+      int err;
 
       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);