From 1295818fb343a87dc92a134f3c14bcfa2b1eedc2 Mon Sep 17 00:00:00 2001 From: eadler Date: Mon, 5 Mar 2018 06:37:02 +0000 Subject: [PATCH] MFC r306896: Fix spurious white space introduced in r301059 r301059 accidently introduced a subtle change for point to point interfaces where an extra space is inserted before the netmask. This can cause issues for scripts that parse ifconfig output. --- sbin/ifconfig/af_inet.c | 2 +- sbin/ifconfig/af_inet6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index a386741e3f7..ed8419a58fc 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -88,7 +88,7 @@ in_status(int s __unused, const struct ifaddrs *ifa) sin = (struct sockaddr_in *)ifa->ifa_dstaddr; if (sin == NULL) sin = &null_sin; - printf(" --> %s ", inet_ntoa(sin->sin_addr)); + printf(" --> %s", inet_ntoa(sin->sin_addr)); } sin = (struct sockaddr_in *)ifa->ifa_netmask; diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index cc0ec167f1a..2c9c2f07011 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -237,7 +237,7 @@ in6_status(int s __unused, const struct ifaddrs *ifa) if (error != 0) inet_ntop(AF_INET6, &sin->sin6_addr, addr_buf, sizeof(addr_buf)); - printf(" --> %s ", addr_buf); + printf(" --> %s", addr_buf); } } -- 2.45.0