projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no vasnprintf.h, either; argz_.h from libtool
[gnulib.git]
/
lib
/
canon-host.c
diff --git
a/lib/canon-host.c
b/lib/canon-host.c
index
180057c
..
b0c2f44
100644
(file)
--- a/
lib/canon-host.c
+++ b/
lib/canon-host.c
@@
-1,6
+1,6
@@
/* Host name canonicalization
/* Host name canonicalization
- Copyright (C) 1995, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1999, 2000
, 2002, 2003
Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@
-26,9
+26,8
@@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
@@
-43,11
+42,6
@@
# include <arpa/inet.h>
#endif
# include <arpa/inet.h>
#endif
-#ifndef strdup
-char *strdup ();
-#endif
-void free ();
-
/* Returns the canonical hostname associated with HOST (allocated in a static
buffer), or 0 if it can't be determined. */
char *
/* Returns the canonical hostname associated with HOST (allocated in a static
buffer), or 0 if it can't be determined. */
char *
@@
-80,11
+74,12
@@
canon_host (const char *host)
directly to gethostbyaddr because on some systems he->h_addr
is located in a static library buffer that is reused in the
gethostbyaddr call. Make a copy and use that instead. */
directly to gethostbyaddr because on some systems he->h_addr
is located in a static library buffer that is reused in the
gethostbyaddr call. Make a copy and use that instead. */
- char *h_addr_copy =
strdup (he->h_addr
);
+ char *h_addr_copy =
(char *) malloc (he->h_length
);
if (h_addr_copy == NULL)
he = NULL;
else
{
if (h_addr_copy == NULL)
he = NULL;
else
{
+ memcpy (h_addr_copy, he->h_addr, he->h_length);
he = gethostbyaddr (h_addr_copy, he->h_length, he->h_addrtype);
free (h_addr_copy);
}
he = gethostbyaddr (h_addr_copy, he->h_length, he->h_addrtype);
free (h_addr_copy);
}