X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=ec32cd414e31df10dd5c7dbecbdef60c5134a5a2;hp=ebe33898bc0154665f7ae037e0102f163903b4ba;hb=a22e734cd89015a71d0dd7cf895799c440805847;hpb=7205bdd68b0ad3c50bbe7b5e01eb62be97aab5c8

diff --git a/client.c b/client.c
index ebe33898..ec32cd41 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,6 +8,7 @@
 
 #include <regex.h>
 #include <openssl/rc4.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -18,6 +19,7 @@
 #include "stdin.h"
 #include "stdout.h"
 #include "client.h"
+#include "buffer_tree.h"
 #include "error.h"
 
 INIT_CLIENT_ERRLISTS;
@@ -34,19 +36,12 @@ static void supervisor_post_select(__a_unused struct sched *s, struct task *t)
 	}
 	if (ct->status == CL_SENDING) {
 		stdin_set_defaults(&sit);
-		sit.buf = para_malloc(sit.bufsize),
 		register_task(&sit.task);
-		ct->inbuf = sit.buf;
-		ct->in_loaded = &sit.loaded;
-		ct->in_error = &sit.task.error;
 		t->error = -E_TASK_STARTED;
 		return;
 	}
 	if (ct->status == CL_RECEIVING) {
 		stdout_set_defaults(&sot);
-		sot.bufp = &ct->buf;
-		sot.loaded = &ct->loaded;
-		sot.input_error = &ct->task.error;
 		register_task(&sot.task);
 		t->error = -E_TASK_STARTED;
 		return;
@@ -58,10 +53,9 @@ static struct task svt = {
 	.status = "supervisor task"
 };
 
-static int client_loglevel; /* loglevel */
+static int client_loglevel = LL_ERROR; /* loglevel */
 INIT_STDERR_LOGGING(client_loglevel);
 
-
 /**
  * The client program to connect to para_server.
  *
@@ -69,12 +63,16 @@ INIT_STDERR_LOGGING(client_loglevel);
  * \param argv Usual argument vector.
  *
  * It registers two tasks: The client task that communicates with para_server
- * and the standard out task that writes any output produced by the client task
- * to standard out.
+ * and the supervisor task that minitors whether the client task intends to
+ * read from stdin or write to stdout.
+ *
+ * Once it has been determined whether the client command corresponds to a
+ * stdin command (addmood, addimg, ..), either the stdin task or the stdout
+ * task is set up to replace the supervisor task.
  *
  * \return EXIT_SUCCESS or EXIT_FAILURE
  *
- * \sa client_open(), stdout.c, stdout.h, para_client(1), para_server(1)
+ * \sa client_open(), stdin.c, stdout.c, para_client(1), para_server(1)
  */
 int main(int argc, char *argv[])
 {
@@ -85,13 +83,28 @@ int main(int argc, char *argv[])
 	init_random_seed_or_die();
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = client_open(argc, argv, &ct, &client_loglevel);
-	if (ret < 0) /* can not use PARA_LOG here because ct is NULL */
-		exit(EXIT_FAILURE);
+	/*
+	 * We add buffer tree nodes for stdin and stdout even though
+	 * only one of them will be needed. This simplifies the code
+	 * a bit wrt. to the buffer tree setup.
+	 */
+	sit.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stdin"));
+	ret = client_open(argc, argv, &ct, &client_loglevel, 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(&svt);
 	ret = schedule(&s);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+out:
 	client_close(ct);
-	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
+	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;
 }