X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=7f0e3211241a77dad0d6dbe5774f6671e49823f8;hp=8e3e021d90249f44a0c655c493eb1198ed9f71cf;hb=e009fa7ff09186e0ebd748661d46338b5eb8d016;hpb=b66dfd41e268e64b65d2990bdec3d3a7e119e234

diff --git a/client.c b/client.c
index 8e3e021d..7f0e3211 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)
@@ -96,7 +95,8 @@ static int execute_client_command(const char *cmd, char **result)
 	struct exec_task exec_task = {
 		.task = {
 			.pre_select = exec_pre_select,
-			.post_select = exec_post_select,
+			.new_post_select = exec_post_select,
+			.post_select = NULL,
 			.status = "client exec task",
 		},
 		.result_buf = para_strdup(""),
@@ -612,7 +612,7 @@ int main(int argc, char *argv[])
 		case -E_BTR_EOF:
 			ret = 0;
 			break;
-		default: ret = ct->task.error;
+		default: ret = -E_SERVER_CMD_FAILURE;
 		}
 	}
 out: