X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=f89025729ed0dda37158601b8f265acb74db6a15;hp=d98c6327c9163d7018f0d94c1c612680205244d7;hb=1157d98d10d047c3fd8d2361e05650398ae11f59;hpb=76d5277a9d0ca3db58abc667de36e753ff91dfa9

diff --git a/client.c b/client.c
index d98c6327..f8902572 100644
--- a/client.c
+++ b/client.c
@@ -114,11 +114,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;
@@ -603,14 +603,23 @@ int main(int argc, char *argv[])
 		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;
 }