X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fxgethostname.c;h=8d24d4042d858403257dd0a28700c9891a1d9f7f;hb=ab43907148e80f3895280928c05d4be93875580f;hp=9973b45bedc6eb17f2f577e30f97794177c235b2;hpb=789070f68be27d11c93d5792c14ba9d830cbfa08;p=gnulib.git
diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 9973b45be..8d24d4042 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,10 +1,12 @@
/* xgethostname.c -- return current hostname with unlimited length
- Copyright (C) 1992 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2010 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,49 +14,60 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with this program. If not, see . */
-/* Written by Jim Meyering, meyering@comco.com */
+/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use instead of "config.h" so that a compilation
- using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
- (which it would do because it found this file in $srcdir). */
#include
-#else
-#include "config.h"
-#endif
-#endif
-#include
+/* Specification. */
+#include "xgethostname.h"
-int gethostname ();
-char *xmalloc ();
-char *xrealloc ();
+#include
+#include
+#include
+
+#include "xalloc.h"
#ifndef INITIAL_HOSTNAME_LENGTH
-#define INITIAL_HOSTNAME_LENGTH 33
+# define INITIAL_HOSTNAME_LENGTH 34
#endif
+/* Return the current hostname in malloc'd storage.
+ If malloc fails, exit.
+ Upon any other failure, return NULL and set errno. */
char *
-xgethostname ()
+xgethostname (void)
{
- char *hostname;
- size_t size;
- int err;
+ char *hostname = NULL;
+ size_t size = INITIAL_HOSTNAME_LENGTH;
- size = INITIAL_HOSTNAME_LENGTH;
- hostname = xmalloc (size);
while (1)
{
- hostname[size - 1] = '\0';
- err = gethostname (hostname, size);
- if (err == 0 && hostname[size - 1] == '\0')
- break;
- size *= 2;
- hostname = xrealloc (hostname, size);
+ /* Use SIZE_1 here rather than SIZE to work around the bug in
+ SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
+ even when the name is as long as the supplied buffer. */
+ size_t size_1;
+
+ hostname = x2realloc (hostname, &size);
+ size_1 = size - 1;
+ hostname[size_1 - 1] = '\0';
+ errno = 0;
+
+ if (gethostname (hostname, size_1) == 0)
+ {
+ if (! hostname[size_1 - 1])
+ break;
+ }
+ else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL
+ /* OSX/Darwin does this when the buffer is not large enough */
+ && errno != ENOMEM)
+ {
+ int saved_errno = errno;
+ free (hostname);
+ errno = saved_errno;
+ return NULL;
+ }
}
return hostname;