diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
| commit | 9184de4614953897215e989b8720ad7fe6cfde86 (patch) | |
| tree | 3fbdd8c59ed45fee7162fc51241cb59ee51afcf2 /libc/inet/resolv.c | |
| parent | f335b8c0ffb5fd7ae44d154900d78988b6abf769 (diff) | |
| download | uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.bz2 uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.xz | |
Finish merge from trunk, again, no really.
Diffstat (limited to 'libc/inet/resolv.c')
| -rw-r--r-- | libc/inet/resolv.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 0e7c4d8b8..4bfec0a50 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -140,6 +140,15 @@ #define getservbyport __getservbyport #define getdomainname __getdomainname #define uname __uname +#define inet_addr __inet_addr +#define inet_aton __inet_aton +#define inet_pton __inet_pton +#define inet_ntop __inet_ntop +#define connect __connect +#define select __select +#define recv __recv +#define send __send +#define snprintf __snprintf #define __FORCE_GLIBC #include <features.h> @@ -764,9 +773,9 @@ int attribute_hidden __dns_lookup(const char *name, int type, int nscount, char #ifdef __UCLIBC_HAS_IPV6__ v6 = inet_pton(AF_INET6, dns, &sa6.sin6_addr) > 0; - fd = socket(v6 ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP); + fd = __socket(v6 ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP); #else - fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + fd = __socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); #endif if (fd < 0) { retries++; @@ -1400,7 +1409,7 @@ int res_querydomain(name, domain, class, type, answer, anslen) #ifdef DEBUG if (_res.options & RES_DEBUG) - printf(";; res_querydomain(%s, %s, %d, %d)\n", + __printf(";; res_querydomain(%s, %s, %d, %d)\n", name, domain?domain:"<Nil>", class, type); #endif if (domain == NULL) { @@ -2338,7 +2347,7 @@ int attribute_hidden __gethostbyaddr_r (const void *addr, socklen_t len, int typ addr_list[0] = in; - sprintf(buf, "%u.%u.%u.%u.in-addr.arpa", + __sprintf(buf, "%u.%u.%u.%u.in-addr.arpa", tmp_addr[3], tmp_addr[2], tmp_addr[1], tmp_addr[0]); #ifdef __UCLIBC_HAS_IPV6__ } else { @@ -2348,7 +2357,7 @@ int attribute_hidden __gethostbyaddr_r (const void *addr, socklen_t len, int typ qp = buf; for (i = len - 1; i >= 0; i--) { - qp += sprintf(qp, "%x.%x.", in6->s6_addr[i] & 0xf, + qp += __sprintf(qp, "%x.%x.", in6->s6_addr[i] & 0xf, (in6->s6_addr[i] >> 4) & 0xf); } __strcpy(qp, "ip6.int"); |