Altre correzioni.

[gapil.git] / sources / ElemEchoTCPClient.c

diff --git a/sources/ElemEchoTCPClient.c b/sources/ElemEchoTCPClient.c
index eafdc81d6388531fb4fa92a880ecff8bd3cc5170..19f62650766bbdfd6846e9c4d4da930e04ee6a43 100644 (file)
--- a/sources/ElemEchoTCPClient.c
+++ b/sources/ElemEchoTCPClient.c
@@ -1,6 +1,24 @@
+/* ElemEchoTCPClient.c
+ * 
+ * Copyright (C) 2001 Simone Piccardi
+ * 
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 /****************************************************************
  *
- * Program SimpleEchoTCPClient: 
+ * Program ElemEchoTCPClient.c
  * Simple TCP client for echo service (port 7)
  *
  * Author: Simone Piccardi
@@ -8,7 +26,7 @@
  *
  * Usage: echo -h give all info's
  *
- * $Id: ElemEchoTCPClient.c,v 1.2 2001/06/20 22:03:37 piccardi Exp $
+ * $Id: ElemEchoTCPClient.c,v 1.6 2003/04/29 15:33:39 piccardi Exp $
  *
  ****************************************************************/
 /* 
@@ -20,8 +38,6 @@
 #include <sys/socket.h>  /* socket library */
 #include <stdio.h>      /* include standard I/O library */
 
-#include "wrappers.h"
-
 #define MAXLINE 256
 void usage(void);
 void ClientEcho(FILE * filein, int socket);
@@ -83,7 +99,7 @@ int main(int argc, char *argv[])
        return -1;
     }
     /* read daytime from server */
-    EchoClient(stdin, sock_fd);
+    ClientEcho(stdin, sock_fd);
     /* normal exit */
     return 0;
 }
@@ -104,8 +120,8 @@ void ClientEcho(FILE * filein, int socket)
     char sendbuff[MAXLINE], recvbuff[MAXLINE];
     int nread; 
     while (fgets(sendbuff, MAXLINE, filein) != NULL) {
-       SockWrite(socket, sendbuff, strlen(sendbuff)); 
-       nread = SockRead(socket, recvbuff, strlen(sendbuff));
+       FullWrite(socket, sendbuff, strlen(sendbuff)); 
+       nread = FullRead(socket, recvbuff, strlen(sendbuff));
        recvbuff[nread] = 0;
        fputs(recvbuff, stdout);
     }