applied Jukka's stdinread patch

This commit is contained in:
arg@mig29 2006-11-26 13:31:36 +01:00
parent 2b35fb643e
commit 27ef73507b

5
main.c
View File

@ -274,9 +274,10 @@ main(int argc, char *argv[]) {
eprint("select failed\n"); eprint("select failed\n");
} }
if(FD_ISSET(STDIN_FILENO, &rd)) { if(FD_ISSET(STDIN_FILENO, &rd)) {
switch(r = read(STDIN_FILENO, stext, sizeof(stext))) { switch(r = read(STDIN_FILENO, stext, sizeof(stext) - 1)) {
case -1: case -1:
strncpy(stext, strerror(errno), sizeof(stext)); strncpy(stext, strerror(errno), sizeof(stext));
stext[sizeof(stext) - 1] = '\0';
readin = False; readin = False;
break; break;
case 0: case 0:
@ -284,7 +285,7 @@ main(int argc, char *argv[]) {
readin = False; readin = False;
break; break;
default: default:
stext[r-1] = 0; stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
} }
drawstatus(); drawstatus();
} }