X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgethostname.c;h=5178784baca5bffa889d7db3078a65f0b3f405e0;hb=a9b64ea6a96fe625db5332f5e2b3e5f968704af7;hp=aa0b9dc85b8b0d0eb7278ea74e97126648dc4038;hpb=94bcfced41343f2441d4470f39cb6471873461e4;p=gnulib.git

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index aa0b9dc85..5178784ba 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, 2003 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
@@ -21,6 +21,7 @@
 # include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <sys/types.h>
 
 #include <errno.h>
@@ -29,6 +30,7 @@ extern int errno;
 #endif
 
 #include "error.h"
+#include "xalloc.h"
 
 #ifndef ENAMETOOLONG
 # define ENAMETOOLONG 9999
@@ -39,13 +41,14 @@ extern int errno;
 #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.  */
 char *
 xgethostname ()
 {
@@ -54,7 +57,7 @@ xgethostname ()
 
   size = INITIAL_HOSTNAME_LENGTH;
   /* Use size + 1 here rather than size to work around the bug
-     in SunOS5.5's gethostname whereby it NUL-terminates HOSTNAME
+     in SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
      even when the name is longer than the supplied buffer.  */
   hostname = xmalloc (size + 1);
   while (1)
@@ -68,7 +71,12 @@ xgethostname ()
       if (err >= 0 && hostname[k] == '\0')
 	break;
       else if (err < 0 && errno != ENAMETOOLONG && errno != 0)
-	error (EXIT_FAILURE, errno, "gethostname");
+	{
+	  int saved_errno = errno;
+	  free (hostname);
+	  errno = saved_errno;
+	  return NULL;
+	}
       size *= 2;
       hostname = xrealloc (hostname, size + 1);
     }