add the option -S for printing port numbers symbolically but addresses

numerically.  clean up the CFLAGS in Makefile.

1 files changed, 6 insertions, 6 deletions

diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 3441445e695b..5da36c4a3361 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -88,8 +88,8 @@
 
 #include "netstat.h"
 
-#define	WID_ORG	(lflag ? 39 : (nflag ? 29 : 18)) /* width of origin column */
-#define	WID_GRP	(lflag ? 18 : (nflag ? 16 : 18)) /* width of group column */
+#define	WID_ORG	(lflag ? 39 : (numeric_addr ? 29 : 18)) /* width of origin column */
+#define	WID_GRP	(lflag ? 18 : (numeric_addr ? 16 : 18)) /* width of group column */
 
 extern char	*routename6 __P((struct sockaddr_in6 *));
 
@@ -105,7 +105,7 @@ mroute6pr(mfcaddr, mifaddr)
 	register mifi_t mifi;
 	register int i;
 	register int banner_printed;
-	register int saved_nflag;
+	register int saved_numeric_addr;
 	mifi_t maxmif = 0;
 	long int waitings;
 
@@ -115,8 +115,8 @@ mroute6pr(mfcaddr, mifaddr)
 		return;
 	}
 
-	saved_nflag = nflag;
-	nflag = 1;
+	saved_numeric_addr = numeric_addr;
+	numeric_addr = 1;
 
 	kread(mifaddr, (char *)&mif6table, sizeof(mif6table));
 	banner_printed = 0;
@@ -192,7 +192,7 @@ mroute6pr(mfcaddr, mifaddr)
 		printf("\nIPv6 Multicast Routing Table is empty\n");
 
 	printf("\n");
-	nflag = saved_nflag;
+	numeric_addr = saved_numeric_addr;
 }
 
 void