sam
/
dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed fgets usage, increment offset until a line is read, dwm will drop all lines read in one call, except the first!!! one (previously it preferred the last) - but the current approach is simplier and works better for general purpose in conjunction with the offset handling

This commit is contained in:
Anselm R. Garbe 2007-11-03 20:43:12 +01:00
parent af4667a85a
commit 0e98090d65
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dwm.c
View File

@ -1145,6 +1145,7 @@ quit(const char *arg) {
readin = running = False; readin = running = False;
} }
void void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) { resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
XWindowChanges wc; XWindowChanges wc;
@ -1280,15 +1281,19 @@ restack(void) {
void void
run(void) { run(void) {
char *p;
fd_set rd; fd_set rd;
int xfd; int r, xfd;
unsigned int len, offset;
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 */ offset = 0;
len = sizeof stext - 1;
stext[len] = '\0'; /* 0-terminator is never touched */
while(running) { while(running) {
FD_ZERO(&rd); FD_ZERO(&rd);
if(readin) if(readin)
@ -1300,12 +1305,27 @@ run(void) {
eprint("select failed\n"); eprint("select failed\n");
} }
if(FD_ISSET(STDIN_FILENO, &rd)) { if(FD_ISSET(STDIN_FILENO, &rd)) {
if((readin = (stext == fgets(stext, sizeof stext - 1, stdin)))) switch((r = read(STDIN_FILENO, stext + offset, len - offset))) {
stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */ case -1:
else if(feof(stdin)) strncpy(stext, strerror(errno), len);
readin = False;
break;
case 0:
strncpy(stext, "EOF", 4); strncpy(stext, "EOF", 4);
else /* error occured */ readin = False;
strncpy(stext, strerror(errno), sizeof stext - 1); break;
default:
stext[offset + r] = '\0';
for(p = stext; *p && *p != '\n'; p++);
if(*p == '\n') {
*p = '\0';
offset = 0;
}
else if(offset + r < len - 1)
offset += r;
else
offset = 0;
}
drawbar(); drawbar();
} }
while(XPending(dpy)) { while(XPending(dpy)) {