diff options
author | ru <ru@FreeBSD.org> | 2001-10-09 08:33:50 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2001-10-09 08:33:50 +0000 |
commit | 08ebd59071666c947a81c9e1f7733756f6714d51 (patch) | |
tree | 60423d0e36b6dcbaa982e085ceb25e5357fb3b62 /usr.bin/netstat | |
parent | beb72547e6bef6f1bd5ab009748e2b3f53d74aa3 (diff) | |
download | FreeBSD-src-08ebd59071666c947a81c9e1f7733756f6714d51.zip FreeBSD-src-08ebd59071666c947a81c9e1f7733756f6714d51.tar.gz |
The previous change also disaligned lines with AF_IPX and AF_NS
addresses. Unshrink "Network" width to the previous value, and
make sure everything is aligned again.
Diffstat (limited to 'usr.bin/netstat')
-rw-r--r-- | usr.bin/netstat/if.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 1b89cce..688827e 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -203,7 +203,7 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) return; if (!pfunc) { - printf("%-5.5s %5.5s %-11.11s %-17.17s %8.8s %5.5s", + printf("%-5.5s %5.5s %-13.13s %-17.17s %8.8s %5.5s", "Name", "Mtu", "Network", "Address", "Ipkts", "Ierrs"); if (bflag) printf(" %10.10s","Ibytes"); @@ -269,7 +269,7 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) if (ifaddraddr == 0) { printf("%-5.5s %5lu ", name, ifnet.if_mtu); - printf("%-11.11s ", "none"); + printf("%-13.13s ", "none"); printf("%-17.17s ", "none"); } else { if (kread(ifaddraddr, (char *)&ifaddr, sizeof ifaddr)) { @@ -302,7 +302,7 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) printf("%-13.13s ", netname(in.s_addr, ifaddr.in.ia_subnetmask)); #else - printf("%-11.11s ", + printf("%-13.13s ", netname(htonl(ifaddr.in.ia_subnet), ifaddr.in.ia_subnetmask)); #endif @@ -314,7 +314,7 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) #ifdef INET6 case AF_INET6: sin6 = (struct sockaddr_in6 *)sa; - printf("%-11.11s ", + printf("%-13.13s ", netname6(&ifaddr.in6.ia_addr, &ifaddr.in6.ia_prefixmask.sin6_addr)); printf("%-17.17s ", @@ -336,14 +336,14 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) sprintf(netnum, "%lx", (u_long)ntohl(net)); printf("ipx:%-8s ", netnum); /* printf("ipx:%-8s ", netname(net, 0L)); */ - printf("%-15s ", + printf("%-17s ", ipx_phost((struct sockaddr *)sipx)); } break; case AF_APPLETALK: printf("atalk:%-12.12s ",atalk_print(sa,0x10) ); - printf("%-9.9s ",atalk_print(sa,0x0b) ); + printf("%-11.11s ",atalk_print(sa,0x0b) ); break; #ifdef NS case AF_NS: @@ -356,8 +356,8 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) *(union ns_net *) &net = sns->sns_addr.x_net; sprintf(netnum, "%lxH", ntohl(net)); upHex(netnum); - printf("ns:%-8s ", netnum); - printf("%-15s ", + printf("ns:%-10s ", netnum); + printf("%-17s ", ns_phost((struct sockaddr *)sns)); } break; @@ -370,7 +370,7 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) cp = (char *)LLADDR(sdl); n = sdl->sdl_alen; sprintf(linknum, "<Link#%d>", sdl->sdl_index); - m = printf("%-11.11s ", linknum); + m = printf("%-13.13s ", linknum); } goto hexprint; default: @@ -383,7 +383,7 @@ intpr(int interval, u_long ifnetaddr, void (*pfunc)(char *)) while (--n >= 0) m += printf("%02x%c", *cp++ & 0xff, n > 0 ? ':' : ' '); - m = 30 - m; + m = 32 - m; while (m-- > 0) putchar(' '); |