X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxgethostname.c;h=875d49761832482dcc7b2dfc1afbe067fc71f4ff;hb=6cad9c91215eac0f90bbb1f9473ea0f5fce3b085;hp=7b29176f2097ff58c9a5348f9a74723f200858ac;hpb=25ef69613afa3d3e727203c74b7c011f87813663;p=gnulib.git
diff --git a/lib/xgethostname.c b/lib/xgethostname.c
index 7b29176f2..875d49761 100644
--- a/lib/xgethostname.c
+++ b/lib/xgethostname.c
@@ -1,12 +1,12 @@
/* xgethostname.c -- return current hostname with unlimited length
- Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
@@ -14,24 +14,18 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#include "xgethostname.h"
#include
#include
-
-#if HAVE_UNISTD_H
-# include
-#endif
+#include
#include "xalloc.h"
@@ -69,7 +63,9 @@ xgethostname (void)
if (! hostname[size_1 - 1])
break;
}
- else if (errno != 0 && errno != ENAMETOOLONG && errno != EINVAL)
+ 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);