wok diff busybox/stuff/busybox-1.18-conspy.u @ rev 12259
Up: slitaz-configs to 4.9.2. There shouldn't have been 1.9.2 tag.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Tue Apr 10 14:35:05 2012 +0000 (2012-04-10) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/busybox/stuff/busybox-1.18-conspy.u Tue Apr 10 14:35:05 2012 +0000 1.3 @@ -0,0 +1,23 @@ 1.4 +Fix esc keys leak 1.5 +--- busybox-1.18.0/miscutils/conspy.c 1.6 ++++ busybox-1.18.0/miscutils/conspy.c 1.7 +@@ -506,16 +506,17 @@ 1.8 + } 1.9 + } 1.10 + poll_timeout_ms = 250; 1.11 ++ if (option_mask32 & FLAG(v)) continue; 1.12 + 1.13 + // Insert all keys pressed into the virtual console's input 1.14 + // buffer. Don't do this if the virtual console is in scan 1.15 + // code mode - giving ASCII characters to a program expecting 1.16 + // scan codes will confuse it. 1.17 +- if (!(option_mask32 & FLAG(v)) && G.escape_count == 0) { 1.18 ++ G.key_count += bytes_read; 1.19 ++ if (G.escape_count == 0) { 1.20 + int handle, result; 1.21 + long kbd_mode; 1.22 + 1.23 +- G.key_count += bytes_read; 1.24 + handle = xopen(tty_name, O_WRONLY); 1.25 + result = ioctl(handle, KDGKBMODE, &kbd_mode); 1.26 + if (result >= 0) {