Sun Oct 25 02:47:17 2015 UTC ()

extend the "tout" column to 5 characters, it's really common on a modern
machine to have eg, build output way more than 9999 chars/sec.

this doesn't affect the default disk list on an 80-char wide screen.


(mrg)

diff -r1.62 -r1.63 src/usr.sbin/iostat/iostat.c

--- src/usr.sbin/iostat/iostat.c 2015/07/09 13:26:52	1.62
+++ src/usr.sbin/iostat/iostat.c 2015/10/25 02:47:17	1.63

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iostat.c,v 1.62 2015/07/09 13:26:52 mrg Exp $	*/
+/*	$NetBSD: iostat.c,v 1.63 2015/10/25 02:47:17 mrg Exp $	*/
 /*
  * Copyright (c) 1996 John M. Vinopal
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -61,27 +61,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1986, 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)iostat.c	8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: iostat.c,v 1.62 2015/07/09 13:26:52 mrg Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.63 2015/10/25 02:47:17 mrg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/sched.h>
 #include <sys/time.h>
 #include <err.h>
 #include <ctype.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -174,27 +174,27 @@ main(int argc, char *argv[])
+	}
 	if (ioctl(STDOUT_FILENO, TIOCGSIZE, &ts) != -1) {
 		if (ts.ts_lines)
 			winlines = ts.ts_lines;
 		if (ts.ts_cols)
 			wincols = ts.ts_cols;
+	}
 	defdrives = wincols;
 	if (ISSET(todo, SHOW_CPU))
 		defdrives -= 16;	/* XXX magic number */
 	if (ISSET(todo, SHOW_TTY))
-		defdrives -= 9;		/* XXX magic number */
+		defdrives -= 10;	/* XXX magic number */
 	defdrives /= 18;		/* XXX magic number */
 	drvinit(0);
 	cpureadstats();
 	drvreadstats();
 	ndrives = selectdrives(argc, argv);
 	if (ndrives == 0) {
 		/* No drives are selected.  No need to show drive stats. */
 		todo &= ~SHOW_STATS_ALL;
 		if (todo == 0)
 			errx(1, "no drives");
+	}
 	if (ISSET(todo, SHOW_STATS_X))
 @@ -269,27 +269,27 @@ header(void)
 	if (ISSET(todo, SHOW_STATS_2)) {
 		for (i = 0; i < ndrive; i++)
 			if (cur.select[i])
 				(void)printf("        %9.9s ", cur.name[i]);
+	}
 	if (ISSET(todo, SHOW_CPU))
 		(void)printf("            CPU");
 	printf("\n");
 					/* Sub-Headers. */
 	if (ISSET(todo, SHOW_TTY))
-		printf(" tin tout");
+		printf(" tin  tout");
 	if (ISSET(todo, SHOW_STATS_1)) {
 		for (i = 0; i < ndrive; i++)
 			if (cur.select[i]) {
 				if (ISSET(todo, SHOW_TOTALS))
 					(void)printf("  KB/t  xfr  MB   ");
 				else
 					(void)printf("  KB/t  t/s  MB/s ");
+			}
+	}
 	if (ISSET(todo, SHOW_STATS_2)) {
 		for (i = 0; i < ndrive; i++)
 @@ -458,27 +458,27 @@ display(void)
 	/*
 	 * If we're showing totals only, then don't divide by the
 	 * system time.
 	 */
 	if (ISSET(todo, SHOW_TOTALS))
 		etime = 1.0;
 	if (ISSET(todo, SHOW_STATS_X)) {
 		drive_statsx(etime);
 		goto out;
+	}
 	if (ISSET(todo, SHOW_TTY))
-		printf("%4.0f %4.0f", cur.tk_nin / etime, cur.tk_nout / etime);
+		printf("%4.0f %5.0f", cur.tk_nin / etime, cur.tk_nout / etime);
 	if (ISSET(todo, SHOW_STATS_1)) {
 		drive_stats(etime);
+	}
 	if (ISSET(todo, SHOW_STATS_2)) {
 		drive_stats2(etime);
+	}
 	if (ISSET(todo, SHOW_CPU))
 		cpustats();