From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Aug 2003 06:58:50 +0000 (+0000)
Subject: Include <stdlib.h>.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a83f0239e5027272c6f5b38fa2d06e96675d81dc;p=pspp

Include <stdlib.h>.
(xghostname): Don't exit for anything other than memory-related
failure; just return NULL.
---

diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 1227cc994a..5178784bac 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -21,6 +21,7 @@
 # include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <sys/types.h>
 
 #include <errno.h>
@@ -45,6 +46,9 @@ int gethostname ();
 # 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 ()
 {
@@ -67,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);
     }