 @@ -1,14 +1,14 @@
-.\"	$NetBSD: iostat.8,v 1.29 2023/07/28 09:18:58 mrg Exp $
+.\"	$NetBSD: iostat.8,v 1.30 2023/07/28 12:03:33 wiz Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  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.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -27,27 +27,27 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)iostat.8	8.1 (Berkeley) 6/6/93
 .\"
 .Dd July 28, 2023
 .Dt IOSTAT 8
 .Os
 .Sh NAME
 .Nm iostat
 .Nd report I/O statistics
 .Sh SYNOPSIS
 .Nm
-.Op Fl CdDITxXyz
+.Op Fl CDdITXxyz
 .Op Fl c Ar count
 .Op Fl H Ar height
 .Op Fl W Ar width
 .Op Fl w Ar wait
 .Op Ar drives
 .Sh DESCRIPTION
 .Nm
 displays kernel I/O statistics on terminal, disk and CPU operations.
 By default,
 .Nm
 displays one line of statistics averaged over the machine's run time.
 The use of
 .Fl c
 @@ -55,169 +55,169 @@ or
 .Fl w
 presents successive lines averaged over the
 .Ar wait
 period.
 The
 .Fl I
 option causes
 .Nm
 to print raw, unaveraged values (totals).
 .Pp
 Only the last disk option specified
 .Fl ( d ,
 .Fl D ,
 .Fl x ,
 .Fl X ,
 .Fl x ,
 or
 .Fl y )
 is used.
 .Pp
 The options are as follows:
 .Bl -tag -width XNXsystemX
 .It Fl C
 Show CPU statistics.
 This is enabled by default unless any of the
 .Fl D ,
 .Fl d ,
 .Fl T ,
 .Fl X ,
 .Fl x ,
 or
 .Fl y
 flags are used.
 .It Fl c Ar count
 Repeat the display
 .Ar count
 times.
 Unless the
 .Fl I
 flag is in effect, the first display is for the time since a reboot and
 each subsequent report is for the time period since the last display.
 If no
 .Ar wait
 interval is specified, the default is 1 second.
 .It Fl C
 Show CPU statistics.
 This is enabled by default unless any of the
 .Fl d ,
 .Fl D ,
 .Fl T ,
 .Fl x ,
 .Fl X ,
 or
 .Fl y
 flags are used.
 .It Fl d
 Show disk statistics.
 This is the default.
 Displays
 number of transfers per second,
 kilobytes per transfer,
 and
 megabytes transferred per second.
 Use of this flag disables the default display of CPU and tty statistics.
 .It Fl D
 Show alternative disk statistics.
 Displays
 number of transfers,
 kilobytes transferred,
 and
 time spent in transfers,
 during the
 .Ar wait
 period (or since boot with
 .Fl I ) .
 Use of this flag disables the default display.
 .It Fl d
 Show disk statistics.
 This is the default.
 Displays
 number of transfers per second,
 kilobytes per transfer,
 and
 megabytes transferred per second.
 Use of this flag disables the default display of CPU and tty statistics.
 .It Fl H Ar height
 Set the page size (length, or height) explicitly, as the number of lines,
 .Ar height .
 If not set, the page length is taken from the environment variable
 .Ev LINES
 if set, or from the terminal (window) size, if output is to a terminal
 and its size is set,
 and otherwise defaults to 20.
 If explicitly set to zero, pages are considered to be infinitely long.
 This parameter determines the frequency at which repeated headers are output.
 If the value is greater than zero, but too small for the header, along with
 one output set, then a new header will be produced for each set of output.
 .It Fl I
 Show the running total values, rather than an average.
 .ig ii
 .It Fl i
 Like
 .Fl I
 except the totals shown are those since
 .Nm
 started running, rather than since the system booted.
 In this case the first output would necessarily be zero,
 so is suppressed.
 Consequently this option produces no output if neither
 .Fl w
 nor
 .Fl c
 nor
 .Fl w
 is given.
 .ii
 .It Fl T
 Show tty statistics.
 This is enabled by default unless one, or more, of the
 .Fl C ,
 .Fl d ,
 .Fl D ,
