diff options
| author | Jim Meyering <jim@meyering.net> | 2000-07-09 07:26:34 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2000-07-09 07:26:34 +0000 |
| commit | 50751a7eff33e51ea9592b72465b86d238151dac (patch) | |
| tree | eac8bdfe7645d20b8715b98f89c67391701eded4 /lib/xgethostname.c | |
| parent | 7a993dd16b1fbba6d5052bd11eb36d264ccfed60 (diff) | |
| download | coreutils-50751a7eff33e51ea9592b72465b86d238151dac.tar.xz | |
(ENAMETOOLONG): Define to an unlikely value if not defined.
(xgethostname): Remove now-unnecessary #ifdef.
Move declaration of `err' into loop where it's used.
Diffstat (limited to 'lib/xgethostname.c')
| -rw-r--r-- | lib/xgethostname.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/xgethostname.c b/lib/xgethostname.c index e24124c57..aa0b9dc85 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); |