 @@ -1,14 +1,14 @@
-/*	$NetBSD: iostat.c,v 1.67 2018/04/08 11:37:31 mlelstv Exp $	*/
+/*	$NetBSD: iostat.c,v 1.68 2022/06/17 01:47:45 kre 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.67 2018/04/08 11:37:31 mlelstv Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.68 2022/06/17 01:47:45 kre 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>
 @@ -114,27 +114,27 @@ static int	wincols = 80;
 static void cpustats(void);
 static double drive_time(double, int);
 static void drive_stats(double);
 static void drive_stats2(double);
 static void drive_statsx(double);
 static void drive_statsy(double);
 static void drive_statsy_io(double, double, double);
 static void drive_statsy_q(double, double, double, double, double, double);
 static void sig_header(int);
 static volatile int do_header;
 static void header(void);
 __dead static void usage(void);
 static void display(void);
-static int selectdrives(int, char *[]);
+static int selectdrives(int, char *[], int);
 int
 main(int argc, char *argv[])
+{
 	int ch, hdrcnt, hdroffset, ndrives, lines;
 	struct timespec	tv;
 	struct ttysize ts;
 	while ((ch = getopt(argc, argv, "Cc:dDITw:xy")) != -1)
 		switch (ch) {
 		case 'c':
 			if ((reps = atoi(optarg)) <= 0)
 				errx(1, "repetition count <= 0.");
 @@ -193,27 +193,27 @@ main(int argc, char *argv[])
 			wincols = ts.ts_cols;
+	}
 	defdrives = wincols;
 	if (ISSET(todo, SHOW_CPU))
 		defdrives -= 16;	/* XXX magic number */
 	if (ISSET(todo, SHOW_TTY))
 		defdrives -= 10;	/* XXX magic number */
 	defdrives /= 18;		/* XXX magic number */
 	drvinit(0);
 	cpureadstats();
 	drvreadstats();
-	ndrives = selectdrives(argc, argv);
+	ndrives = selectdrives(argc, argv, 1);
 	if (ndrives == 0) {
 		/* No drives are selected.  No need to show drive stats. */
 		todo &= ~SHOW_STATS_ALL;
 		if (todo == 0)
 			errx(1, "no drives");
+	}
 	tv.tv_sec = interval;
 	tv.tv_nsec = 0;
 	/* print a new header on sigcont */
 	(void)signal(SIGCONT, sig_header);
 	for (hdrcnt = 1;;) {
 @@ -235,27 +235,27 @@ main(int argc, char *argv[])
 			cpuswap();
 			drvswap();
 			tkswap();
+		}
 		display();
 		if (reps >= 0 && --reps <= 0)
 			break;
 		nanosleep(&tv, NULL);
 		cpureadstats();
 		drvreadstats();
-		ndrives = selectdrives(argc, argv);
+		ndrives = selectdrives(argc, argv, 0);
+	}
 	exit(0);
+}
 static void
 sig_header(int signo)
+{
 	do_header = 1;
+}
 static void
 header(void)
+{
 @@ -604,27 +604,27 @@ display(void)
+	}
 	if (ISSET(todo, SHOW_CPU))
 		cpustats();
 	(void)printf("\n");
 out:
 	(void)fflush(stdout);
+}
 static int
-selectdrives(int argc, char *argv[])
+selectdrives(int argc, char *argv[], int first)
+{
 	int	i, maxdrives, ndrives, tried;
 	/*
 	 * Choose drives to be displayed.  Priority goes to (in order) drives
 	 * supplied as arguments and default drives.  If everything isn't
 	 * filled in and there are drives not taken care of, display the first
 	 * few that fit.
+	 *
 	 * The backward compatibility #ifdefs permit the syntax:
 	 *	iostat [ drives ] [ interval [ count ] ]
 	 */
 @@ -653,27 +653,27 @@ selectdrives(int argc, char *argv[])
 			     (int)ndrive < defdrives)
 			? (int)(ndrive) : defdrives;
 		for (i = 0; i < maxdrives; i++) {
 			cur.select[i] = 1;
 			++ndrives;
 			if (!ISSET(todo, SHOW_STATS_X | SHOW_STATS_Y) &&
 			    ndrives == defdrives)
 				break;
+		}
+	}
 #ifdef BACKWARD_COMPATIBILITY
-	if (*argv) {
+	if (first && *argv) {
 		interval = atoi(*argv);
 		if (*++argv)
 			reps = atoi(*argv);
+	}
 #endif
 	if (interval) {
 		if (!reps)
 			reps = -1;
 	} else
 		if (reps)
 			interval = 1;