fix error returns in gethostby*_r functions
they're supposed to return an error code rather than using errno.
This commit is contained in:
parent
74025c80ce
commit
70b584bc94
2 changed files with 10 additions and 17 deletions
|
|
@ -23,16 +23,13 @@ int gethostbyaddr_r(const void *a, socklen_t l, int af,
|
||||||
else if (af==AF_INET && l==4) memcpy(&sa.sin.sin_addr, a, 4);
|
else if (af==AF_INET && l==4) memcpy(&sa.sin.sin_addr, a, 4);
|
||||||
else {
|
else {
|
||||||
*err = NO_RECOVERY;
|
*err = NO_RECOVERY;
|
||||||
return -1;
|
return EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Align buffer and check for space for pointers and ip address */
|
/* Align buffer and check for space for pointers and ip address */
|
||||||
i = (uintptr_t)buf & sizeof(char *)-1;
|
i = (uintptr_t)buf & sizeof(char *)-1;
|
||||||
if (!i) i = sizeof(char *);
|
if (!i) i = sizeof(char *);
|
||||||
if (buflen <= 5*sizeof(char *)-i + l) {
|
if (buflen <= 5*sizeof(char *)-i + l) return ERANGE;
|
||||||
errno = ERANGE;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
buf += sizeof(char *)-i;
|
buf += sizeof(char *)-i;
|
||||||
buflen -= 5*sizeof(char *)-i + l;
|
buflen -= 5*sizeof(char *)-i + l;
|
||||||
|
|
||||||
|
|
@ -51,15 +48,15 @@ int gethostbyaddr_r(const void *a, socklen_t l, int af,
|
||||||
switch (getnameinfo((void *)&sa, sl, buf, buflen, 0, 0, 0)) {
|
switch (getnameinfo((void *)&sa, sl, buf, buflen, 0, 0, 0)) {
|
||||||
case EAI_AGAIN:
|
case EAI_AGAIN:
|
||||||
*err = TRY_AGAIN;
|
*err = TRY_AGAIN;
|
||||||
return -1;
|
return EAGAIN;
|
||||||
case EAI_OVERFLOW:
|
case EAI_OVERFLOW:
|
||||||
errno = ERANGE;
|
return ERANGE;
|
||||||
default:
|
default:
|
||||||
case EAI_MEMORY:
|
case EAI_MEMORY:
|
||||||
case EAI_SYSTEM:
|
case EAI_SYSTEM:
|
||||||
case EAI_FAIL:
|
case EAI_FAIL:
|
||||||
*err = NO_RECOVERY;
|
*err = NO_RECOVERY;
|
||||||
return -1;
|
return errno;
|
||||||
case 0:
|
case 0:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,7 @@ int gethostbyname2_r(const char *name, int af,
|
||||||
/* Align buffer */
|
/* Align buffer */
|
||||||
i = (uintptr_t)buf & sizeof(char *)-1;
|
i = (uintptr_t)buf & sizeof(char *)-1;
|
||||||
if (i) {
|
if (i) {
|
||||||
if (buflen < sizeof(char *)-i) {
|
if (buflen < sizeof(char *)-i) return ERANGE;
|
||||||
errno = ERANGE;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
buf += sizeof(char *)-i;
|
buf += sizeof(char *)-i;
|
||||||
buflen -= sizeof(char *)-i;
|
buflen -= sizeof(char *)-i;
|
||||||
}
|
}
|
||||||
|
|
@ -37,16 +34,16 @@ int gethostbyname2_r(const char *name, int af,
|
||||||
switch (getaddrinfo(name, 0, &hint, &ai)) {
|
switch (getaddrinfo(name, 0, &hint, &ai)) {
|
||||||
case EAI_NONAME:
|
case EAI_NONAME:
|
||||||
*err = HOST_NOT_FOUND;
|
*err = HOST_NOT_FOUND;
|
||||||
return -1;
|
return errno;
|
||||||
case EAI_AGAIN:
|
case EAI_AGAIN:
|
||||||
*err = TRY_AGAIN;
|
*err = TRY_AGAIN;
|
||||||
return -1;
|
return errno;
|
||||||
default:
|
default:
|
||||||
case EAI_MEMORY:
|
case EAI_MEMORY:
|
||||||
case EAI_SYSTEM:
|
case EAI_SYSTEM:
|
||||||
case EAI_FAIL:
|
case EAI_FAIL:
|
||||||
*err = NO_RECOVERY;
|
*err = NO_RECOVERY;
|
||||||
return -1;
|
return errno;
|
||||||
case 0:
|
case 0:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -63,8 +60,7 @@ int gethostbyname2_r(const char *name, int af,
|
||||||
|
|
||||||
if (need > buflen) {
|
if (need > buflen) {
|
||||||
freeaddrinfo(ai);
|
freeaddrinfo(ai);
|
||||||
errno = ERANGE;
|
return ERANGE;
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
h->h_aliases = (void *)buf;
|
h->h_aliases = (void *)buf;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue