===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** src/usr.bin/systat/vmstat.c	2009/05/03 05:01:54	1.69
--- src/usr.bin/systat/vmstat.c	2009/08/13 23:45:35	1.70
***************
*** 1,4 ****
! /*	$OpenBSD: vmstat.c,v 1.69 2009/05/03 05:01:54 drahn Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: vmstat.c,v 1.70 2009/08/13 23:45:35 deraadt Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
***************
*** 34,40 ****
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
  #endif
! static char rcsid[] = "$OpenBSD: vmstat.c,v 1.69 2009/05/03 05:01:54 drahn Exp $";
  #endif /* not lint */
  
  /*
--- 34,40 ----
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
  #endif
! static char rcsid[] = "$OpenBSD: vmstat.c,v 1.70 2009/08/13 23:45:35 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 251,256 ****
--- 251,261 ----
  	mvprintw(INTSROW, INTSCOL + 3, " Interrupts");
  	mvprintw(INTSROW + 1, INTSCOL + 9, "total");
  
+ 	if (LINES - 1 > VMSTATROW + 17)
+ 		mvprintw(VMSTATROW + 17, INTSCOL + 9, "IPKTS");
+ 	if (LINES - 1 > VMSTATROW + 18)
+ 		mvprintw(VMSTATROW + 18, INTSCOL + 9, "OPKTS");
+ 
  	mvprintw(VMSTATROW + 0, VMSTATCOL + 10, "forks");
  	mvprintw(VMSTATROW + 1, VMSTATCOL + 10, "fkppw");
  	mvprintw(VMSTATROW + 2, VMSTATCOL + 10, "fksvm");
***************
*** 371,376 ****
--- 376,386 ----
  	s.nchcount = nchtotal.ncs_goodhits + nchtotal.ncs_badhits +
  	    nchtotal.ncs_miss + nchtotal.ncs_long;
  
+ 	if (LINES - 1 > VMSTATROW + 17)
+ 		putint(sum.ifc_ip, VMSTATROW + 17, INTSCOL, 8);
+ 	if (LINES - 1 > VMSTATROW + 18)
+ 		putint(sum.ifc_op, VMSTATROW + 18, INTSCOL, 8);
+ 
  	psiz = 0;
  	f2 = 0.0;
  
***************
*** 465,470 ****
--- 475,481 ----
  	putfloat((nchtotal.ncs_miss + nchtotal.ncs_long - nchtotal.ncs_pass2) *
  	    100.0 / nz(s.nchcount), NAMEIROW + 2, NAMEICOL + 45, 4, 0, 1);
  #undef nz
+ 
  }
  
  int
***************
*** 693,698 ****
--- 704,710 ----
  	if (state == TIME)
  		copyinfo(&s3, &s1);
  	fetchkre();
+ 	fetchifstat();
  	if (state == TIME)
  		dkswap();
  	num_disp = 0;