X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=1506f656c28eeaabff0d8213c0b45e597bebeb2e;hp=be76a491b3e1db0ce15efd194611cde12f719ccf;hb=d2e164526bed7f523043b7e4ec5bd282d5bc6f19;hpb=b9f9601828dd1a103ec9315bd430d39b458d2b80

diff --git a/client.c b/client.c
index be76a491..1506f656 100644
--- a/client.c
+++ b/client.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-2007 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 */
@@ -63,8 +51,19 @@ static void client_event_handler(struct task *t)
 	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[])
 {
@@ -74,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);
-	if (ret < 0)
-		goto out;
-	ret = sched(&s);
-	client_close(pcd);
-out:
+	ret = schedule(&s);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	client_close(pcd);
 	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }