X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fread_write_all%2Ftest%2Frun-write_all.c;h=5b310688aea6283ec178515c92ed81d2e4474a18;hp=fbfa1f99aebcbca18b37fe580fa05b3a388ff432;hb=8201ff8eec2f44e9612fea3ec280c8bd10b7300c;hpb=75e8c217ba64a66ac94719c597e6cf81a5625cc8;ds=sidebyside

diff --git a/ccan/read_write_all/test/run-write_all.c b/ccan/read_write_all/test/run-write_all.c
index fbfa1f99..5b310688 100644
--- a/ccan/read_write_all/test/run-write_all.c
+++ b/ccan/read_write_all/test/run-write_all.c
@@ -1,8 +1,8 @@
 /* FIXME: Do something tricky to ensure we really do loop in write_all. */
 
-#include "read_write_all/read_write_all.h"
-#include "read_write_all/read_write_all.c"
-#include "tap/tap.h"
+#include <ccan/read_write_all/read_write_all.h>
+#include <ccan/read_write_all/read_write_all.c>
+#include <ccan/tap/tap.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -24,11 +24,12 @@ static void got_signal(int sig)
 
 int main(int argc, char *argv[])
 {
-	char buffer[BUFSZ*2] = { 0 };
+	char *buffer;
 	int p2c[2];
 	int status;
 	pid_t child;
 
+	buffer = calloc(BUFSZ, 1);
 	plan_tests(4);
 
 	/* We fork and torture parent. */
@@ -37,16 +38,17 @@ int main(int argc, char *argv[])
 	child = fork();
 
 	if (!child) {
+		close(p2c[1]);
 		/* Make sure they started writing. */
 		if (read(p2c[0], buffer, 1) != 1)
 			exit(1);
 		if (kill(getppid(), SIGUSR1) != 0)
 			exit(2);
-		if (!read_all(p2c[0], buffer+1, sizeof(buffer)-1))
+		if (!read_all(p2c[0], buffer+1, BUFSZ-1))
 			exit(3);
-		if (memchr(buffer, 0, sizeof(buffer))) {
-			fprintf(stderr, "buffer has 0 at offset %i\n",
-				memchr(buffer, 0, sizeof(buffer)) - (void *)buffer);
+		if (memchr(buffer, 0, BUFSZ)) {
+			fprintf(stderr, "buffer has 0 at offset %ti\n",
+				memchr(buffer, 0, BUFSZ) - (void *)buffer);
 			exit(4);
 		}
 		exit(0);
@@ -54,9 +56,10 @@ int main(int argc, char *argv[])
 	if (child == -1)
 		err(1, "forking");
 
-	memset(buffer, 0xff, sizeof(buffer));
+	close(p2c[0]);
+	memset(buffer, 0xff, BUFSZ);
 	signal(SIGUSR1, got_signal);
-	ok1(write_all(p2c[1], buffer, sizeof(buffer)));
+	ok1(write_all(p2c[1], buffer, BUFSZ));
 	ok1(sigcount == 1);
 	ok1(wait(&status) == child);
 	ok(WIFEXITED(status) && WEXITSTATUS(status) == 0,