===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/if.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** src/usr.bin/netstat/if.c	2011/07/09 00:45:40	1.64
--- src/usr.bin/netstat/if.c	2012/08/22 00:11:57	1.65
***************
*** 1,4 ****
! /*	$OpenBSD: if.c,v 1.64 2011/07/09 00:45:40 henning Exp $	*/
  /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: if.c,v 1.65 2012/08/22 00:11:57 tedu Exp $	*/
  /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
  
  /*
***************
*** 53,58 ****
--- 53,59 ----
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
+ #include <util.h>
  
  #include "netstat.h"
  
***************
*** 311,320 ****
  			putchar(' ');
  		break;
  	}
! 	if (bflag)
! 		printf("%10llu %10llu",
! 		    ifd->ifi_ibytes, ifd->ifi_obytes);
! 	else
  		printf("%8llu %5llu %8llu %5llu %5llu",
  		    ifd->ifi_ipackets, ifd->ifi_ierrors,
  		    ifd->ifi_opackets, ifd->ifi_oerrors,
--- 312,328 ----
  			putchar(' ');
  		break;
  	}
! 	if (bflag) {
! 		if (hflag) {
! 			char ibytes[FMT_SCALED_STRSIZE];
! 			char obytes[FMT_SCALED_STRSIZE];
! 			fmt_scaled(ifd->ifi_ibytes, ibytes);
! 			fmt_scaled(ifd->ifi_obytes, obytes);
! 			printf("%10s %10s", ibytes, obytes);
! 		} else
! 			printf("x %10llu %10llu",
! 			    ifd->ifi_ibytes, ifd->ifi_obytes);
! 	} else
  		printf("%8llu %5llu %8llu %5llu %5llu",
  		    ifd->ifi_ipackets, ifd->ifi_ierrors,
  		    ifd->ifi_opackets, ifd->ifi_oerrors,
***************
*** 351,356 ****
--- 359,366 ----
  {
  	sigset_t emptyset;
  	int line;
+ 	char ibytes[FMT_SCALED_STRSIZE];
+ 	char obytes[FMT_SCALED_STRSIZE];
  
  	fetchifs();
  	if (ip_cur.ift_name[0] == '\0') {
***************
*** 393,399 ****
  		printf(" %5.5s", "drops");
  
  	if (bflag)
! 		printf("  %10.10s %8.8s %10.10s %5.5s",
  		    "bytes", " ", "bytes", " ");
  	else
  		printf("  %8.8s %5.5s %8.8s %5.5s %5.5s",
--- 403,409 ----
  		printf(" %5.5s", "drops");
  
  	if (bflag)
! 		printf("%10.10s %8.8s %10.10s %5.5s",
  		    "bytes", " ", "bytes", " ");
  	else
  		printf("  %8.8s %5.5s %8.8s %5.5s %5.5s",
***************
*** 410,420 ****
  
  	fetchifs();
  
! 	if (bflag)
! 		printf("%10llu %8.8s %10llu %5.5s",
! 		    ip_cur.ift_ib - ip_old.ift_ib, " ",
! 		    ip_cur.ift_ob - ip_old.ift_ob, " ");
! 	else
  		printf("%8llu %5llu %8llu %5llu %5llu",
  		    ip_cur.ift_ip - ip_old.ift_ip,
  		    ip_cur.ift_ie - ip_old.ift_ie,
--- 420,436 ----
  
  	fetchifs();
  
! 	if (bflag) {
! 		if (hflag) {
! 			fmt_scaled(ip_cur.ift_ib - ip_old.ift_ib, ibytes);
! 			fmt_scaled(ip_cur.ift_ob - ip_old.ift_ob, obytes);
! 			printf("%10s %8.8s %10s %5.5s",
! 			    ibytes, " ", obytes, " ");
! 		} else
! 			printf("%10llu %8.8s %10llu %5.5s",
! 			    ip_cur.ift_ib - ip_old.ift_ib, " ",
! 			    ip_cur.ift_ob - ip_old.ift_ob, " ");
! 	} else
  		printf("%8llu %5llu %8llu %5llu %5llu",
  		    ip_cur.ift_ip - ip_old.ift_ip,
  		    ip_cur.ift_ie - ip_old.ift_ie,
***************
*** 428,438 ****
  
  	ip_old = ip_cur;
  
! 	if (bflag)
! 		printf("  %10llu %8.8s %10llu %5.5s",
! 		    sum_cur.ift_ib - sum_old.ift_ib, " ",
! 		    sum_cur.ift_ob - sum_old.ift_ob, " ");
! 	else
  		printf("  %8llu %5llu %8llu %5llu %5llu",
  		    sum_cur.ift_ip - sum_old.ift_ip,
  		    sum_cur.ift_ie - sum_old.ift_ie,
--- 444,460 ----
  
  	ip_old = ip_cur;
  
! 	if (bflag) {
! 		if (hflag) {
! 			fmt_scaled(sum_cur.ift_ib - sum_old.ift_ib, ibytes);
! 			fmt_scaled(sum_cur.ift_ob - sum_old.ift_ob, obytes);
! 			printf("  %10s %8.8s %10s %5.5s",
! 			    ibytes, " ", obytes, " ");
! 		} else
! 			printf("  %10llu %8.8s %10llu %5.5s",
! 			    sum_cur.ift_ib - sum_old.ift_ib, " ",
! 			    sum_cur.ift_ob - sum_old.ift_ob, " ");
! 	} else
  		printf("  %8llu %5llu %8llu %5llu %5llu",
  		    sum_cur.ift_ip - sum_old.ift_ip,
  		    sum_cur.ift_ie - sum_old.ift_ie,