From: Manuel Novoa III  <mjn3@codepoet.org>
Date: Wed, 26 May 2004 15:21:19 +0000 (-0000)
Subject: If read were to return with an error, bad things would happen.  Fix it.
X-Git-Tag: 1_00_rc1~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d709743b09a456f4550ad0b06dca89dc41a19e60;p=oweals%2Fbusybox.git

If read were to return with an error, bad things would happen.  Fix it.
Also, make sure read errors are reflected in the applet exit code.
---

diff --git a/coreutils/tee.c b/coreutils/tee.c
index 6ec1d6dff..ba2e10f90 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -38,7 +38,7 @@ int tee_main(int argc, char **argv)
 	int flags;
 	int retval = EXIT_SUCCESS;
 #ifdef CONFIG_FEATURE_TEE_USE_BLOCK_IO
-	size_t c;
+	ssize_t c;
 	RESERVE_CONFIG_BUFFER(buf, BUFSIZ);
 #else
 	int c;
@@ -78,12 +78,16 @@ int tee_main(int argc, char **argv)
 	*p = NULL;				/* Store the sentinal value. */
 
 #ifdef CONFIG_FEATURE_TEE_USE_BLOCK_IO
-	while ((c = read(STDIN_FILENO, buf, BUFSIZ)) != 0) {
+	while ((c = safe_read(STDIN_FILENO, buf, BUFSIZ)) > 0) {
 		for (p=files ; *p ; p++) {
 			fwrite(buf, 1, c, *p);
 		}
 	}
 
+	if (c < 0) {			/* Make sure read errors are signaled. */
+		retval = EXIT_FAILURE;
+	}
+
 #ifdef CONFIG_FEATURE_CLEAN_UP
 	RELEASE_CONFIG_BUFFER(buf);
 #endif