-.Fl x ,
+.Fl d ,
 .Fl X ,
 .Fl x ,
 or
 .Fl y
 flags are used.
 .ig uu
 .It Fl u
 When totals are being shown
 .Pq Fl I
 .ig ii
 .Po or
 .Fl i Pc
 .ii
 include a column after each relevant output column
 showing the difference between this output and the previous.
 These added columns will be blank in the first displayed output.
 .uu
 .It Fl w Ar wait
 Pause
 .Ar wait
 seconds between each display.
 If no repeat
 .Ar count
 is specified, the default is infinity.
 .It Fl W Ar width
 Set the page width explicitly, as the number of columns of characters,
 .Ar width .
 If not set, the page width is taken from the environment variable
 .Ev COLUMNS
 if set, or from the terminal (window) size, if output is to a terminal
 and its size is set,
 and otherwise defaults to 80.
 If explicitly set to 0, lines are considered infinitely long.
 This width is used only to determine the number of drives to display
 by default when no drive list is given.
 In other cases output will be as wide as needed to display the
 data requested.
 .It Fl w Ar wait
 Pause
 .Ar wait
 seconds between each display.
 If no repeat
 .Ar count
 is specified, the default is infinity.
 .It Fl X
 Show limited alternative disk statistics.
 Displays megabytes transferred, and time spent in transfers, during the
 .Ar wait
 period (or since boot with
 .Fl I ) .
 Use of this flag disables the default display.
 .It Fl x
 Show extended disk statistics.
 Each disk is displayed on a line of its own with all available
 statistics.
 This option overrides all other display options, and all
 disks are displayed unless specific disk names
 are provided as arguments.
 Additionally, separate read and write statistics are displayed.
 The
 .Fl C
 and
 .Fl T
 options are ignored with this output format.
 .It Fl X
 Show limited alternative disk statistics.
 Displays megabytes transferred, and time spent in transfers, during the
 .Ar wait
 period (or since boot with
 .Fl I ) .
 Use of this flag disables the default display.
 .It Fl y
 Shows the extended statistics (as with
 .Fl x )
 and additional queuing statistics.
 Output does not fit in an 80 column window.
 The
 .Fl C
 and
 .Fl T
 options are ignored with this output format.
 .It Fl z
 Replaces drive and CPU statistic outputs that are exactly zero with spaces.
 Note that zero values can still appear \(en this indicates a
 @@ -344,22 +344,22 @@ option was added in
 Collection of queuing values and the
 .Fl y
 option were added in
 .Nx 8.0 .
 The
 .Fl X
 option was added in
 .Nx 11.0 .
 The archaic option format:
 .br
 .ti +3n
 .Nm
 .Op Ar drives ...
-.Oo Ar wait Op Ar count Oc
+.Oo Ar wait Oo Ar count Oc Oc
 .br
 remains supported (the first
 .Ar drive
 whose name starts with a digit is taken to be the
 .Ar wait
 period) but is deprecated,
 and may be removed in a future version,
 so should not be used.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iostat.c,v 1.70 2023/07/28 09:18:58 mrg Exp $	*/
+/*	$NetBSD: iostat.c,v 1.71 2023/07/28 12:03:33 wiz 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.70 2023/07/28 09:18:58 mrg Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.71 2023/07/28 12:03:33 wiz 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>
 @@ -866,27 +866,27 @@ cpustats(void)
 		if ((todo & SUPPRESS_ZERO) && cur.cp_time[state] == 0) {
 			printf(" %*s", cwidth[state], "");
 			continue;
+		}
 		printf(" %*.0f", cwidth[state],
 . * cur.cp_time[state] / ttime);
+	}
+}
 static void
 usage(void)
+{
-	(void)fprintf(stderr, "usage: iostat [-CdDITxXyz] [-c count] "
+	(void)fprintf(stderr, "usage: iostat [-CDdITXxyz] [-c count] "
 	    "[-H height] [-W width] [-w wait] [drives]\n");
 	exit(1);
+}
 static void
 display(int ndrives)
+{
 	double	etime;
 	/* Sum up the elapsed ticks. */
 	etime = cur.cp_etime;
 	/*