From owner-freebsd-stable  Fri Nov  8 03:48:25 1996
Return-Path: owner-stable
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id DAA27193
          for stable-outgoing; Fri, 8 Nov 1996 03:48:25 -0800 (PST)
Received: from NS.Contrib.Com (NS.Contrib.Com [194.77.12.2])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id DAA27188
          for <stable@FreeBSD.org>; Fri, 8 Nov 1996 03:48:21 -0800 (PST)
Received: (from src@localhost) by NS.Contrib.Com (8.6.9/8.6.9) id MAA01500; Fri, 8 Nov 1996 12:48:19 +0100
Date: Fri, 8 Nov 1996 12:48:19 +0100
From: Heiko Blume <src@NS.Contrib.Com>
Message-Id: <199611081148.MAA01500@NS.Contrib.Com>
To: stable@FreeBSD.org
Subject: systat beautification patch
Sender: owner-stable@FreeBSD.org
X-Loop: FreeBSD.org
Precedence: bulk

well,

as self-punishment for asking stupid questions, i did something.
it's cosmetic, but i like it. the 'systat -vmstat' output
becomes a little ugly when the numbers get large and run
into each other. i changed it, so that there are spaces between
them (until you reach 10G numbers :-)

regards,

	hb


*** /usr/src/usr.bin/systat/vmstat.c.orig	Fri Nov  8 12:23:10 1996
--- /usr/src/usr.bin/systat/vmstat.c	Tue Nov  5 15:52:56 1996
***************
*** 166,173 ****
  #define MEMROW		 2	/* uses 4 rows and 31 cols */
  #define MEMCOL		 0
  #define PAGEROW		 2	/* uses 4 rows and 26 cols */
! #define PAGECOL		36
! #define INTSROW		 2	/* uses all rows to bottom and 17 cols */
  #define INTSCOL		61
  #define PROCSROW	 7	/* uses 2 rows and 20 cols */
  #define PROCSCOL	 0
--- 166,173 ----
  #define MEMROW		 2	/* uses 4 rows and 31 cols */
  #define MEMCOL		 0
  #define PAGEROW		 2	/* uses 4 rows and 26 cols */
! #define PAGECOL		46
! #define INTSROW		 6	/* uses all rows to bottom and 17 cols */
  #define INTSCOL		61
  #define PROCSROW	 7	/* uses 2 rows and 20 cols */
  #define PROCSCOL	 0
***************
*** 275,286 ****
  
  	clear();
  	mvprintw(STATROW, STATCOL + 4, "users    Load");
! 	mvprintw(MEMROW, MEMCOL, "Mem:KB  REAL        VIRTUAL");
! 	mvprintw(MEMROW + 1, MEMCOL, "      Tot Share    Tot  Share");
  	mvprintw(MEMROW + 2, MEMCOL, "Act");
  	mvprintw(MEMROW + 3, MEMCOL, "All");
  
! 	mvprintw(MEMROW + 1, MEMCOL + 31, "Free");
  
  	mvprintw(PAGEROW, PAGECOL,     "        VN PAGER  SWAP PAGER ");
  	mvprintw(PAGEROW + 1, PAGECOL, "        in  out     in  out ");
--- 275,286 ----
  
  	clear();
  	mvprintw(STATROW, STATCOL + 4, "users    Load");
! 	mvprintw(MEMROW, MEMCOL, "Mem:KB    REAL            VIRTUAL");
! 	mvprintw(MEMROW + 1, MEMCOL, "        Tot   Share      Tot    Share");
  	mvprintw(MEMROW + 2, MEMCOL, "Act");
  	mvprintw(MEMROW + 3, MEMCOL, "All");
  
! 	mvprintw(MEMROW + 1, MEMCOL + 41, "Free");
  
  	mvprintw(PAGEROW, PAGECOL,     "        VN PAGER  SWAP PAGER ");
  	mvprintw(PAGEROW + 1, PAGECOL, "        in  out     in  out ");
***************
*** 425,439 ****
  	putfloat(avenrun[2], STATROW, STATCOL + 29, 6, 2, 0);
  	mvaddstr(STATROW, STATCOL + 53, buf);
  #define pgtokb(pg)	((pg) * cnt.v_page_size / 1024)
! 	putint(pgtokb(total.t_arm), MEMROW + 2, MEMCOL + 3, 6);
! 	putint(pgtokb(total.t_armshr), MEMROW + 2, MEMCOL + 9, 6);
! 	putint(pgtokb(total.t_avm), MEMROW + 2, MEMCOL + 15, 7);
! 	putint(pgtokb(total.t_avmshr), MEMROW + 2, MEMCOL + 22, 7);
! 	putint(pgtokb(total.t_rm), MEMROW + 3, MEMCOL + 3, 6);
! 	putint(pgtokb(total.t_rmshr), MEMROW + 3, MEMCOL + 9, 6);
! 	putint(pgtokb(total.t_vm), MEMROW + 3, MEMCOL + 15, 7);
! 	putint(pgtokb(total.t_vmshr), MEMROW + 3, MEMCOL + 22, 7);
! 	putint(pgtokb(total.t_free), MEMROW + 2, MEMCOL + 29, 6);
  	putint(total.t_rq - 1, PROCSROW + 1, PROCSCOL + 3, 3);
  	putint(total.t_pw, PROCSROW + 1, PROCSCOL + 6, 3);
  	putint(total.t_dw, PROCSROW + 1, PROCSCOL + 9, 3);
--- 425,439 ----
  	putfloat(avenrun[2], STATROW, STATCOL + 29, 6, 2, 0);
  	mvaddstr(STATROW, STATCOL + 53, buf);
  #define pgtokb(pg)	((pg) * cnt.v_page_size / 1024)
! 	putint(pgtokb(total.t_arm), MEMROW + 2, MEMCOL + 3, 8);
! 	putint(pgtokb(total.t_armshr), MEMROW + 2, MEMCOL + 11, 8);
! 	putint(pgtokb(total.t_avm), MEMROW + 2, MEMCOL + 19, 9);
! 	putint(pgtokb(total.t_avmshr), MEMROW + 2, MEMCOL + 28, 9);
! 	putint(pgtokb(total.t_rm), MEMROW + 3, MEMCOL + 3, 8);
! 	putint(pgtokb(total.t_rmshr), MEMROW + 3, MEMCOL + 11, 8);
! 	putint(pgtokb(total.t_vm), MEMROW + 3, MEMCOL + 19, 9);
! 	putint(pgtokb(total.t_vmshr), MEMROW + 3, MEMCOL + 28, 9);
! 	putint(pgtokb(total.t_free), MEMROW + 2, MEMCOL + 37, 8);
  	putint(total.t_rq - 1, PROCSROW + 1, PROCSCOL + 3, 3);
  	putint(total.t_pw, PROCSROW + 1, PROCSCOL + 6, 3);
  	putint(total.t_dw, PROCSROW + 1, PROCSCOL + 9, 3);