Cap wait/interval at 100 million seconds.

Keeps nanosleep(2) from choking.

While here, call the argument to the -w flag "wait" in the
error message to match up with documentation and usage().

ok tedu@ deraadt@ tb@

diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index c85c6fc..27f710a 100644 (file)
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: iostat.c,v 1.39 2015/10/23 08:21:27 tedu Exp $        */
+/*     $OpenBSD: iostat.c,v 1.40 2018/02/10 19:49:50 cheloha Exp $     */
 /*     $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $       */
 
 /*
@@ -146,9 +146,9 @@ main(int argc, char *argv[])
                        todo |= SHOW_TTY;
                        break;
                case 'w':
-                       interval = strtonum(optarg, 1, INT_MAX, &errstr);
+                       interval = strtonum(optarg, 1, 100000000, &errstr);
                        if (errstr)
-                               errx(1, "interval is %s", errstr);
+                               errx(1, "wait is %s", errstr);
                        break;
                case '?':
                default:
@@ -419,7 +419,7 @@ selectdrives(char *argv[])
                        errx(1, "invalid interval or drive name: %s", *argv);
        }
        if (*argv) {
-               interval = strtonum(*argv, 1, INT_MAX, &errstr);
+               interval = strtonum(*argv, 1, 100000000, &errstr);
                if (errstr)
                        errx(1, "interval is %s", errstr);
                if (*++argv) {