From a83f0239e5027272c6f5b38fa2d06e96675d81dc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 16 Aug 2003 06:58:50 +0000 Subject: [PATCH] Include . (xghostname): Don't exit for anything other than memory-related failure; just return NULL. --- lib/xgethostname.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 #endif +#include #include #include @@ -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); } -- 2.30.2