emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

slabtop, vmstat, watch: remove file descriptor constants

Browse Source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-03-08 21:49:49 +01:00
parent 7267c3a22b
commit 94fa402d4b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slabtop.c
View File

@ -414,7 +414,7 @@ int main(int argc, char *argv[])
tv.tv_sec = delay; tv.tv_sec = delay;
tv.tv_usec = 0; tv.tv_usec = 0;
if (select(STDOUT_FILENO, &readfds, NULL, NULL, &tv) > 0) { if (select(STDOUT_FILENO, &readfds, NULL, NULL, &tv) > 0) {
if (read(0, &c, 1) != 1) if (read(STDIN_FILENO, &c, 1) != 1)
break; break;
parse_input(c); parse_input(c);
} }

2
vmstat.c
View File

@ -694,7 +694,7 @@ static int winhi(void)
struct winsize win; struct winsize win;
int rows = 24; int rows = 24;
if (ioctl(1, TIOCGWINSZ, &win) != -1 && win.ws_row > 0) if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) != -1 && 0 < win.ws_row)
rows = win.ws_row; rows = win.ws_row;
return rows; return rows;

2
watch.c
View File

@ -220,7 +220,7 @@ static void get_terminal_size(void)
} }
} }
if (incoming_cols < 0 || incoming_rows < 0) { if (incoming_cols < 0 || incoming_rows < 0) {
if (ioctl(2, TIOCGWINSZ, &w) == 0) { if (ioctl(STDERR_FILENO, TIOCGWINSZ, &w) == 0) {
if (incoming_rows < 0 && w.ws_row > 0) { if (incoming_rows < 0 && w.ws_row > 0) {
height = w.ws_row; height = w.ws_row;
snprintf(env_row_buf, sizeof env_row_buf, snprintf(env_row_buf, sizeof env_row_buf,