X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=349f970d961b52f78ad6d67ddf673a2fbb7b0d97;hp=873edc163b3e5f5164307d647724cf6655ec0d5f;hb=aa9d24a6608f02455eefd1440cad28c7e86913fa;hpb=1e97f6746b605e37826fb6ee2ad35b7b330145d6

diff --git a/client.c b/client.c
index 873edc16..349f970d 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,7 +443,6 @@ static int client_i9e_line_handler(char *line)
 {
 	int ret;
 
-	client_disconnect(ct);
 	PARA_DEBUG_LOG("line: %s\n", line);
 	ret = make_client_argv(line);
 	if (ret <= 0)
@@ -497,6 +495,7 @@ __noreturn static void interactive_session(void)
 		goto out;
 	para_log = i9e_log;
 	ret = schedule(&sched);
+	sched_shutdown(&sched);
 	i9e_close();
 	para_log = stderr_log;
 out:
@@ -541,14 +540,12 @@ static int supervisor_post_select(struct sched *s, struct task *t)
 	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);
+		stdout_task_register(&sot, s);
 		svt->stdout_task_started = true;
 		return 1;
 	}
 	if (ct->status == CL_SENDING) {
-		stdin_set_defaults(&sit);
-		register_task(s, &sit.task);
+		stdin_task_register(&sit, s);
 		return -E_TASK_STARTED;
 	}
 	return 0;
@@ -621,6 +618,7 @@ int main(int argc, char *argv[])
 		default: ret = -E_SERVER_CMD_FAILURE;
 		}
 	}
+	sched_shutdown(&sched);
 out:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));