X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=6ea5e7e1b1d2601cb84c3c532fab85cd6f32481b;hp=cf115e03c7ef639ace1f1de12c5387e1968d4058;hb=8fa697a6fc4430625cfd66fdce6e36bd8aec739b;hpb=1023721b3a7bf7f642b3e4d034c2314a3dc7becb

diff --git a/client.c b/client.c
index cf115e03..6ea5e7e1 100644
--- a/client.c
+++ b/client.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file client.c the client program used to connect to para_server */
 
+#include <regex.h>
+#include <openssl/rc4.h>
+#include <stdbool.h>
+
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "crypt.h"
 #include "client.cmdline.h"
 #include "string.h"
 #include "stdin.h"
@@ -40,7 +45,7 @@ static void supervisor_post_select(__a_unused struct sched *s, struct task *t)
 	}
 	if (ct->status == CL_RECEIVING) {
 		stdout_set_defaults(&sot);
-		sot.buf = ct->buf;
+		sot.bufp = &ct->buf;
 		sot.loaded = &ct->loaded;
 		sot.input_error = &ct->task.error;
 		register_task(&sot.task);
@@ -54,7 +59,8 @@ static struct task svt = {
 	.status = "supervisor task"
 };
 
-INIT_STDERR_LOGGING(ct->conf.loglevel_arg);
+static int client_loglevel; /* loglevel */
+INIT_STDERR_LOGGING(client_loglevel);
 
 
 /**
@@ -64,12 +70,16 @@ INIT_STDERR_LOGGING(ct->conf.loglevel_arg);
  * \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[])
 {
@@ -77,10 +87,11 @@ int main(int argc, char *argv[])
 	int ret;
 	static struct sched s;
 
+	init_random_seed_or_die();
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = client_open(argc, argv, &ct);
-	if (ret < 0) /* can not use PARA_LOG here */
+	ret = client_open(argc, argv, &ct, &client_loglevel);
+	if (ret < 0) /* can not use PARA_LOG here because ct is NULL */
 		exit(EXIT_FAILURE);
 	register_task(&svt);
 	ret = schedule(&s);