COPYING: replace the short GPL text by the full version 2 license

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index 69e0f3d3bf9c7382c3b78c012d5c1bfcd0fb6c7c..9565102709f53446e7ebf5e978fd9bae733f4dc0 100644 (file)
--- 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
  *
  *     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;
 
 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)
 {
 
 static void client_event_handler(struct task *t)
 {


@@ -59,7 +47,7 @@ static void client_event_handler(struct task *t)
                p->eof = 1;
                return;
        }
                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);
                stdin_set_defaults(&sit);
                sit.buf = para_malloc(sit.bufsize),
                register_task(&sit.task);


@@ -75,8 +63,19 @@ static void client_event_handler(struct task *t)
        register_task(&sot.task);
 }
 
        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[])
 {
  */
 int main(int argc, char *argv[])
 {


@@ -86,17 +85,13 @@ int main(int argc, char *argv[])
 
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
 
        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;
        pcd->task.event_handler = client_event_handler;

-       ret = client_open(pcd);
-       if (ret < 0)
-               goto out;

        ret = sched(&s);
        ret = sched(&s);

-       client_close(pcd);
-out:

        if (ret < 0)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));

+       client_close(pcd);

        return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }
        return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }