Address feedback from hrs@ re: r301059 (ifconfig subnet mask)

- Use NI_MAXHOST to size buffers for getnameinfo()
- remove non-standard 'full' inet6 address printing
- remove 'no scope' option
- use strchr(3) to optimize replacing separator character in lladdrs

Reviewed by:	gnn, jhb
Differential Revision:	https://reviews.freebsd.org/D2856

1 files changed, 2 insertions, 6 deletions

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 9449fe3fcab5..cd6116602eec 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -99,7 +99,7 @@ int	supmedia = 0;
 int	printkeys = 0;		/* Print keying material for interfaces. */
 
 /* Formatter Strings */
-char	*f_inet, *f_inet6, *f_ether, *f_addr, *f_scope;
+char	*f_inet, *f_inet6, *f_ether, *f_addr;
 
 static	int ifconfig(int argc, char *const *argv, int iscreate,
 		const struct afswtch *afp);
@@ -257,8 +257,6 @@ static void freeformat(void)
 		free(f_ether);
 	if (f_addr != NULL)
 		free(f_addr);
-	if (f_scope != NULL)
-		free(f_scope);
 }
 
 static void setformat(char *input)
@@ -286,8 +284,6 @@ static void setformat(char *input)
 			f_inet = strdup(modifier);
 		else if (strcmp(category, "inet6") == 0)
 			f_inet6 = strdup(modifier);
-		else if (strcmp(category, "scope") == 0)
-			f_scope = strdup(modifier);
 	}
 	free(formatstr);
 }
@@ -372,7 +368,7 @@ main(int argc, char *argv[])
 	size_t iflen;
 
 	all = downonly = uponly = namesonly = noload = verbose = 0;
-	f_inet = f_inet6 = f_ether = f_addr = f_scope = NULL;
+	f_inet = f_inet6 = f_ether = f_addr = NULL;
 
 	envformat = getenv("IFCONFIG_FORMAT");
 	if (envformat != NULL)