From 845a5e69fa33bf49eea81a7b8c80902ab1687f2e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 22 Jul 2012 22:09:45 -0400 Subject: remove scanf dependency from getaddrinfo /etc/services support --- src/network/getaddrinfo.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/network') diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c index d16b6561..83862166 100644 --- a/src/network/getaddrinfo.c +++ b/src/network/getaddrinfo.c @@ -79,18 +79,17 @@ int getaddrinfo(const char *host, const char *serv, const struct addrinfo *hint, if (!*z && port > 65535) return EAI_SERVICE; if (!port) { size_t servlen = strlen(serv); - char protname[4]; + char *end = line; if (flags & AI_NUMERICSERV) return EAI_SERVICE; f = __fopen_rb_ca("/etc/services", &_f, _buf, sizeof _buf); if (!f) return EAI_SERVICE; while (fgets(line, sizeof line, f)) { - if (strncmp(line, serv, servlen)) + if (strncmp(line, serv, servlen) || !isspace(line[servlen])) continue; - if (sscanf(line+servlen, "%lu/%3s", &port, protname) < 2) - continue; - if (strcmp(protname, proto==IPPROTO_UDP ? "udp" : "tcp")) + port = strtoul(line+servlen, &end, 10); + if (strncmp(end, proto==IPPROTO_UDP ? "/udp" : "/tcp", 4)) continue; break; } -- cgit v1.2.1