X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=07da6529c5f690929d678678489317d9b4d29d74;hp=12812c9f79ecd0a4b5b88707c88572f709ea3fdd;hb=1714e2b80218ef5d7e0275a93f8c2dd9b1809861;hpb=a7d844e5f23805a7521cfd8bf573dd822351c895 diff --git a/client.c b/client.c index 12812c9f..07da6529 100644 --- a/client.c +++ b/client.c @@ -1,19 +1,7 @@ /* * Copyright (C) 1997-2007 Andre Noll * - * 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 */ @@ -44,7 +32,7 @@ static void client_event_handler(struct task *t) 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) { @@ -53,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[]) { @@ -78,7 +77,7 @@ int main(int argc, char *argv[]) if (ret < 0) /* can not use PARA_LOG here */ exit(EXIT_FAILURE); pcd->task.event_handler = client_event_handler; - ret = sched(&s); + ret = schedule(&s); if (ret < 0) PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); client_close(pcd);