Mercurial > dwm-meillo

changeset 580:e9001b0f53bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied Jukka's stdinread patch
author arg@mig29
date Sun, 26 Nov 2006 13:31:36 +0100 (2006-11-26)
parents 010118c94013
children 601842ee4484
files main.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main.c	Sat Nov 25 19:26:31 2006 +0100
+++ b/main.c	Sun Nov 26 13:31:36 2006 +0100
@@ -274,9 +274,10 @@
 				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 @@
 				readin = False;
 				break;
 			default:
-				stext[r-1] = 0;
+				stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
 			}
 			drawstatus();
 		}