Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing IO code to no longer use poll() in favor of just reading input

Browse Source 
and using VMIN and VTIME.
This commit is contained in:
Bruce Hill 2019-06-17 16:45:24 -07:00
parent 8d5e68d444
commit fbfe8689a8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bb.c
View File

@ -6,6 +6,7 @@
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <poll.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -196,8 +197,8 @@ void init_term(void)
} }
memcpy(&bb_termios, &orig_termios, sizeof(bb_termios)); memcpy(&bb_termios, &orig_termios, sizeof(bb_termios));
cfmakeraw(&bb_termios); cfmakeraw(&bb_termios);
bb_termios.c_cc[VMIN] = 0; bb_termios.c_cc[VMIN] = 1;
bb_termios.c_cc[VTIME] = 0; bb_termios.c_cc[VTIME] = 1;
if (tcsetattr(fileno(tty_out), TCSAFLUSH, &bb_termios) == -1) if (tcsetattr(fileno(tty_out), TCSAFLUSH, &bb_termios) == -1)
err("Couldn't tcsetattr"); err("Couldn't tcsetattr");
update_term_size(0); update_term_size(0);

7
bterm.h
View File

@ -10,7 +10,6 @@
#ifndef FILE__BTERM_H #ifndef FILE__BTERM_H
#define FILE__BTERM_H #define FILE__BTERM_H
#include <poll.h>
#include <stdio.h> #include <stdio.h>
#define KEY_F1 (0xFFFF-0) #define KEY_F1 (0xFFFF-0)
@ -112,11 +111,9 @@ const char *bkeyname(int key);
static inline int nextchar(int fd, int timeout) static inline int nextchar(int fd, int timeout)
{ {
(void)timeout;
char c; char c;
struct pollfd pfd = {fd, POLLIN, 0}; return read(fd, &c, 1) == 1 ? c : -1;
if (poll(&pfd, 1, timeout) > 0)
return read(fd, &c, 1) == 1 ? c : -1;
return -1;
} }
/* /*