/* xgethostname.c -- return current hostname with unlimited length
- Copyright (C) 1992, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1996, 2000, 2001 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
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Written by Jim Meyering, meyering@comco.com */
+/* written by Jim Meyering */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "error.h"
+#include "xalloc.h"
+
+#ifndef ENAMETOOLONG
+# define ENAMETOOLONG 9999
+#endif
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
int gethostname ();
-char *xmalloc ();
-char *xrealloc ();
#ifndef INITIAL_HOSTNAME_LENGTH
-# define INITIAL_HOSTNAME_LENGTH 33
+# define INITIAL_HOSTNAME_LENGTH 34
#endif
char *
{
char *hostname;
size_t size;
- int err;
size = INITIAL_HOSTNAME_LENGTH;
- hostname = xmalloc (size);
+ /* Use size + 1 here rather than size to work around the bug
+ in SunOS5.5's gethostname whereby it NUL-terminates HOSTNAME
+ even when the name is longer than the supplied buffer. */
+ hostname = xmalloc (size + 1);
while (1)
{
+ int k = size - 1;
+ int err;
+
errno = 0;
- hostname[size - 1] = '\0';
+ hostname[k] = '\0';
err = gethostname (hostname, size);
- if (err == 0 && hostname[size - 1] == '\0')
+ if (err >= 0 && hostname[k] == '\0')
break;
-#ifdef ENAMETOOLONG
- else if (err != 0 && errno != ENAMETOOLONG && errno != 0)
+ else if (err < 0 && errno != ENAMETOOLONG && errno != 0)
error (EXIT_FAILURE, errno, "gethostname");
-#endif
size *= 2;
- hostname = xrealloc (hostname, size);
+ hostname = xrealloc (hostname, size + 1);
}
return hostname;