X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=90dc432b8829426cd9d4ce081e4f8e20a5fb194e;hp=2242d40e3589fd7211eae249e04b53869c102fd7;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/client.c b/client.c
index 2242d40e..90dc432b 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -54,7 +54,7 @@ static void exec_pre_select(struct sched *s, struct task *t)
 		sched_min_delay(s);
 }
 
-static void exec_post_select(__a_unused struct sched *s, struct task *t)
+static int exec_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct exec_task *et = container_of(t, struct exec_task, task);
 	struct btr_node *btrn = et->btrn;
@@ -63,10 +63,8 @@ static void exec_post_select(__a_unused struct sched *s, struct task *t)
 	int ret;
 
 	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
-	if (ret <= 0) {
-		t->error = ret;
-		return;
-	}
+	if (ret <= 0)
+		return ret;
 	sz = btr_next_buffer(btrn, &buf);
 	if (sz <= 1)
 		goto out;
@@ -76,6 +74,7 @@ static void exec_post_select(__a_unused struct sched *s, struct task *t)
 	et->result_buf[et->result_size - 1] = '\0';
 out:
 	btr_consume(btrn, sz);
+	return 0;
 }
 
 static int make_client_argv(const char *line)
@@ -114,11 +113,11 @@ static int execute_client_command(const char *cmd, char **result)
 		goto out;
 	schedule(&command_sched);
 	*result = exec_task.result_buf;
-	btr_remove_node(exec_task.btrn);
+	btr_remove_node(&exec_task.btrn);
 	client_disconnect(ct);
 	ret = 1;
 out:
-	btr_free_node(exec_task.btrn);
+	btr_remove_node(&exec_task.btrn);
 	if (ret < 0)
 		free(exec_task.result_buf);
 	return ret;
@@ -307,7 +306,7 @@ static void setatt_completer(struct i9e_completion_info *ci,
 		free(orig);
 	}
 	sl[2 * num_atts] = NULL;
-	ret = i9e_extract_completions(ci->word, sl, &cr->matches);
+	i9e_extract_completions(ci->word, sl, &cr->matches);
 out:
 	free(buf);
 	free_argv(sl);
@@ -459,11 +458,6 @@ static int client_i9e_line_handler(char *line)
 	return 1;
 }
 
-static void client_sighandler(int s)
-{
-	i9e_signal_dispatch(s);
-}
-
 static struct i9e_completer completers[] = {
 	SERVER_COMPLETERS
 	AFS_COMPLETERS
@@ -494,7 +488,7 @@ __noreturn static void interactive_session(void)
 	}
 	ici.history_file = history_file;
 
-	act.sa_handler = client_sighandler;
+	act.sa_handler = i9e_signal_dispatch;
 	sigemptyset(&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGINT, &act, NULL);
@@ -536,23 +530,21 @@ __noreturn static void print_completions(void)
 
 #endif /* HAVE_READLINE */
 
-static void supervisor_post_select(struct sched *s, struct task *t)
+static int supervisor_post_select(struct sched *s, __a_unused struct task *t)
 {
-	if (ct->task.error < 0) {
-		t->error = ct->task.error;
-		return;
-	}
+	if (ct->task.error < 0)
+		return ct->task.error;
 	if (ct->status == CL_SENDING) {
 		stdin_set_defaults(&sit);
 		register_task(s, &sit.task);
-		t->error = -E_TASK_STARTED;
-		return;
+		return -E_TASK_STARTED;
 	}
 	if (ct->status == CL_RECEIVING) {
 		stdout_set_defaults(&sot);
 		register_task(s, &sot.task);
-		t->error = -E_TASK_STARTED; return;
+		return -E_TASK_STARTED;
 	}
+	return 0;
 }
 
 static struct task svt = {
@@ -601,21 +593,30 @@ int main(int argc, char *argv[])
 	 */
 	sit.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	ret = client_open(argc, argv, &ct, &client_loglevel, sit.btrn, NULL, &sched);
+	ret = client_connect(ct, &sched, sit.btrn, NULL);
 	if (ret < 0)
 		goto out;
 	sot.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdout", .parent = ct->btrn));
 	register_task(&sched, &svt);
 	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;
+		}
+	}
 out:
+	if (ret < 0)
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	client_close(ct);
-	btr_free_node(sit.btrn);
-	btr_free_node(sot.btrn);
-	if (ret < 0) {
-		/* can not use PARA_LOG here because ct is NULL */
-		fprintf(stderr, "%s\n", para_strerror(-ret));
-		return EXIT_FAILURE;
-	}
-	return EXIT_SUCCESS;
+	btr_remove_node(&sit.btrn);
+	btr_remove_node(&sot.btrn);
+	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }