From 1427d5012a353bd6d3a5448089a7b195ff391c39 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 21 Oct 2006 06:56:51 +0000
Subject: r19436: fixed stderr in piped_child() as well (This used to be commit
 db000261f4fe22f7d1ea3dab53c2e214dcf08bfb)

---
 source4/torture/subunit.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/source4/torture/subunit.c b/source4/torture/subunit.c
index e417b45306..ce9bc66b9d 100644
--- a/source4/torture/subunit.c
+++ b/source4/torture/subunit.c
@@ -184,6 +184,7 @@ bool torture_subunit_run_suite(struct torture_context *context,
 	int status;
 	char buffer[4096];
 	size_t offset = 0;
+	
 
 	command[0] = talloc_strdup(context, suite->path);
 	command[1] = NULL;
@@ -192,8 +193,30 @@ bool torture_subunit_run_suite(struct torture_context *context,
 	if (pid == -1)
 		return false;
 
-	while ((size = read(fd_out, buffer+offset, sizeof(buffer-offset) > 0))) {
+	while (1) {
+		fd_set fds;
 		char *eol;
+
+		FD_ZERO(&fds);
+
+		FD_SET(fd_out, &fds);
+		FD_SET(fd_err, &fds);
+
+		if (select(MAX(fd_out,fd_err)+1, &fds, NULL, NULL, NULL) <= 0) break;
+
+		if (FD_ISSET(fd_err, &fds)) {
+			size = read(fd_err, buffer+offset, sizeof(buffer) - (offset+1));
+			if (size <= 0) break;
+			write(2, buffer+offset, size);
+			continue;
+		}
+
+		if (!FD_ISSET(fd_out, &fds)) continue;
+
+		size = read(fd_out, buffer+offset, sizeof(buffer) - (offset+1));
+
+		if (size <= 0) break;
+
 		buffer[offset+size] = '\0';
 
 		write(1, buffer+offset, size);
@@ -247,7 +270,7 @@ bool torture_subunit_run_suite(struct torture_context *context,
 				}
 			}
 		}
-
+		
 		offset += size-(p-buffer);
 		memcpy(buffer, p, offset);
 	}
-- 
cgit