From: Jim Meyering <jim@meyering.net> Date: Sun, 9 Jul 2000 07:26:34 +0000 (+0000) Subject: (ENAMETOOLONG): Define to an unlikely value if not defined. X-Git-Tag: FILEUTILS-4_0x~47 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=94bcfced41343f2441d4470f39cb6471873461e4;p=gnulib.git (ENAMETOOLONG): Define to an unlikely value if not defined. (xgethostname): Remove now-unnecessary #ifdef. Move declaration of `err' into loop where it's used. --- diff --git a/lib/xgethostname.c b/lib/xgethostname.c index e24124c571..aa0b9dc85b 100644 --- a/lib/xgethostname.c +++ b/lib/xgethostname.c @@ -30,6 +30,10 @@ extern int errno; #include "error.h" +#ifndef ENAMETOOLONG +# define ENAMETOOLONG 9999 +#endif + #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif @@ -47,7 +51,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 +60,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);