projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New modules unistr/u*-mbsnlen.
[gnulib.git]
/
lib
/
xgethostname.c
diff --git
a/lib/xgethostname.c
b/lib/xgethostname.c
index
87e0ad9
..
b4c8dcc
100644
(file)
--- a/
lib/xgethostname.c
+++ b/
lib/xgethostname.c
@@
-1,7
+1,7
@@
/* xgethostname.c -- return current hostname with unlimited length
/* xgethostname.c -- return current hostname with unlimited length
- Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004
, 2005, 2006 Fre
e
+
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
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
@@
-15,25
+15,19
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* written by Jim Meyering */
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "xgethostname.h"
#include <stdlib.h>
#include <errno.h>
/* Specification. */
#include "xgethostname.h"
#include <stdlib.h>
#include <errno.h>
+#include <unistd.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "error.h"
#include "xalloc.h"
#ifndef ENAMETOOLONG
#include "xalloc.h"
#ifndef ENAMETOOLONG
@@
-70,7
+64,9
@@
xgethostname (void)
if (! hostname[size_1 - 1])
break;
}
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);
{
int saved_errno = errno;
free (hostname);