evil, annoying spaces and tabs

9 files changed, 229 insertions, 232 deletions

diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 5da07b16231..355f89f7711 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atalk.c,v 1.5 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: atalk.c,v 1.6 2002/01/17 21:34:58 mickey Exp $	*/
 /*	$NetBSD: atalk.c,v 1.2 1997/05/22 17:21:26 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from @(#)atalk.c	1.1 (Whistle) 6/6/96";
 #else
-static char rcsid[] = "$OpenBSD: atalk.c,v 1.5 2001/11/19 19:02:15 mpech Exp $";
+static char rcsid[] = "$OpenBSD: atalk.c,v 1.6 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -96,7 +96,7 @@ at_pr_net(sat, numeric)
 			return ("*");
 		}
 	}
-	(void) snprintf(mybuf, sizeof(mybuf), "%hu", 
+	(void) snprintf(mybuf, sizeof(mybuf), "%hu",
 	    ntohs(sat->sat_addr.s_net));
 	return mybuf;
 }
@@ -116,7 +116,7 @@ at_pr_host(sat, numeric)
 			return ("*");
 		}
 	}
-	(void) snprintf(mybuf, sizeof(mybuf), "%d", 
+	(void) snprintf(mybuf, sizeof(mybuf), "%d",
 	    (unsigned int) sat->sat_addr.s_node);
 	return mybuf;
 }
@@ -146,7 +146,7 @@ at_pr_port(sat)
 				(void) snprintf(mybuf, sizeof(mybuf), "%s",
 				    serv->s_name);
 		}
-			
+
 		return mybuf;
 	}
 }
@@ -220,7 +220,7 @@ atalk_print2(sa, mask, what)
 	const struct sockaddr *mask;
 	int what;
 {
-	size_t          n, l;
+	size_t		n, l;
 	static char     buf[100];
 	struct sockaddr_at *sat1, *sat2;
 	struct sockaddr_at thesockaddr;
@@ -274,7 +274,7 @@ atalkprotopr(off, name)
 	ddpcb = cb;
 	prev = (struct ddpcb *) off;
 	for (next = initial; next != NULL; prev = next) {
-		u_long          ppcb = (u_long) next;
+		u_long	ppcb = (u_long) next;
 
 		if (kread((u_long) next, (char *) &ddpcb, sizeof(ddpcb)) < 0)
 			return;
@@ -304,7 +304,7 @@ atalkprotopr(off, name)
 		if (Aflag)
 			printf("%8lx ", ppcb);
 		printf("%-5.5s %6ld %6ld ", name, sockb.so_rcv.sb_cc,
-		       sockb.so_snd.sb_cc);
+		    sockb.so_snd.sb_cc);
 		printf(Aflag ? " %-18.18s" : " %-22.22s", atalk_print(
 			  (struct sockaddr *) & ddpcb.ddp_lsat, 7));
 		printf(Aflag ? " %-18.18s" : " %-22.22s", atalk_print(
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 6a16269fba8..b7256739193 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.27 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $	*/
 /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)if.c	8.2 (Berkeley) 2/21/94";
 #else
