X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=b39a8b0199f0fbe66f95c12a34c5c6b05b5d23d7;hp=90dc432b8829426cd9d4ce081e4f8e20a5fb194e;hb=e8ca7526ddebc98f3023736f77fa13b65034767b;hpb=2f07d34b5d4c37606be5849b6ee51e0443707898

diff --git a/client.c b/client.c
index 90dc432b..b39a8b01 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -114,7 +114,6 @@ static int execute_client_command(const char *cmd, char **result)
 	schedule(&command_sched);
 	*result = exec_task.result_buf;
 	btr_remove_node(&exec_task.btrn);
-	client_disconnect(ct);
 	ret = 1;
 out:
 	btr_remove_node(&exec_task.btrn);
@@ -444,17 +443,14 @@ static int client_i9e_line_handler(char *line)
 {
 	int ret;
 
-	client_disconnect(ct);
-	if (!line || !*line)
-		return 0;
-	PARA_DEBUG_LOG("line handler: %s\n", line);
+	PARA_DEBUG_LOG("line: %s\n", line);
 	ret = make_client_argv(line);
-	if (ret < 0)
+	if (ret <= 0)
 		return ret;
 	ret = client_connect(ct, &sched, NULL, NULL);
 	if (ret < 0)
 		return ret;
-	i9e_attach_to_stdout(ct->btrn);
+	i9e_attach_to_stdout(ct->btrn[0]);
 	return 1;
 }
 
@@ -477,7 +473,7 @@ __noreturn static void interactive_session(void)
 		.completers = completers,
 	};
 
-	PARA_NOTICE_LOG("\n%s\n", VERSION_TEXT("client"));
+	PARA_NOTICE_LOG("\n%s\n", version_text("client"));
 	if (ct->conf.history_file_given)
 		history_file = para_strdup(ct->conf.history_file_arg);
 	else {
@@ -530,26 +526,37 @@ __noreturn static void print_completions(void)
 
 #endif /* HAVE_READLINE */
 
-static int supervisor_post_select(struct sched *s, __a_unused struct task *t)
+struct supervisor_task {
+	bool stdout_task_started;
+	struct task task;
+};
+
+static int supervisor_post_select(struct sched *s, struct task *t)
 {
+	struct supervisor_task *svt = container_of(t, struct supervisor_task,
+		task);
+
 	if (ct->task.error < 0)
 		return ct->task.error;
+	if (!svt->stdout_task_started && ct->status == CL_EXECUTING) {
+		stdout_set_defaults(&sot);
+		register_task(s, &sot.task);
+		svt->stdout_task_started = true;
+		return 1;
+	}
 	if (ct->status == CL_SENDING) {
 		stdin_set_defaults(&sit);
 		register_task(s, &sit.task);
 		return -E_TASK_STARTED;
 	}
-	if (ct->status == CL_RECEIVING) {
-		stdout_set_defaults(&sot);
-		register_task(s, &sot.task);
-		return -E_TASK_STARTED;
-	}
 	return 0;
 }
 
-static struct task svt = {
-	.post_select = supervisor_post_select,
-	.status = "supervisor task"
+static struct supervisor_task supervisor_task = {
+	.task = {
+		.post_select = supervisor_post_select,
+		.status = "supervisor task"
+	}
 };
 
 /**
@@ -597,8 +604,8 @@ int main(int argc, char *argv[])
 	if (ret < 0)
 		goto out;
 	sot.btrn = btr_new_node(&(struct btr_node_description)
-		EMBRACE(.name = "stdout", .parent = ct->btrn));
-	register_task(&sched, &svt);
+		EMBRACE(.name = "stdout", .parent = ct->btrn[0]));
+	register_task(&sched, &supervisor_task.task);
 	ret = schedule(&sched);
 	if (ret >= 0 && ct->task.error < 0) {
 		switch(ct->task.error) {