X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Fexternal-transaction.c;h=c03dbc49f6320afd386a5e9f89a2bad936034cf8;hp=c1442c215d6b0af3da35e4dff499c9b1c72cf6ae;hb=85a33135890965218010b79c89e4d3f4905727e3;hpb=f83c45bf4ccd00d81498c30cf7455a9813cf104b

diff --git a/ccan/tdb/test/external-transaction.c b/ccan/tdb/test/external-transaction.c
index c1442c21..c03dbc49 100644
--- a/ccan/tdb/test/external-transaction.c
+++ b/ccan/tdb/test/external-transaction.c
@@ -51,9 +51,12 @@ maybe_alarmed:
 	return -3;
 }
 
+struct agent {
+	int cmdfd, responsefd;
+};
 
-/* Do this before doing any tdb stuff.  Return handle, or -1. */
-int prepare_external_agent(void)
+/* Do this before doing any tdb stuff.  Return handle, or NULL. */
+struct agent *prepare_external_agent(void)
 {
 	int pid;
 	int command[2], response[2];
@@ -61,18 +64,20 @@ int prepare_external_agent(void)
 	char name[PATH_MAX];
 
 	if (pipe(command) != 0 || pipe(response) != 0)
-		return -1;
+		return NULL;
 
 	pid = fork();
 	if (pid < 0)
-		return -1;
+		return NULL;
 
 	if (pid != 0) {
+		struct agent *agent = malloc(sizeof(*agent));
+
 		close(command[0]);
 		close(response[1]);
-		/* FIXME: Make fds consective. */
-		dup2(command[1]+1, response[1]);
-		return command[1];
+		agent->cmdfd = command[1];
+		agent->responsefd = response[0];
+		return agent;
 	}
 
 	close(command[1]);
@@ -89,15 +94,15 @@ int prepare_external_agent(void)
 }
 
 /* Ask the external agent to try to do a transaction. */
-bool external_agent_transaction(int handle, const char *tdbname)
+bool external_agent_transaction(struct agent *agent, const char *tdbname)
 {
 	int res;
 
-	if (write(handle, tdbname, strlen(tdbname)+1)
+	if (write(agent->cmdfd, tdbname, strlen(tdbname)+1)
 	    != strlen(tdbname)+1)
 		err(1, "Writing to agent");
 
-	if (read(handle+1, &res, sizeof(res)) != sizeof(res))
+	if (read(agent->responsefd, &res, sizeof(res)) != sizeof(res))
 		err(1, "Reading from agent");
 
 	if (res > 1)