X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=f3bb92f8e1db84c425c558cd5fa3dd8fcf38a6db;hp=88b1e93a024f7028709614be0b2e763d1091697d;hb=6bcdcffef00ff117eecf1b5447b9e849698d02e5;hpb=0b43ec5dfd9e301257e3c0b31733ea67c1db4426

diff --git a/client.c b/client.c
index 88b1e93a..f3bb92f8 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,8 +35,8 @@ __printf_2_3 void (*para_log)(int, const char*, ...) = stderr_log;
 
 #ifdef HAVE_READLINE
 #include "interactive.h"
-#include "server_completion.h"
-#include "afs_completion.h"
+#include "server.completion.h"
+#include "afs.completion.h"
 
 struct exec_task {
 	struct task *task;
@@ -45,18 +45,18 @@ struct exec_task {
 	size_t result_size;
 };
 
-static void exec_pre_select(struct sched *s, struct task *t)
+static void exec_pre_select(struct sched *s, void *context)
 {
-	struct exec_task *et = task_context(t);
+	struct exec_task *et = context;
 	int ret = btr_node_status(et->btrn, 0, BTR_NT_LEAF);
 
 	if (ret != 0)
 		sched_min_delay(s);
 }
 
-static int exec_post_select(__a_unused struct sched *s, struct task *t)
+static int exec_post_select(__a_unused struct sched *s, void *context)
 {
-	struct exec_task *et = task_context(t);
+	struct exec_task *et = context;
 	struct btr_node *btrn = et->btrn;
 	char *buf;
 	size_t sz;
@@ -208,6 +208,7 @@ I9E_DUMMY_COMPLETER(version);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);
+I9E_DUMMY_COMPLETER(tasks);
 
 static struct i9e_completer completers[];
 
@@ -533,12 +534,13 @@ struct supervisor_task {
 	struct task *task;
 };
 
-static int supervisor_post_select(struct sched *s, struct task *t)
+static int supervisor_post_select(struct sched *s, void *context)
 {
-	struct supervisor_task *svt = task_context(t);
+	struct supervisor_task *svt = context;
+	int ret = task_status(ct->task);
 
-	if (ct->task->error < 0)
-		return ct->task->error;
+	if (ret < 0)
+		return ret;
 	if (!svt->stdout_task_started && ct->status == CL_EXECUTING) {
 		stdout_task_register(&sot, s);
 		svt->stdout_task_started = true;
@@ -606,16 +608,19 @@ int main(int argc, char *argv[])
 	}, &sched);
 
 	ret = schedule(&sched);
-	if (ret >= 0 && ct->task->error < 0) {
-		switch (ct->task->error) {
-		/* these are not errors */
-		case -E_SERVER_CMD_SUCCESS:
-		case -E_EOF:
-		case -E_SERVER_EOF:
-		case -E_BTR_EOF:
-			ret = 0;
-			break;
-		default: ret = -E_SERVER_CMD_FAILURE;
+	if (ret >= 0) {
+		ret = task_status(ct->task);
+		if (ret < 0) {
+			switch (ret) {
+			/* these are not errors */
+			case -E_SERVER_CMD_SUCCESS:
+			case -E_EOF:
+			case -E_SERVER_EOF:
+			case -E_BTR_EOF:
+				ret = 0;
+				break;
+			default: ret = -E_SERVER_CMD_FAILURE;
+			}
 		}
 	}
 	sched_shutdown(&sched);