X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=client.c;h=56e7cc5c538939323cec4ba4b4ff62df018538d1;hb=e58586b7395a84e5883b077d89b92c8ac649a1f2;hp=c1ef5217345eb96720e7ce81e495e681f6d774f2;hpb=72e9bdf7c5c09ca4c20cad56c68a9a155cceff43;p=paraslash.git

diff --git a/client.c b/client.c
index c1ef5217..56e7cc5c 100644
--- a/client.c
+++ b/client.c
@@ -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)
@@ -541,14 +539,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 +617,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));