diff options
author | Rich Felker <dalias@aerifal.cx> | 2013-02-02 02:07:38 -0500 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2013-02-02 02:07:38 -0500 |
commit | a47ad3ebce8e20a5d72535996a0d0d5458241213 (patch) | |
tree | a165841faf258c2283bf7135424c3beb2d95bdee /src/network/gethostbyname2.c | |
parent | c0193550a022cb75d1cddb0254e98029b3b56420 (diff) | |
download | musl-a47ad3ebce8e20a5d72535996a0d0d5458241213.tar.gz musl-a47ad3ebce8e20a5d72535996a0d0d5458241213.tar.xz musl-a47ad3ebce8e20a5d72535996a0d0d5458241213.zip |
dynamically allocate storage for gethostby* buffers
this change shaves ~1k off libc.so bss size, and also avoids hard errors in the case where the static buffer was not large enough to hold the result. this whole framework is really ugly and might should be replaced or at least heavily overhauled when some changes/factorizations are made to getaddrinfo internals in the future.
Diffstat (limited to 'src/network/gethostbyname2.c')
-rw-r--r-- | src/network/gethostbyname2.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/network/gethostbyname2.c b/src/network/gethostbyname2.c index 9fbe2647..c9f90da2 100644 --- a/src/network/gethostbyname2.c +++ b/src/network/gethostbyname2.c @@ -4,13 +4,24 @@ #include <netdb.h> #include <string.h> #include <netinet/in.h> +#include <errno.h> +#include <stdlib.h> struct hostent *gethostbyname2(const char *name, int af) { - static struct hostent h; - static long buf[512/sizeof(long)]; + static struct hostent *h; + size_t size = 63; struct hostent *res; - if (gethostbyname2_r(name, af, &h, - (void *)buf, sizeof buf, &res, &h_errno)) return 0; - return &h; + int err; + do { + free(h); + h = malloc(size+=size+1); + if (!h) { + h_errno = NO_RECOVERY; + return 0; + } + err = gethostbyname2_r(name, af, h, + (void *)(h+1), size-sizeof *h, &res, &h_errno); + } while (err == ERANGE); + return err ? 0 : h; } |