From 37259e878f05db4106b67a9fc9cdc426d174282c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 10 Oct 2020 21:58:07 +0900 Subject: [PATCH] [ruby/io-console] Relaxed min: option warning When `min: 0` is given to `IO#getch` with `time:` option, it is expected to return nil if timed out, and needed for source code the compatibility with unixen platforms. https://github.com/ruby/io-console/commit/a2afbe72bd --- ext/io/console/console.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 11ce699971..7d5181cfb3 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -537,7 +537,13 @@ console_getch(int argc, VALUE *argv, VALUE io) timeout = rb_scheduler_timeout(&tv); # endif } - if (optp->vmin != 1) { + switch (optp->vmin) { + case 1: /* default */ + break; + case 0: /* return nil when timed out */ + if (optp->vtime) break; + /* fallthru */ + default: rb_warning("min option ignored"); } if (optp->intr) {