X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=fec88a6f3f459b1f84f12790481c7a4411ae80de;hp=88ea5af2ca737f2cead9c96fc8c0ec28b523c1da;hb=94fa6ad6ec3068227d322cb83186ff8780100107;hpb=861631dded9580da5f1a840bfdf0153f9bc60d0c

diff --git a/client.c b/client.c
index 88ea5af2..fec88a6f 100644
--- a/client.c
+++ b/client.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file client.c the client program used to connect to para_server */
@@ -34,29 +22,17 @@ static struct private_client_data *pcd;
 static struct stdin_task sit;
 static struct stdout_task sot;
 
-/*
- * client log function
- */
-void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
 
-	/* ignore log message if loglevel is not high enough */
-	if (pcd && ll < pcd->conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
+INIT_STDERR_LOGGING(pcd->conf.loglevel_arg);
 
 static void client_event_handler(struct task *t)
 {
 	struct private_client_data *p = t->private_data;
 
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
 	if (t->ret != -E_HANDSHAKE_COMPLETE) {
 		unregister_task(t);
-		p->eof = 1;
+		p->error = t->ret;
 		return;
 	}
 	if (p->status == CL_SENDING) {
@@ -65,18 +41,29 @@ static void client_event_handler(struct task *t)
 		register_task(&sit.task);
 		p->inbuf = sit.buf;
 		p->in_loaded = &sit.loaded;
-		p->in_eof = &sit.eof;
+		p->in_error = &sit.error;
 		return;
 	}
 	stdout_set_defaults(&sot);
 	sot.buf = p->buf;
 	sot.loaded = &p->loaded;
-	sot.input_eof = &p->eof;
+	sot.input_error = &p->error;
 	register_task(&sot.task);
 }
 
-/*
- * MAIN
+/**
+ * the client program to connect to para_server
+ *
+ * \param argc usual argument count
+ * \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.
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
+ * \sa client_open(), stdout.c, stdout.h, para_client(1), para_server(1)
  */
 int main(int argc, char *argv[])
 {
@@ -86,17 +73,13 @@ int main(int argc, char *argv[])
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = client_parse_config(argc, argv, &pcd);
-	if (ret < 0)
-		goto out;
+	ret = client_open(argc, argv, &pcd);
+	if (ret < 0) /* can not use PARA_LOG here */
+		exit(EXIT_FAILURE);
 	pcd->task.event_handler = client_event_handler;
-	ret = client_open(pcd);
+	ret = schedule(&s);
 	if (ret < 0)
-		goto out;
-	ret = sched(&s);
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	client_close(pcd);
-out:
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }