about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@gmail.com>2007-11-02 16:57:52 +0100
committerAnselm R. Garbe <garbeam@gmail.com>2007-11-02 16:57:52 +0100
commitb8985dc7bb8ef309a66edea541f8e4b8bc5d6381 (patch)
tree9715d3049f0bed9d3992771da71cbee0e76fe916
parent6f60b2e1cd74c881688617082dc292b5c89da1a1 (diff)
downloaddwm-b8985dc7bb8ef309a66edea541f8e4b8bc5d6381.tar.gz
replaced low-level stext reading with an fgets call
-rw-r--r--dwm.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/dwm.c b/dwm.c
index 257edcc..77727a8 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1280,15 +1280,15 @@ restack(void) {
 
 void
 run(void) {
-	char *p;
-	int r, xfd;
 	fd_set rd;
+	int xfd;
 	XEvent ev;
 
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
 	xfd = ConnectionNumber(dpy);
 	readin = True;
+	stext[sizeof stext - 1] = '\0'; /* 0-terminator is never touched */
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)
@@ -1300,22 +1300,10 @@ run(void) {
 			eprint("select failed\n");
 		}
 		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-			case -1:
+			if(stext == fgets(stext, sizeof stext - 1, stdin))
+				stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */
+			else
 				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();
 		}
 		while(XPending(dpy)) {
>187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310
'alt'>
a8007cc4 ^



1
2
3
4
5
6
7
8
9
10