X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fnetwork%2Fgetservbyname_r.c;h=811c174c8bc209aebb5fb2118ae3218be993542b;hb=b0302863a36ef6ad24bd25e3ef4df74b9a56980d;hp=5c025150cb628cb4fb7299bbac86b287eb639fe1;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/network/getservbyname_r.c b/src/network/getservbyname_r.c
index 5c025150..811c174c 100644
--- a/src/network/getservbyname_r.c
+++ b/src/network/getservbyname_r.c
@@ -12,21 +12,33 @@ int getservbyname_r(const char *name, const char *prots,
 	struct addrinfo *ai, hint = { .ai_family = AF_INET };
 	int i;
 
+	if (!prots) {
+		int r = getservbyname_r(name, "tcp", se, buf, buflen, res);
+		if (r) r = getservbyname_r(name, "udp", se, buf, buflen, res);
+		return r;
+	}
+
 	/* Align buffer */
 	i = (uintptr_t)buf & sizeof(char *)-1;
 	if (!i) i = sizeof(char *);
-	if (buflen < 3*sizeof(char *)-i) {
-		errno = ERANGE;
-		return -1;
-	}
+	if (buflen < 3*sizeof(char *)-i)
+		return ERANGE;
 	buf += sizeof(char *)-i;
 	buflen -= sizeof(char *)-i;
 
 	if (!strcmp(prots, "tcp")) hint.ai_protocol = IPPROTO_TCP;
 	else if (!strcmp(prots, "udp")) hint.ai_protocol = IPPROTO_UDP;
-	else return -1;
+	else return EINVAL;
 
-	if (getaddrinfo(0, name, &hint, &ai) < 0) return -1;
+	switch (getaddrinfo(0, name, &hint, &ai)) {
+	case EAI_MEMORY:
+	case EAI_SYSTEM:
+		return ENOMEM;
+	default:
+		return ENOENT;
+	case 0:
+		break;
+	}
 
 	se->s_name = (char *)name;
 	se->s_aliases = (void *)buf;