X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=062f9d7557b8d3c8828bfd5dc16de9864faa019e;hb=35e96b8deba8aae863cef32f2ea2a84ebf162472;hp=f196df7c7e47509582c62389e4fcc95c23f41923;hpb=61a1910f91fe6aba428193087d6c3ff21374ee5e;p=dwm.git

diff --git a/main.c b/main.c
index f196df7..062f9d7 100644
--- a/main.c
+++ b/main.c
@@ -277,15 +277,16 @@ main(int argc, char *argv[]) {
 			switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
 			case -1:
 				strncpy(stext, strerror(errno), sizeof stext - 1);
+				stext[sizeof stext - 1] = '\0';
 				readin = False;
 				break;
 			case 0:
-				strncpy(stext, "EOF", sizeof stext);
+				strncpy(stext, "EOF", 4);
 				readin = False;
 				break;
 			default:
-				stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
-				for(p = stext + strlen(stext) - 1; p > stext && *p != '\n'; --p);
+				for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
+				for(p = stext + strlen(stext) - 1; p >= stext && *p != '\n'; --p);
 				if(p > stext)
 					strncpy(stext, p + 1, sizeof stext);
 			}