projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-base64: Improve.
[gnulib.git]
/
lib
/
canon-host.c
diff --git
a/lib/canon-host.c
b/lib/canon-host.c
index
c0b7c13
..
df9cbbf
100644
(file)
--- a/
lib/canon-host.c
+++ b/
lib/canon-host.c
@@
-1,29
+1,28
@@
/* Host name canonicalization
/* Host name canonicalization
- Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006
, 2007, 2008
Free Software Foundation, Inc.
Written by Derek Price <derek@ximbiot.com>.
Written by Derek Price <derek@ximbiot.com>.
- 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.
+ 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 3, 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
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "canon-host.h"
#include <config.h>
#include "canon-host.h"
-#include
"getaddrinfo.h"
-#include
"strdup.h"
+#include
<string.h>
+#include
<netdb.h>
/* Store the last error for the single-threaded version of this function. */
static int last_cherror;
/* Store the last error for the single-threaded version of this function. */
static int last_cherror;
@@
-69,7
+68,10
@@
canon_host_r (char const *host, int *cherror)
status = getaddrinfo (host, NULL, &hints, &res);
if (!status)
{
status = getaddrinfo (host, NULL, &hints, &res);
if (!status)
{
- retval = strdup (res->ai_canonname);
+ /* http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00300.html
+ says Darwin 7.9.0 getaddrinfo returns 0 but sets
+ res->ai_canonname to NULL. */
+ retval = strdup (res->ai_canonname ? res->ai_canonname : host);
if (!retval && cherror)
*cherror = EAI_MEMORY;
freeaddrinfo (res);
if (!retval && cherror)
*cherror = EAI_MEMORY;
freeaddrinfo (res);