[src/netbsd-1-6]: src/usr.bin/systat Pull up revision 1.20 (requested by itoj...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5f5e528b6d64
branches:  netbsd-1-6
changeset: 527828:5f5e528b6d64
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Jun 10 16:31:28 2002 +0000

description:
Pull up revision 1.20 (requested by itojun in ticket #221):
format fix in number mode.  PR 16911

diffstat:

 usr.bin/systat/iostat.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r f58c5dc41082 -r 5f5e528b6d64 usr.bin/systat/iostat.c
--- a/usr.bin/systat/iostat.c   Mon Jun 10 16:30:21 2002 +0000
+++ b/usr.bin/systat/iostat.c   Mon Jun 10 16:31:28 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iostat.c,v 1.19 2002/01/28 13:20:43 augustss Exp $     */
+/*     $NetBSD: iostat.c,v 1.19.4.1 2002/06/10 16:31:28 tv Exp $       */
 
 /*
  * Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)iostat.c   8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: iostat.c,v 1.19 2002/01/28 13:20:43 augustss Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.19.4.1 2002/06/10 16:31:28 tv Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -129,7 +129,7 @@
        int i, col, regions, ndrives;
 
 #define COLWIDTH       14
-#define DRIVESPERLINE  ((getmaxx(wnd) - INSET) / COLWIDTH)
+#define DRIVESPERLINE  ((getmaxx(wnd) - 1) / COLWIDTH)
        for (ndrives = 0, i = 0; i < dk_ndrive; i++)
                if (cur.dk_select[i])
                        ndrives++;
@@ -147,7 +147,7 @@
        col = 0;
        for (i = 0; i < dk_ndrive; i++)
                if (cur.dk_select[i] /*&& cur.dk_bytes[i] != 0.0*/) {
-                       if (col + COLWIDTH >= getmaxx(wnd) - INSET) {
+                       if (col + COLWIDTH > getmaxx(wnd)) {
                                col = 0, row += linesperregion + 1;
                                if (row > getmaxy(wnd) - (linesperregion + 1))
                                        break;
@@ -221,7 +221,7 @@
        winsertln(wnd);
        for (i = 0; i < dk_ndrive; i++)
                if (cur.dk_select[i] /*&& cur.dk_bytes[i] != 0.0*/) {
-                       if (col + COLWIDTH >= getmaxx(wnd)) {
+                       if (col + COLWIDTH > getmaxx(wnd)) {
                                col = 0, row += linesperregion + 1;
                                if (row > getmaxy(wnd) - (linesperregion + 1))
                                        break;