emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conspy: stop losing some keyboard keys.

Browse Source 
11 bytes shrink.

Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Pascal Bellard 2010-07-01 07:18:41 +02:00 committed by Denys Vlasenko
parent 45f66167fe
commit 81199672be
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
miscutils/conspy.c
View File

@ -517,21 +517,23 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
G.key_count += bytes_read; G.key_count += bytes_read;
handle = xopen(tty_name, O_WRONLY); handle = xopen(tty_name, O_WRONLY);
result = ioctl(handle, KDGKBMODE, &kbd_mode); result = ioctl(handle, KDGKBMODE, &kbd_mode);
if (result == -1) if (result >= 0) {
/* nothing */;
else if (kbd_mode != K_XLATE && kbd_mode != K_UNICODE)
G.key_count = 0; // scan code mode
else {
char *p = keybuf; char *p = keybuf;
for (; G.key_count != 0 && result != -1; p++, G.key_count--) {
if (kbd_mode != K_XLATE && kbd_mode != K_UNICODE) {
G.key_count = 0; // scan code mode
}
for (; G.key_count != 0; p++, G.key_count--) {
result = ioctl(handle, TIOCSTI, p); result = ioctl(handle, TIOCSTI, p);
if (result < 0) {
memmove(keybuf, p, G.key_count);
break;
}
// If there is an application on console which reacts // If there is an application on console which reacts
// to keypresses, we need to make our first sleep // to keypresses, we need to make our first sleep
// shorter to quickly redraw whatever it printed there. // shorter to quickly redraw whatever it printed there.
poll_timeout_ms = 20; poll_timeout_ms = 20;
} }
if (G.key_count)
memmove(keybuf, p, G.key_count);
} }
// Close & re-open tty in case they have // Close & re-open tty in case they have
// swapped virtual consoles // swapped virtual consoles
@ -539,7 +541,7 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
// We sometimes get spurious IO errors on the TTY // We sometimes get spurious IO errors on the TTY
// as programs close and re-open it // as programs close and re-open it
if (result != -1) if (result >= 0)
G.ioerror_count = 0; G.ioerror_count = 0;
else if (errno != EIO || ++G.ioerror_count > 4) else if (errno != EIO || ++G.ioerror_count > 4)
cleanup(1); cleanup(1);