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

diff --git a/client.c b/client.c
index 88b1e93a..f1100df4 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.
  */
@@ -22,7 +22,8 @@
 #include "error.h"
 #include "version.h"
 
-INIT_CLIENT_ERRLISTS;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
 
 static struct sched sched;
 static struct client_task *ct;
@@ -35,8 +36,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 +46,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;
@@ -204,10 +205,10 @@ I9E_DUMMY_COMPLETER(pause);
 I9E_DUMMY_COMPLETER(play);
 I9E_DUMMY_COMPLETER(si);
 I9E_DUMMY_COMPLETER(term);
-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[];
 
@@ -217,6 +218,13 @@ static void help_completer(struct i9e_completion_info *ci,
 	result->matches = i9e_complete_commands(ci->word, completers);
 }
 
+static void version_completer(struct i9e_completion_info *ci,
+		struct i9e_completion_result *cr)
+{
+	char *opts[] = {"-v", NULL};
+	i9e_complete_option(opts, ci, cr);
+}
+
 static void stat_completer(struct i9e_completion_info *ci,
 		struct i9e_completion_result *cr)
 {
@@ -269,9 +277,9 @@ static void ls_completer(struct i9e_completion_info *ci,
 		struct i9e_completion_result *cr)
 {
 	char *opts[] = {
-		"--", "-l", "-ls", "-ll", "-lv", "-lp", "-lm", "-lc", "-p",
-		"-a", "-r", "-d", "-sp", "-sl", "-ss", "-sn", "-sf", "-sc",
-		"-si", "-sy", "-sb", "-sd", "-sa", NULL
+		"--", "-l", "-l=s", "-l=l", "-l=v", "-l=p", "-l=m", "-l=c",
+		"-p", "-a", "-r", "-d", "-s=p", "-s=l", "-s=s", "-s=n", "-s=f",
+		"-s=c", "-s=i", "-s=y", "-s=b", "-s=d", "-s=a", "-F", "-b", NULL
 	};
 	if (ci->word[0] == '-')
 		i9e_complete_option(opts, ci, cr);
@@ -316,11 +324,7 @@ static void lsatt_completer(struct i9e_completion_info *ci,
 		struct i9e_completion_result *cr)
 {
 	char *opts[] = {"-i", "-l", "-r", NULL};
-
-	if (ci->word[0] == '-')
-		i9e_complete_option(opts, ci, cr);
-	else
-		complete_attributes(ci->word, &cr->matches);
+	i9e_complete_option(opts, ci, cr);
 }
 
 static void mvatt_completer(struct i9e_completion_info *ci,
@@ -533,12 +537,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 +611,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);