X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=f72719f27df46b012165a9e8c8bde3586d602a95;hp=c45826ab645741755e4ab836edc7f26bcd1bf442;hb=HEAD;hpb=53af5c6efb309565990203fd8504a812ec9166c9

diff --git a/client.c b/client.c
index c45826ab..84b7580c 100644
--- a/client.c
+++ b/client.c
@@ -42,7 +42,7 @@ struct exec_task {
 	size_t result_size;
 };
 
-static void exec_pre_select(struct sched *s, void *context)
+static void exec_pre_monitor(struct sched *s, void *context)
 {
 	struct exec_task *et = context;
 	int ret = btr_node_status(et->btrn, 0, BTR_NT_LEAF);
@@ -51,7 +51,7 @@ static void exec_pre_select(struct sched *s, void *context)
 		sched_min_delay(s);
 }
 
-static int exec_post_select(__a_unused struct sched *s, void *context)
+static int exec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct exec_task *et = context;
 	struct btr_node *btrn = et->btrn;
@@ -100,7 +100,7 @@ static int create_merged_lpr(const char *line)
 	/*
 	 * The original lpr for the interactive session has no non-option
 	 * arguments. We create a fresh lpr from the words in "line" and merge
-	 * it with the orignal lpr.
+	 * it with the original lpr.
 	 */
 	ret = lls(lls_parse(argc, argv, cmd, &argv_lpr, &errctx));
 	free_argv(argv);
@@ -123,7 +123,7 @@ fail:
 static int execute_client_command(const char *cmd, char **result)
 {
 	int ret;
-	struct sched command_sched = {.default_timeout = {.tv_sec = 1}};
+	struct sched command_sched = {.default_timeout = 1000};
 	struct exec_task exec_task = {
 		.result_buf = para_strdup(""),
 		.result_size = 1,
@@ -138,8 +138,8 @@ static int execute_client_command(const char *cmd, char **result)
 		EMBRACE(.name = "exec_collect"));
 	exec_task.task = task_register(&(struct task_info) {
 		.name = "client exec",
-		.pre_select = exec_pre_select,
-		.post_select = exec_post_select,
+		.pre_monitor = exec_pre_monitor,
+		.post_monitor = exec_post_monitor,
 		.context = &exec_task,
 	}, &command_sched);
 	ret = client_connect(ct, &command_sched, NULL, exec_task.btrn);
@@ -243,14 +243,25 @@ I9E_DUMMY_COMPLETER(term);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);
-I9E_DUMMY_COMPLETER(tasks);
 
 static struct i9e_completer completers[];
 
+static void ll_completer(struct i9e_completion_info *ci,
+		struct i9e_completion_result *cr)
+{
+	i9e_ll_completer(ci, cr);
+}
+
 static void help_completer(struct i9e_completion_info *ci,
-		struct i9e_completion_result *result)
+		struct i9e_completion_result *cr)
 {
-	result->matches = i9e_complete_commands(ci->word, completers);
+	char *opts[] = {LSG_SERVER_CMD_HELP_OPTS, NULL};
+
+	if (ci->word[0] == '-') {
+		i9e_complete_option(opts, ci, cr);
+		return;
+	}
+	cr->matches = i9e_complete_commands(ci->word, completers);
 }
 
 static void stat_completer(struct i9e_completion_info *ci,
@@ -336,7 +347,7 @@ static void setatt_completer(struct i9e_completion_info *ci,
 	if (ret < 0)
 		goto out;
 	num_atts = ret;
-	sl = para_realloc(sl, (2 * num_atts + 1) * sizeof(char *));
+	sl = arr_realloc(sl, 2 * num_atts + 1, sizeof(char *));
 	for (i = 0; i < num_atts; i++) {
 		char *orig = sl[i];
 		sl[i] = make_message("%s+", orig);
@@ -430,7 +441,7 @@ static void select_completer(struct i9e_completion_info *ci,
 		goto free_moods;
 	num_pl = ret;
 	n = num_moods + num_pl;
-	mops = para_malloc((n + 1) * sizeof(char *));
+	mops = arr_alloc(n + 1, sizeof(char *));
 	for (i = 0; i < num_moods; i++)
 		mops[i] = make_message("m/%s", moods[i]);
 	for (i = 0; i < num_pl; i++)
@@ -527,7 +538,7 @@ __noreturn static void interactive_session(void)
 	sigemptyset(&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGINT, &act, NULL);
-	sched.select_function = i9e_select;
+	sched.poll_function = i9e_poll;
 
 	ret = i9e_open(&ici, &sched);
 	if (ret < 0)
@@ -573,7 +584,7 @@ struct supervisor_task {
 	struct task *task;
 };
 
-static int supervisor_post_select(struct sched *s, void *context)
+static int supervisor_post_monitor(struct sched *s, void *context)
 {
 	struct supervisor_task *svt = context;
 	int ret = task_status(ct->task);
@@ -619,7 +630,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	crypt_init();
-	sched.default_timeout.tv_sec = 1;
+	sched.default_timeout = 1000;
 
 	ret = client_parse_config(argc, argv, &ct, &client_loglevel);
 	if (ret < 0)
@@ -643,7 +654,7 @@ int main(int argc, char *argv[])
 		EMBRACE(.name = "stdout", .parent = ct->btrn[0]));
 	supervisor_task.task = task_register(&(struct task_info) {
 		.name = "supervisor",
-		.post_select = supervisor_post_select,
+		.post_monitor = supervisor_post_monitor,
 		.context = &supervisor_task,
 	}, &sched);
 
@@ -655,8 +666,6 @@ int main(int argc, char *argv[])
 			/* 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;