Commits

Anonymous committed 0609a2d

do the read without checking read length against buf length, that scared me

Comments (0)

Files changed (1)

 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 		if (FD_ISSET(mfd, &rd)) {
 			erase_usr();
-			do {
-				if ((rdlen = read(mfd, buf, sizeof(buf))) < 0)
-					warn("failed to read from master");
+			for (rdlen = read(mfd, buf, sizeof(buf)); rdlen > 0; rdlen = read(mfd, buf, sizeof(buf)))
 				my_write(STDOUT, buf, rdlen);
-			} while (rdlen == sizeof(buf) - 1);
+			if (rdlen < 0)
+				warn("failed to read from fd %d", mfd);
 			print_usr();
 		}
 	}