diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 14:11:12 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 14:11:12 +0000 |
commit | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (patch) | |
tree | a4a1db7f54c16d12fabe2626b8f1e235cd694e9e /miscutils/conspy.c | |
parent | 811c449748d5bd0505f8510e5582892f94ac0cda (diff) | |
parent | b83c9704128dd106071184e4b00335a3b8486857 (diff) | |
download | busybox-w32-67758035a4fe040c6ac69b39d61bcd6bddd7b827.tar.gz busybox-w32-67758035a4fe040c6ac69b39d61bcd6bddd7b827.tar.bz2 busybox-w32-67758035a4fe040c6ac69b39d61bcd6bddd7b827.zip |
Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge
Diffstat (limited to 'miscutils/conspy.c')
-rw-r--r-- | miscutils/conspy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/miscutils/conspy.c b/miscutils/conspy.c index 9c5405332..90ef91c5c 100644 --- a/miscutils/conspy.c +++ b/miscutils/conspy.c | |||
@@ -504,16 +504,17 @@ int conspy_main(int argc UNUSED_PARAM, char **argv) | |||
504 | } | 504 | } |
505 | } | 505 | } |
506 | poll_timeout_ms = 250; | 506 | poll_timeout_ms = 250; |
507 | if (option_mask32 & FLAG(v)) continue; | ||
507 | 508 | ||
508 | // Insert all keys pressed into the virtual console's input | 509 | // Insert all keys pressed into the virtual console's input |
509 | // buffer. Don't do this if the virtual console is in scan | 510 | // buffer. Don't do this if the virtual console is in scan |
510 | // code mode - giving ASCII characters to a program expecting | 511 | // code mode - giving ASCII characters to a program expecting |
511 | // scan codes will confuse it. | 512 | // scan codes will confuse it. |
512 | if (!(option_mask32 & FLAG(v)) && G.escape_count == 0) { | 513 | G.key_count += bytes_read; |
514 | if (G.escape_count == 0) { | ||
513 | int handle, result; | 515 | int handle, result; |
514 | long kbd_mode; | 516 | long kbd_mode; |
515 | 517 | ||
516 | G.key_count += bytes_read; | ||
517 | handle = xopen(tty_name, O_WRONLY); | 518 | handle = xopen(tty_name, O_WRONLY); |
518 | result = ioctl(handle, KDGKBMODE, &kbd_mode); | 519 | result = ioctl(handle, KDGKBMODE, &kbd_mode); |
519 | if (result >= 0) { | 520 | if (result >= 0) { |