Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Mar 2018 06:37:02 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r330443 - stable/11/sbin/ifconfig
Message-ID:  <201803050637.w256b2Ss061285@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Mon Mar  5 06:37:02 2018
New Revision: 330443
URL: https://svnweb.freebsd.org/changeset/base/330443

Log:
  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.

Modified:
  stable/11/sbin/ifconfig/af_inet.c
  stable/11/sbin/ifconfig/af_inet6.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/ifconfig/af_inet.c
==============================================================================
--- stable/11/sbin/ifconfig/af_inet.c	Mon Mar  5 03:38:31 2018	(r330442)
+++ stable/11/sbin/ifconfig/af_inet.c	Mon Mar  5 06:37:02 2018	(r330443)
@@ -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;

Modified: stable/11/sbin/ifconfig/af_inet6.c
==============================================================================
--- stable/11/sbin/ifconfig/af_inet6.c	Mon Mar  5 03:38:31 2018	(r330442)
+++ stable/11/sbin/ifconfig/af_inet6.c	Mon Mar  5 06:37:02 2018	(r330443)
@@ -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);
 		}
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803050637.w256b2Ss061285>