lhark/dwm-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

replaced low-level stext reading with an fgets call

Browse source
This commit is contained in:
Anselm R. Garbe 2007-11-02 16:57:52 +01:00
parent 6f60b2e1cd
commit b8985dc7bb
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dwm.c
View file

@ -1280,15 +1280,15 @@ restack(void) {
void void
run(void) { run(void) {
char *p;
int r, xfd;
fd_set rd; fd_set rd;
int xfd;
XEvent ev; XEvent ev;
/* main event loop, also reads status text from stdin */ /* main event loop, also reads status text from stdin */
XSync(dpy, False); XSync(dpy, False);
xfd = ConnectionNumber(dpy); xfd = ConnectionNumber(dpy);
readin = True; readin = True;
stext[sizeof stext - 1] = '\0'; /* 0-terminator is never touched */
while(running) { while(running) {
FD_ZERO(&rd); FD_ZERO(&rd);
if(readin) if(readin)
@ -1300,22 +1300,10 @@ run(void) {
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 - 1)) { if(stext == fgets(stext, sizeof stext - 1, stdin))
case -1: stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */
else
strncpy(stext, strerror(errno), sizeof stext - 1); strncpy(stext, strerror(errno), sizeof stext - 1);
stext[sizeof stext - 1] = '\0';
readin = False;
break;
case 0:
strncpy(stext, "EOF", 4);
readin = False;
break;
default:
for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
for(; p >= stext && *p != '\n'; --p);
if(p > stext)
strncpy(stext, p + 1, sizeof stext);
}
drawbar(); drawbar();
} }
while(XPending(dpy)) { while(XPending(dpy)) {