From: arg@mig29 Date: Sun, 26 Nov 2006 12:31:36 +0000 (+0100) Subject: applied Jukka's stdinread patch X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=commitdiff_plain;h=27ef73507b69608c63bd7d1684b7d9987fbcce53 applied Jukka's stdinread patch --- diff --git a/main.c b/main.c index 750366e..86cd3f9 100644 --- a/main.c +++ b/main.c @@ -274,9 +274,10 @@ main(int argc, char *argv[]) { eprint("select failed\n"); } 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: strncpy(stext, strerror(errno), sizeof(stext)); + stext[sizeof(stext) - 1] = '\0'; readin = False; break; case 0: @@ -284,7 +285,7 @@ main(int argc, char *argv[]) { readin = False; break; default: - stext[r-1] = 0; + stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0'; } drawstatus(); }