diff options
| author | kn <kn@cvs.openbsd.org> | 2020-01-15 10:26:26 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2020-01-15 10:26:26 +0000 |
| commit | ec1302480f5022539ac7b6cd5f7eca0dfd26b041 (patch) | |
| tree | 88a5b23f7526d9ce6e8df80cb1aed294a7c50cc8 | |
| parent | 850dad84bba0e2c34e233197b8e56768dbc0ed8b (diff) | |
Replace duplicate error message with gai_strerror(3)
getaddrinfo(3) may fail for multiple reasons, but error message should be
unique in general.
OK bluhm
| -rw-r--r-- | sbin/route/route.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sbin/route/route.c b/sbin/route/route.c index 06a818f4437..9e43d8e89b6 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.246 2019/11/22 15:28:05 florian Exp $ */ +/* $OpenBSD: route.c,v 1.247 2020/01/15 10:26:25 kn Exp $ */ /* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */ /* @@ -859,6 +859,7 @@ getaddr(int which, int af, char *s, struct hostent **hpp) sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255:255:255:255/128") ]; char *sep; + int error; if (strlcpy(buf, s, sizeof buf) >= sizeof buf) { errx(1, "%s: bad value", s); @@ -871,10 +872,12 @@ getaddr(int which, int af, char *s, struct hostent **hpp) hints.ai_family = afamily; /*AF_INET6*/ hints.ai_flags = AI_NUMERICHOST; hints.ai_socktype = SOCK_DGRAM; /*dummy*/ - if (getaddrinfo(buf, "0", &hints, &res) != 0) { + error = getaddrinfo(buf, "0", &hints, &res); + if (error) { hints.ai_flags = 0; - if (getaddrinfo(buf, "0", &hints, &res) != 0) - errx(1, "%s: bad value", s); + error = getaddrinfo(buf, "0", &hints, &res); + if (error) + errx(1, "%s: %s", s, gai_strerror(error)); } if (res->ai_next) errx(1, "%s: resolved to multiple values", s); |