-static char *rcsid = "$OpenBSD: if.c,v 1.27 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -216,7 +216,7 @@ intpr(interval, ifnetaddr)
 				if (aflag) {
 					u_long multiaddr;
 					struct in_multi inm;
-		
+
 					multiaddr = (u_long)ifaddr.in.ia_multiaddrs.lh_first;
 					while (multiaddr != 0) {
 						kread(multiaddr, (char *)&inm,
@@ -259,7 +259,7 @@ intpr(interval, ifnetaddr)
 					u_long multiaddr;
 					struct in6_multi inm;
 					char hbuf[INET6_ADDRSTRLEN];
-		
+
 					multiaddr = (u_long)ifaddr.in6.ia6_multiaddrs.lh_first;
 					while (multiaddr != 0) {
 						kread(multiaddr, (char *)&inm,
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 791b03522c6..118a5a97196 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.54 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: inet.c,v 1.55 2002/01/17 21:34:58 mickey Exp $	*/
 /*	$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-static char *rcsid = "$OpenBSD: inet.c,v 1.54 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.55 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -512,14 +512,14 @@ igmp_stats(off, name)
 #define	py(f, m) if (igmpstat.f || sflag <= 1) \
     printf(m, igmpstat.f, igmpstat.f != 1 ? "ies" : "y")
 	p(igps_rcv_total, "\t%lu message%s received\n");
-        p(igps_rcv_tooshort, "\t%lu message%s received with too few bytes\n");
-        p(igps_rcv_badsum, "\t%lu message%s received with bad checksum\n");
-        py(igps_rcv_queries, "\t%lu membership quer%s received\n");
-        py(igps_rcv_badqueries, "\t%lu membership quer%s received with invalid field(s)\n");
-        p(igps_rcv_reports, "\t%lu membership report%s received\n");
-        p(igps_rcv_badreports, "\t%lu membership report%s received with invalid field(s)\n");
-        p(igps_rcv_ourreports, "\t%lu membership report%s received for groups to which we belong\n");
-        p(igps_snd_reports, "\t%lu membership report%s sent\n");
+	p(igps_rcv_tooshort, "\t%lu message%s received with too few bytes\n");
+	p(igps_rcv_badsum, "\t%lu message%s received with bad checksum\n");
+	py(igps_rcv_queries, "\t%lu membership quer%s received\n");
+	py(igps_rcv_badqueries, "\t%lu membership quer%s received with invalid field(s)\n");
+	p(igps_rcv_reports, "\t%lu membership report%s received\n");
+	p(igps_rcv_badreports, "\t%lu membership report%s received with invalid field(s)\n");
+	p(igps_rcv_ourreports, "\t%lu membership report%s received for groups to which we belong\n");
+	p(igps_snd_reports, "\t%lu membership report%s sent\n");
 #undef p
 #undef py
 }
@@ -547,7 +547,7 @@ getrpcportnam(port, proto)
 	static struct rpcnams *rpcn;
 	struct rpcnams *n;
 	char num[20];
-	
+
 	if (first == 0) {
 		first = 1;
 		memset((char *)&server_addr, 0, sizeof server_addr);
@@ -692,15 +692,15 @@ inetname(inp)
  */
 void
 ah_stats(off, name)
-        u_long off;
-        char *name;
+	u_long off;
+	char *name;
 {
-        struct ahstat ahstat;
+	struct ahstat ahstat;
 
-        if (off == 0)
-                return;
-        kread(off, (char *)&ahstat, sizeof (ahstat));
-        printf("%s:\n", name);
+	if (off == 0)
+		return;
+	kread(off, (char *)&ahstat, sizeof (ahstat));
+	printf("%s:\n", name);
 
 #define p(f, m) if (ahstat.f || sflag <= 1) \
     printf(m, ahstat.f, plural(ahstat.f))
@@ -709,17 +709,17 @@ ah_stats(off, name)
 
 	p1(ahs_input, "\t%u input AH packets\n");
 	p1(ahs_output, "\t%u output AH packets\n");
-        p(ahs_nopf, "\t%u packet%s from unsupported protocol families\n");
-        p(ahs_hdrops, "\t%u packet%s shorter than header shows\n");
-        p(ahs_pdrops, "\t%u packet%s dropped due to policy\n");
-        p(ahs_notdb, "\t%u packet%s for which no TDB was found\n");
-        p(ahs_badkcr, "\t%u input packet%s that failed to be processed\n");
-        p(ahs_badauth, "\t%u packet%s that failed verification received\n");
-        p(ahs_noxform, "\t%u packet%s for which no XFORM was set in TDB received\n");
-        p(ahs_qfull, "\t%u packet%s were dropped due to full output queue\n");
-        p(ahs_wrap, "\t%u packet%s where counter wrapping was detected\n");
-        p(ahs_replay, "\t%u possibly replayed packet%s received\n");
-        p(ahs_badauthl, "\t%u packet%s with bad authenticator length received\n");
+	p(ahs_nopf, "\t%u packet%s from unsupported protocol families\n");
+	p(ahs_hdrops, "\t%u packet%s shorter than header shows\n");
+	p(ahs_pdrops, "\t%u packet%s dropped due to policy\n");
+	p(ahs_notdb, "\t%u packet%s for which no TDB was found\n");
+	p(ahs_badkcr, "\t%u input packet%s that failed to be processed\n");
+	p(ahs_badauth, "\t%u packet%s that failed verification received\n");
+	p(ahs_noxform, "\t%u packet%s for which no XFORM was set in TDB received\n");
+	p(ahs_qfull, "\t%u packet%s were dropped due to full output queue\n");
+	p(ahs_wrap, "\t%u packet%s where counter wrapping was detected\n");
+	p(ahs_replay, "\t%u possibly replayed packet%s received\n");
+	p(ahs_badauthl, "\t%u packet%s with bad authenticator length received\n");
 	p(ahs_invalid, "\t%u packet%s attempted to use an invalid tdb\n");
 	p(ahs_toobig, "\t%u packet%s got larger than max IP packet size\n");
 	p(ahs_crypto, "\t%u packet%s that failed crypto processing\n");
@@ -738,13 +738,12 @@ etherip_stats(off, name)
 	u_long off;
 	char *name;
 {
-        struct etheripstat etheripstat;
+	struct etheripstat etheripstat;
 
-	
-        if (off == 0)
-                return;
-        kread(off, (char *)&etheripstat, sizeof (etheripstat));
-        printf("%s:\n", name);
+	if (off == 0)
+		return;
+	kread(off, (char *)&etheripstat, sizeof (etheripstat));
+	printf("%s:\n", name);
 
 #define p(f, m) if (etheripstat.f || sflag <= 1) \
     printf(m, etheripstat.f, plural(etheripstat.f))
@@ -767,34 +766,33 @@ etherip_stats(off, name)
  */
 void
 esp_stats(off, name)
-        u_long off;
-        char *name;
+	u_long off;
+	char *name;
 {
-        struct espstat espstat;
+	struct espstat espstat;
 
-	
-        if (off == 0)
-                return;
-        kread(off, (char *)&espstat, sizeof (espstat));
-        printf("%s:\n", name);
+	if (off == 0)
+		return;
+	kread(off, (char *)&espstat, sizeof (espstat));
+	printf("%s:\n", name);
 
 #define p(f, m) if (espstat.f || sflag <= 1) \
     printf(m, espstat.f, plural(espstat.f))
 
 	p(esps_input, "\t%u input ESP packet%s\n");
 	p(esps_output, "\t%u output ESP packet%s\n");
-        p(esps_nopf, "\t%u packet%s from unsupported protocol families\n");
-        p(esps_hdrops, "\t%u packet%s shorter than header shows\n");
-        p(esps_pdrops, "\t%u packet%s dropped due to policy\n");
-        p(esps_notdb, "\t%u packet%s for which no TDB was found\n");
-        p(esps_badkcr, "\t%u input packet%s that failed to be processed\n");
-        p(esps_badenc, "\t%u packet%s with bad encryption received\n");
-        p(esps_badauth, "\t%u packet%s that failed verification received\n");
-        p(esps_noxform, "\t%u packet%s for which no XFORM was set in TDB received\n");   
-        p(esps_qfull, "\t%u packet%s were dropped due to full output queue\n");
-        p(esps_wrap, "\t%u packet%s where counter wrapping was detected\n");
-        p(esps_replay, "\t%u possibly replayed packet%s received\n"); 
-        p(esps_badilen, "\t%u packet%s with bad payload size or padding received\n");
+	p(esps_nopf, "\t%u packet%s from unsupported protocol families\n");
+	p(esps_hdrops, "\t%u packet%s shorter than header shows\n");
+	p(esps_pdrops, "\t%u packet%s dropped due to policy\n");
+	p(esps_notdb, "\t%u packet%s for which no TDB was found\n");
+	p(esps_badkcr, "\t%u input packet%s that failed to be processed\n");
+	p(esps_badenc, "\t%u packet%s with bad encryption received\n");
+	p(esps_badauth, "\t%u packet%s that failed verification received\n");
+	p(esps_noxform, "\t%u packet%s for which no XFORM was set in TDB received\n");
+	p(esps_qfull, "\t%u packet%s were dropped due to full output queue\n");
+	p(esps_wrap, "\t%u packet%s where counter wrapping was detected\n");
+	p(esps_replay, "\t%u possibly replayed packet%s received\n");
+	p(esps_badilen, "\t%u packet%s with bad payload size or padding received\n");
 	p(esps_invalid, "\t%u packet%s attempted to use an invalid tdb\n");
 	p(esps_toobig, "\t%u packet%s got larger than max IP packet size\n");
 	p(esps_crypto, "\t%u packet%s that failed crypto processing\n");
@@ -809,25 +807,25 @@ esp_stats(off, name)
  */
 void
 ipip_stats(off, name)
-        u_long off;
-        char *name;
+	u_long off;
+	char *name;
 {
-        struct ipipstat ipipstat;
+	struct ipipstat ipipstat;
 
-        if (off == 0)
-                return;
-        kread(off, (char *)&ipipstat, sizeof (ipipstat));
-        printf("%s:\n", name);
+	if (off == 0)
+		return;
+	kread(off, (char *)&ipipstat, sizeof (ipipstat));
+	printf("%s:\n", name);
 
 #define p(f, m) if (ipipstat.f || sflag <= 1) \
     printf(m, ipipstat.f, plural(ipipstat.f))
 
-        p(ipips_ipackets, "\t%u total input packet%s\n");
-        p(ipips_opackets, "\t%u total output packet%s\n");
-        p(ipips_hdrops, "\t%u packet%s shorter than header shows\n");
-        p(ipips_pdrops, "\t%u packet%s dropped due to policy\n");
-        p(ipips_spoof, "\t%u packet%s with possibly spoofed local addresses\n");
-        p(ipips_qfull, "\t%u packet%s were dropped due to full output queue\n");
+	p(ipips_ipackets, "\t%u total input packet%s\n");
+	p(ipips_opackets, "\t%u total output packet%s\n");
+	p(ipips_hdrops, "\t%u packet%s shorter than header shows\n");
+	p(ipips_pdrops, "\t%u packet%s dropped due to policy\n");
+	p(ipips_spoof, "\t%u packet%s with possibly spoofed local addresses\n");
+	p(ipips_qfull, "\t%u packet%s were dropped due to full output queue\n");
 	p(ipips_ibytes, "\t%qu input byte%s\n");
 	p(ipips_obytes, "\t%qu output byte%s\n");
 	p(ipips_family, "\t%u protocol family mismatches\n");
@@ -845,7 +843,6 @@ ipcomp_stats(off, name)
 {
 	struct ipcompstat ipcompstat;
 
-	
 	if (off == 0)
 		return;
 	kread(off, (char *)&ipcompstat, sizeof (ipcompstat));
@@ -861,7 +858,7 @@ ipcomp_stats(off, name)
 	p(ipcomps_pdrops, "\t%u packet%s dropped due to policy\n");
 	p(ipcomps_notdb, "\t%u packet%s for which no TDB was found\n");
 	p(ipcomps_badkcr, "\t%u input packet%s that failed to be processed\n");
-	p(ipcomps_noxform, "\t%u packet%s for which no XFORM was set in TDB received\n");   
+	p(ipcomps_noxform, "\t%u packet%s for which no XFORM was set in TDB received\n");
 	p(ipcomps_qfull, "\t%u packet%s were dropped due to full output queue\n");
 	p(ipcomps_wrap, "\t%u packet%s where counter wrapping was detected\n");
 	p(ipcomps_invalid, "\t%u packet%s attempted to use an invalid tdb\n");
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 288b8fcd062..9233e93f54e 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet6.c,v 1.16 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: inet6.c,v 1.17 2002/01/17 21:34:58 mickey Exp $	*/
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-/*__RCSID("$OpenBSD: inet6.c,v 1.16 2001/11/19 19:02:15 mpech Exp $");*/
+/*__RCSID("$OpenBSD: inet6.c,v 1.17 2002/01/17 21:34:58 mickey Exp $");*/
 /*__RCSID("KAME Id: inet6.c,v 1.10 2000/02/09 10:49:31 itojun Exp");*/
 #endif
 #endif /* not lint */
@@ -102,7 +102,7 @@ static	char *ip6nh[] = {
 	"#16",
 	"UDP",
 	"#18",
-	"#19",	
+	"#19",
 	"#20",
 	"#21",
 	"IDP",
@@ -112,7 +112,7 @@ static	char *ip6nh[] = {
 	"#26",
 	"#27",
 	"#28",
-	"TP",	
+	"TP",
 	"#30",
 	"#31",
 	"#32",
@@ -122,7 +122,7 @@ static	char *ip6nh[] = {
 	"#36",
 	"#37",
 	"#38",
-	"#39",	
+	"#39",
 	"#40",
 	"IP6",
 	"#42",
@@ -132,7 +132,7 @@ static	char *ip6nh[] = {
 	"#46",
 	"#47",
 	"#48",
-	"#49",	
+	"#49",
 	"ESP",
 	"AH",
 	"#52",
@@ -142,7 +142,7 @@ static	char *ip6nh[] = {
 	"#56",
 	"#57",
 	"ICMP6",
-	"no next header",	
+	"no next header",
 	"destination option",
 	"#61",
 	"#62",
@@ -152,7 +152,7 @@ static	char *ip6nh[] = {
 	"#66",
 	"#67",
 	"#68",
-	"#69",	
+	"#69",
 	"#70",
 	"#71",
 	"#72",
@@ -162,7 +162,7 @@ static	char *ip6nh[] = {
 	"#76",
 	"#77",
 	"#78",
-	"#79",	
+	"#79",
 	"ISOIP",
 	"#81",
 	"#82",
@@ -172,7 +172,7 @@ static	char *ip6nh[] = {
 	"#86",
 	"#87",
 	"#88",
-	"OSPF",	
+	"OSPF",
 	"#80",
 	"#91",
 	"#92",
@@ -182,7 +182,7 @@ static	char *ip6nh[] = {
 	"#96",
 	"Ethernet",
 	"#98",
-	"#99",	
+	"#99",
 	"#100",
 	"#101",
 	"#102",
@@ -192,7 +192,7 @@ static	char *ip6nh[] = {
 	"#106",
 	"#107",
 	"#108",
-	"#109",	
+	"#109",
 	"#110",
 	"#111",
 	"#112",
@@ -202,7 +202,7 @@ static	char *ip6nh[] = {
 	"#116",
 	"#117",
 	"#118",
-	"#119",	
+	"#119",
 	"#120",
 	"#121",
 	"#122",
@@ -212,7 +212,7 @@ static	char *ip6nh[] = {
 	"#126",
 	"#127",
 	"#128",
-	"#129",	
+	"#129",
 	"#130",
 	"#131",
 	"#132",
@@ -222,7 +222,7 @@ static	char *ip6nh[] = {
 	"#136",
 	"#137",
 	"#138",
-	"#139",	
+	"#139",
 	"#140",
 	"#141",
 	"#142",
@@ -232,7 +232,7 @@ static	char *ip6nh[] = {
 	"#146",
 	"#147",
 	"#148",
-	"#149",	
+	"#149",
 	"#150",
 	"#151",
 	"#152",
@@ -242,7 +242,7 @@ static	char *ip6nh[] = {
 	"#156",
 	"#157",
 	"#158",
-	"#159",	
+	"#159",
 	"#160",
 	"#161",
 	"#162",
@@ -252,7 +252,7 @@ static	char *ip6nh[] = {
 	"#166",
 	"#167",
 	"#168",
-	"#169",	
+	"#169",
 	"#170",
 	"#171",
 	"#172",
@@ -262,7 +262,7 @@ static	char *ip6nh[] = {
 	"#176",
 	"#177",
 	"#178",
-	"#179",	
+	"#179",
 	"#180",
 	"#181",
 	"#182",
@@ -272,7 +272,7 @@ static	char *ip6nh[] = {
 	"#186",
 	"#187",
 	"#188",
-	"#189",	
+	"#189",
 	"#180",
 	"#191",
 	"#192",
@@ -282,7 +282,7 @@ static	char *ip6nh[] = {
 	"#196",
 	"#197",
 	"#198",
-	"#199",	
+	"#199",
 	"#200",
 	"#201",
 	"#202",
@@ -292,7 +292,7 @@ static	char *ip6nh[] = {
 	"#206",
 	"#207",
 	"#208",
-	"#209",	
+	"#209",
 	"#210",
 	"#211",
 	"#212",
@@ -302,7 +302,7 @@ static	char *ip6nh[] = {
 	"#216",
 	"#217",
 	"#218",
-	"#219",	
+	"#219",
 	"#220",
 	"#221",
 	"#222",
@@ -312,7 +312,7 @@ static	char *ip6nh[] = {
 	"#226",
 	"#227",
 	"#228",
-	"#229",	
+	"#229",
 	"#230",
 	"#231",
 	"#232",
@@ -322,7 +322,7 @@ static	char *ip6nh[] = {
 	"#236",
 	"#237",
 	"#238",
-	"#239",	
+	"#239",
 	"#240",
 	"#241",
 	"#242",
@@ -332,7 +332,7 @@ static	char *ip6nh[] = {
 	"#246",
 	"#247",
 	"#248",
-	"#249",	
+	"#249",
 	"#250",
 	"#251",
 	"#252",
@@ -412,7 +412,7 @@ ip6_stats(off, name)
 	p(ip6s_m1, "\t\t%llu one mbuf%s\n");
 	for (first = 1, i = 0; i < 32; i++) {
 		char ifbuf[IFNAMSIZ];
-		if (ip6stat.ip6s_m2m[i] != 0) {		
+		if (ip6stat.ip6s_m2m[i] != 0) {
 			if (first) {
 				printf("\t\ttwo or more mbuf:\n");
 				first = 0;
@@ -583,7 +583,7 @@ static	char *icmp6names[] = {
 	"#16",
 	"#17",
 	"#18",
-	"#19",	
+	"#19",
 	"#20",
 	"#21",
 	"#22",
@@ -593,7 +593,7 @@ static	char *icmp6names[] = {
 	"#26",
 	"#27",
 	"#28",
-	"#29",	
+	"#29",
 	"#30",
 	"#31",
 	"#32",
@@ -603,7 +603,7 @@ static	char *icmp6names[] = {
 	"#36",
 	"#37",
 	"#38",
-	"#39",	
+	"#39",
 	"#40",
 	"#41",
 	"#42",
@@ -613,7 +613,7 @@ static	char *icmp6names[] = {
 	"#46",
 	"#47",
 	"#48",
-	"#49",	
+	"#49",
 	"#50",
 	"#51",
 	"#52",
@@ -623,7 +623,7 @@ static	char *icmp6names[] = {
 	"#56",
 	"#57",
 	"#58",
-	"#59",	
+	"#59",
 	"#60",
 	"#61",
 	"#62",
@@ -633,7 +633,7 @@ static	char *icmp6names[] = {
 	"#66",
 	"#67",
 	"#68",
-	"#69",	
+	"#69",
 	"#70",
 	"#71",
 	"#72",
@@ -643,7 +643,7 @@ static	char *icmp6names[] = {
 	"#76",
 	"#77",
 	"#78",
-	"#79",	
+	"#79",
 	"#80",
 	"#81",
 	"#82",
@@ -653,7 +653,7 @@ static	char *icmp6names[] = {
 	"#86",
 	"#87",
 	"#88",
-	"#89",	
+	"#89",
 	"#80",
 	"#91",
 	"#92",
@@ -663,7 +663,7 @@ static	char *icmp6names[] = {
 	"#96",
 	"#97",
 	"#98",
-	"#99",	
+	"#99",
 	"#100",
 	"#101",
 	"#102",
@@ -673,7 +673,7 @@ static	char *icmp6names[] = {
 	"#106",
 	"#107",
 	"#108",
-	"#109",	
+	"#109",
 	"#110",
 	"#111",
 	"#112",
@@ -683,7 +683,7 @@ static	char *icmp6names[] = {
 	"#116",
 	"#117",
 	"#118",
-	"#119",	
+	"#119",
 	"#120",
 	"#121",
 	"#122",
@@ -693,7 +693,7 @@ static	char *icmp6names[] = {
 	"#126",
 	"#127",
 	"echo",
-	"echo reply",	
+	"echo reply",
 	"multicast listener query",
 	"multicast listener report",
 	"multicast listener done",
@@ -713,7 +713,7 @@ static	char *icmp6names[] = {
 	"#146",
 	"#147",
 	"#148",
-	"#149",	
+	"#149",
 	"#150",
 	"#151",
 	"#152",
@@ -723,7 +723,7 @@ static	char *icmp6names[] = {
 	"#156",
 	"#157",
 	"#158",
-	"#159",	
+	"#159",
 	"#160",
 	"#161",
 	"#162",
@@ -733,7 +733,7 @@ static	char *icmp6names[] = {
 	"#166",
 	"#167",
 	"#168",
-	"#169",	
+	"#169",
 	"#170",
 	"#171",
 	"#172",
@@ -743,7 +743,7 @@ static	char *icmp6names[] = {
 	"#176",
 	"#177",
 	"#178",
-	"#179",	
+	"#179",
 	"#180",
 	"#181",
 	"#182",
@@ -753,7 +753,7 @@ static	char *icmp6names[] = {
 	"#186",
 	"#187",
 	"#188",
-	"#189",	
+	"#189",
 	"#180",
 	"#191",
 	"#192",
@@ -763,7 +763,7 @@ static	char *icmp6names[] = {
 	"#196",
 	"#197",
 	"#198",
-	"#199",	
+	"#199",
 	"#200",
 	"#201",
 	"#202",
@@ -773,7 +773,7 @@ static	char *icmp6names[] = {
 	"#206",
 	"#207",
 	"#208",
-	"#209",	
+	"#209",
 	"#210",
 	"#211",
 	"#212",
@@ -783,7 +783,7 @@ static	char *icmp6names[] = {
 	"#216",
 	"#217",
 	"#218",
-	"#219",	
+	"#219",
 	"#220",
 	"#221",
 	"#222",
@@ -793,7 +793,7 @@ static	char *icmp6names[] = {
 	"#226",
 	"#227",
 	"#228",
-	"#229",	
+	"#229",
 	"#230",
 	"#231",
 	"#232",
@@ -803,7 +803,7 @@ static	char *icmp6names[] = {
 	"#236",
 	"#237",
 	"#238",
-	"#239",	
+	"#239",
 	"#240",
 	"#241",
 	"#242",
@@ -813,7 +813,7 @@ static	char *icmp6names[] = {
 	"#246",
 	"#247",
 	"#248",
-	"#249",	
+	"#249",
 	"#250",
 	"#251",
 	"#252",
@@ -925,7 +925,7 @@ icmp6_ifstats(ifname)
 	}
 
 	p(ifs6_in_msg, "\t%llu total input message%s\n");
-	p(ifs6_in_error, "\t%llu total input error message%s\n"); 
+	p(ifs6_in_error, "\t%llu total input error message%s\n");
 	p(ifs6_in_dstunreach, "\t%llu input destination unreachable error%s\n");
 	p(ifs6_in_adminprohib, "\t%llu input administratively prohibited error%s\n");
 	p(ifs6_in_timeexceed, "\t%llu input time exceeded error%s\n");
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 917f8bcb1e0..b5b7e837000 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: ipx.c,v 1.9 2002/01/17 21:34:58 mickey Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: ipx.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: ipx.c,v 1.9 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -122,14 +122,14 @@ ipxprotopr(off, name)
 				(char *)&sockb, sizeof (sockb));
 		if (isspx) {
 			kread((u_long)ipxpcb.ipxp_ppcb,
-			      (char *)&spxpcb, sizeof (spxpcb));
+			    (char *)&spxpcb, sizeof (spxpcb));
 		}
 		if (first) {
 			printf("Active Internetwork Packet Exchange connections");
 			if (aflag)
 				printf(" (including servers)");
 			putchar('\n');
-                        if (Aflag)
+			if (Aflag)
 				printf("%-*.*s %-5.5s %-6.6s %-6.6s  %-*.*s %-*.*s %s\n",
 				    PLEN, PLEN, "PCB", "Proto", "Recv-Q",
 				    "Send-Q", PLEN, PLEN, "Local Address",
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index d7d5d1f7aeb..396eae51ba3 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.28 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: main.c,v 1.29 2002/01/17 21:34:58 mickey Exp $	*/
 /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
 #else
-static char *rcsid = "$OpenBSD: main.c,v 1.28 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.29 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -175,7 +175,7 @@ struct nlist nl[] = {
 	{ "_mbpool" },
 #define N_MCLPOOL	52
 	{ "_mclpool" },
-#define N_IPCOMPSTAT    53
+#define N_IPCOMPSTAT	53
 	{ "_ipcompstat" },
 	{ ""},
 };
@@ -206,8 +206,8 @@ struct protox {
 	  ipip_stats,	"ipencap" },
 	{ -1,		N_ETHERIPSTAT,	1,	0,
 	  etherip_stats,"etherip" },
-	{ -1,           N_IPCOMPSTAT,   1,      0,
-	  ipcomp_stats, "ipcomp" },
+	{ -1,		N_IPCOMPSTAT,	1,	0,
+	  ipcomp_stats,	"ipcomp" },
 	{ -1,		-1,		0,	0,
 	  0,		0 }
 };
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 23a993c3c64..55f796bd3bc 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.c,v 1.10 2002/01/15 22:41:01 art Exp $	*/
+/*	$OpenBSD: mbuf.c,v 1.11 2002/01/17 21:34:58 mickey Exp $	*/
 /*	$NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: mbuf.c,v 1.10 2002/01/15 22:41:01 art Exp $";
+static char *rcsid = "$OpenBSD: mbuf.c,v 1.11 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -94,7 +94,7 @@ mbpr(mbaddr, mbpooladdr, mclpooladdr)
 	if (nmbtypes != 256) {
 		fprintf(stderr,
 		    "%s: unexpected change to mbstat; check source\n",
-		        __progname);
+		    __progname);
 		return;
 	}
 	if (mbaddr == 0) {
@@ -130,11 +130,11 @@ mbpr(mbaddr, mbpooladdr, mclpooladdr)
 			    plural((int)mbstat.m_mtypes[i]), i);
 		}
 	printf("%lu/%lu mapped pages in use\n",
-	       (u_long)(mclpool.pr_nget - mclpool.pr_nput),
-	       ((u_long)mclpool.pr_npages * mclpool.pr_itemsperpage));
+	    (u_long)(mclpool.pr_nget - mclpool.pr_nput),
+	    ((u_long)mclpool.pr_npages * mclpool.pr_itemsperpage));
 	totmem = (mbpool.pr_npages * page_size) +
 	    (mclpool.pr_npages * page_size);
-	totused = (mbpool.pr_nget - mbpool.pr_nput) * mbpool.pr_size + 
+	totused = (mbpool.pr_nget - mbpool.pr_nput) * mbpool.pr_size +
 	    (mclpool.pr_nget - mclpool.pr_nput) * mclpool.pr_size;
 	totpct = (totmem == 0)? 0 : ((totused * 100)/totmem);
 	printf("%u Kbytes allocated to network (%d%% in use)\n",
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 37759964235..81011d74ac2 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: mroute6.c,v 1.2 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: mroute6.c,v 1.3 2002/01/17 21:34:58 mickey Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +15,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -182,7 +182,7 @@ mroute6pr(mrpaddr, mfcaddr, mifaddr)
 				       "  Packets Waits In-Mif  Out-Mifs\n");
 				banner_printed = 1;
 			}
-			
+
 			printf(" %-*.*s", WID_ORG, WID_ORG,
 			       routename6(&mfc.mf6c_origin));
 			printf(" %-*.*s", WID_GRP, WID_GRP,
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 3a1f0f37389..4ba13dcaaf0 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.43 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: route.c,v 1.44 2002/01/17 21:34:58 mickey Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.43 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.44 2002/01/17 21:34:58 mickey Exp $";
 #endif
 #endif /* not lint */
 
@@ -197,7 +197,7 @@ pr_family(af)
 	case AF_INET6:
 		afname = "Internet6";
 		break;
-#endif 
+#endif
 	case AF_NS:
 		afname = "XNS";
 		break;
@@ -268,7 +268,7 @@ pr_encaphdr()
 	if (Aflag)
 		printf("%-*s ", PLEN, "Address");
 	printf("%-18s %-5s %-18s %-5s %-5s %-22s\n",
-	    "Source", "Port", "Destination", 
+	    "Source", "Port", "Destination",
 	    "Port", "Proto", "SA(Address/Proto/Type/Direction)");
 }
 
@@ -374,7 +374,7 @@ ntreestuff()
 		printf("out of space\n");
 		exit(1);
 	}
-        if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+	if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
 		perror("sysctl of routing table");
 		exit(1);
 	}
@@ -476,7 +476,7 @@ p_sockaddr(sa, mask, flags, width)
 			cp = netname6(sa6, NULL);
 		break;
 	    }
-#endif 
+#endif
 
 	case AF_NS:
 		cp = ns_print(sa);
@@ -485,7 +485,7 @@ p_sockaddr(sa, mask, flags, width)
 	case AF_IPX:
 		cp = ipx_print(sa);
 		break;
-		
+
 	case AF_LINK:
 	    {
 		struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
@@ -628,24 +628,24 @@ p_rtentry(rt)
 			rt->rt_nodes[0].rn_dupedkey ? " =>" : "");
 	}
 	putchar('\n');
- 	if (vflag) {
- 		printf("\texpire   %10lu%c  recvpipe %10ld%c  "
+	if (vflag) {
+		printf("\texpire   %10lu%c  recvpipe %10ld%c  "
 		       "sendpipe %10ld%c\n",
- 			rt->rt_rmx.rmx_expire, 
- 			(rt->rt_rmx.rmx_locks & RTV_EXPIRE) ? 'L' : ' ',
- 			rt->rt_rmx.rmx_recvpipe,
- 			(rt->rt_rmx.rmx_locks & RTV_RPIPE) ? 'L' : ' ',
- 			rt->rt_rmx.rmx_sendpipe,
- 			(rt->rt_rmx.rmx_locks & RTV_SPIPE) ? 'L' : ' ');
- 		printf("\tssthresh %10lu%c  rtt      %10ld%c  "
+			rt->rt_rmx.rmx_expire,
+			(rt->rt_rmx.rmx_locks & RTV_EXPIRE) ? 'L' : ' ',
+			rt->rt_rmx.rmx_recvpipe,
+			(rt->rt_rmx.rmx_locks & RTV_RPIPE) ? 'L' : ' ',
+			rt->rt_rmx.rmx_sendpipe,
+			(rt->rt_rmx.rmx_locks & RTV_SPIPE) ? 'L' : ' ');
+		printf("\tssthresh %10lu%c  rtt      %10ld%c  "
 		       "rttvar   %10ld%c\n",
- 			rt->rt_rmx.rmx_ssthresh, 
- 			(rt->rt_rmx.rmx_locks & RTV_SSTHRESH) ? 'L' : ' ',
- 			rt->rt_rmx.rmx_rtt, 
- 			(rt->rt_rmx.rmx_locks & RTV_RTT) ? 'L' : ' ',
- 			rt->rt_rmx.rmx_rttvar, 
+			rt->rt_rmx.rmx_ssthresh,
+			(rt->rt_rmx.rmx_locks & RTV_SSTHRESH) ? 'L' : ' ',
+			rt->rt_rmx.rmx_rtt,
+			(rt->rt_rmx.rmx_locks & RTV_RTT) ? 'L' : ' ',
+			rt->rt_rmx.rmx_rttvar,
 			(rt->rt_rmx.rmx_locks & RTV_RTTVAR) ? 'L' : ' ');
- 	}	
+	}	
 }
 
 char *
@@ -1011,7 +1011,7 @@ encap_print(rt)
 	struct rtentry *rt;
 {
 	struct sockaddr_encap sen1, sen2, sen3;
-        struct ipsec_policy ipo;
+	struct ipsec_policy ipo;
 
 #ifdef INET6
 	struct sockaddr_in6 s61, s62;
@@ -1022,15 +1022,15 @@ encap_print(rt)
 	bcopy(kgetsa(rt_mask(rt)), &sen2, sizeof(sen2));
 	bcopy(kgetsa(rt->rt_gateway), &sen3, sizeof(sen3));
 
-        if (sen1.sen_type == SENT_IP4)
+	if (sen1.sen_type == SENT_IP4)
 	{
-	    printf("%-18s %-5u ", netname(sen1.sen_ip_src.s_addr, 
-				          sen2.sen_ip_src.s_addr),
-	           ntohs(sen1.sen_sport));
+	    printf("%-18s %-5u ", netname(sen1.sen_ip_src.s_addr,
+					  sen2.sen_ip_src.s_addr),
+		   ntohs(sen1.sen_sport));
 
-	    printf("%-18s %-5u %-5u ", netname(sen1.sen_ip_dst.s_addr, 
+	    printf("%-18s %-5u %-5u ", netname(sen1.sen_ip_dst.s_addr,
 					       sen2.sen_ip_dst.s_addr),
-	           ntohs(sen1.sen_dport), sen1.sen_proto);
+		   ntohs(sen1.sen_dport), sen1.sen_proto);
 	}
 
 #ifdef INET6
@@ -1054,66 +1054,66 @@ encap_print(rt)
 	    bcopy(&sen2.sen_ip6_dst, &s62.sin6_addr, sizeof(struct in6_addr));
 
 	    printf("%-42s %-5u %-5u ", netname6(&s61, &s62.sin6_addr),
-	           ntohs(sen1.sen_ip6_dport), sen1.sen_ip6_proto);
+		   ntohs(sen1.sen_ip6_dport), sen1.sen_ip6_proto);
 	}
 #endif /* INET6 */
 
 	if (sen3.sen_type == SENT_IPSP)
-        {
-            char hostn[NI_MAXHOST];
+	{
+	    char hostn[NI_MAXHOST];
 
 	    kget(sen3.sen_ipsp, ipo);
 
-            getnameinfo(&ipo.ipo_dst.sa, ipo.ipo_dst.sa.sa_len,
-                        hostn, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+	    getnameinfo(&ipo.ipo_dst.sa, ipo.ipo_dst.sa.sa_len,
+			hostn, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
 	    printf("%s", hostn);
 
-            printf("/%-u", ipo.ipo_sproto);
-
-            switch (ipo.ipo_type)
-            {
-                case IPSP_IPSEC_REQUIRE:
-                    printf("/require");
-                    break;
-
-                case IPSP_IPSEC_ACQUIRE:
-                    printf("/acquire");
-                    break;
-
-                case IPSP_IPSEC_USE:
-                    printf("/use");
-                    break;
-
-                case IPSP_IPSEC_DONTACQ:
-                    printf("/dontacq");
-                    break;
-
-                case IPSP_PERMIT:
-                    printf("/permit");
-                    break;
-
-                case IPSP_DENY:
-                    printf("/deny");
-                    break;
-
-                default:
-                    printf("/<unknown type!>");
-            }
-
-            if ((ipo.ipo_addr.sen_type == SENT_IP4 &&
-                 ipo.ipo_addr.sen_direction == IPSP_DIRECTION_IN) ||
-                (ipo.ipo_addr.sen_type == SENT_IP6 &&
-                 ipo.ipo_addr.sen_ip6_direction == IPSP_DIRECTION_IN))
-              printf("/in\n");
-            else
-              if ((ipo.ipo_addr.sen_type == SENT_IP4 &&
-                   ipo.ipo_addr.sen_direction == IPSP_DIRECTION_OUT) ||
-                  (ipo.ipo_addr.sen_type == SENT_IP6 &&
-                   ipo.ipo_addr.sen_ip6_direction == IPSP_DIRECTION_OUT))
-                printf("/out\n");
-              else
-                printf("/<unknown>\n");
-        }
+	    printf("/%-u", ipo.ipo_sproto);
+
+	    switch (ipo.ipo_type)
+	    {
+		case IPSP_IPSEC_REQUIRE:
+		    printf("/require");
+		    break;
+
+		case IPSP_IPSEC_ACQUIRE:
+		    printf("/acquire");
+		    break;
+
+		case IPSP_IPSEC_USE:
+		    printf("/use");
+		    break;
+
+		case IPSP_IPSEC_DONTACQ:
+		    printf("/dontacq");
+		    break;
+
+		case IPSP_PERMIT:
+		    printf("/permit");
+		    break;
+
+		case IPSP_DENY:
+		    printf("/deny");
+		    break;
+
+		default:
+		    printf("/<unknown type!>");
+	    }
+
+	    if ((ipo.ipo_addr.sen_type == SENT_IP4 &&
+		 ipo.ipo_addr.sen_direction == IPSP_DIRECTION_IN) ||
+		(ipo.ipo_addr.sen_type == SENT_IP6 &&
+		 ipo.ipo_addr.sen_ip6_direction == IPSP_DIRECTION_IN))
+	      printf("/in\n");
+	    else
+	      if ((ipo.ipo_addr.sen_type == SENT_IP4 &&
+		   ipo.ipo_addr.sen_direction == IPSP_DIRECTION_OUT) ||
+		  (ipo.ipo_addr.sen_type == SENT_IP6 &&
+		   ipo.ipo_addr.sen_ip6_direction == IPSP_DIRECTION_OUT))
+		printf("/out\n");
+	      else
+		printf("/<unknown>\n");
+	}
 }
 
 void