X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=12812c9f79ecd0a4b5b88707c88572f709ea3fdd;hp=d2f4643372200465b0a576184b9fefe00761f01c;hb=a7d844e5f23805a7521cfd8bf573dd822351c895;hpb=27638103f249ffbe9768603b9baff199950fd9f6

diff --git a/client.c b/client.c
index d2f46433..12812c9f 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * 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
@@ -34,20 +34,8 @@ 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)
 {
@@ -59,7 +47,7 @@ static void client_event_handler(struct task *t)
 		p->eof = 1;
 		return;
 	}
-	if (p->status == CL_SENDING_STDIN) {
+	if (p->status == CL_SENDING) {
 		stdin_set_defaults(&sit);
 		sit.buf = para_malloc(sit.bufsize),
 		register_task(&sit.task);
@@ -86,17 +74,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:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	client_close(pcd);
 	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }