X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fread_write_all%2Ftest%2Frun-read_all.c;h=b8f978ff2b9af246e777bfb3406813234c420c4c;hp=5fa0ec392920d119af1b2d963238cf4b188ea109;hb=6b3c079f3135b8276659e788da80b17ebd82ad59;hpb=36b64ac075afbccbc42937f58b3aa9ce5901ebf5

diff --git a/ccan/read_write_all/test/run-read_all.c b/ccan/read_write_all/test/run-read_all.c
index 5fa0ec39..b8f978ff 100644
--- a/ccan/read_write_all/test/run-read_all.c
+++ b/ccan/read_write_all/test/run-read_all.c
@@ -1,8 +1,8 @@
 /* FIXME: Do something tricky to ensure we really do loop in read_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>
@@ -26,11 +26,12 @@ static void got_signal(int sig)
 
 int main(int argc, char *argv[])
 {
-	char buffer[BUFSZ*2] = { 0 };
+	char *buffer;
 	char c = 0;
 	int status;
 	pid_t child;
 
+	buffer = calloc(BUFSZ, 2);
 	plan_tests(6);
 
 	/* We fork and torture parent. */
@@ -44,7 +45,7 @@ int main(int argc, char *argv[])
 		/* Child.  Make sure parent ready, then write in two parts. */
 		if (read(p2c[0], &c, 1) != 1)
 			exit(1);
-		memset(buffer, 0xff, sizeof(buffer));
+		memset(buffer, 0xff, BUFSZ*2);
 		if (!write_all(c2p[1], buffer, BUFSZ))
 			exit(2);
 		if (kill(getppid(), SIGUSR1) != 0)
@@ -63,8 +64,8 @@ int main(int argc, char *argv[])
 	close(c2p[1]);
 	signal(SIGUSR1, got_signal);
 	ok1(write(p2c[1], &c, 1) == 1);
-	ok1(read_all(c2p[0], buffer, sizeof(buffer)));
-	ok1(memchr(buffer, 0, sizeof(buffer)) == NULL);
+	ok1(read_all(c2p[0], buffer, BUFSZ*2));
+	ok1(memchr(buffer, 0, BUFSZ*2) == NULL);
 	ok1(sigcount == 1);
 	ok1(wait(&status) == child);
 	ok(WIFEXITED(status) && WEXITSTATUS(status) == 0,