X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=listati%2FClientEcho.c;h=520671fb2faf73d71249be3984d631dc8d102067;hp=0a64e94d4b2b8a548e9ffd6e67d4ff2dd2addbe0;hb=d25090faca15102552d77c38161a8a34b0bac41e;hpb=06661f47754a536098afe2b30cb04469918f2fa3

diff --git a/listati/ClientEcho.c b/listati/ClientEcho.c
index 0a64e94..520671f 100644
--- a/listati/ClientEcho.c
+++ b/listati/ClientEcho.c
@@ -1,12 +1,51 @@
 void ClientEcho(FILE * filein, int socket) 
 {
-    char sendbuff[MAXLINE], recvbuff[MAXLINE];
-    int nread; 
-    while (fgets(sendbuff, MAXLINE, filein) != NULL) {
-        FullWrite(socket, sendbuff, strlen(sendbuff)); 
-        nread = FullRead(socket, recvbuff, strlen(sendbuff));        
-        recvbuff[nread] = 0;
-        fputs(recvbuff, stdout);
+    char sendbuff[MAXLINE+1], recvbuff[MAXLINE+1];
+    int nread, nwrite; 
+    int maxfd;
+    fd_set fset;
+    int eof = 0;
+    /* initialize file descriptor set */
+    FD_ZERO(&fset);
+    maxfd = max(fileno(filein), socket) + 1;
+    while (1) {
+	FD_SET(socket, &fset);         /* set for the socket */
+	if (eof == 0) {
+	    FD_SET(fileno(filein), &fset); /* set for the standard input */
+	}
+	select(maxfd, &fset, NULL, NULL, NULL); /* wait for read ready */
+	if (FD_ISSET(fileno(filein), &fset)) {  /* if ready on stdin */
+	    if (fgets(sendbuff, MAXLINE, filein) == NULL) { /* if no input */
+		eof = 1;               /* EOF on input */
+		shutdown(socket, SHUT_WR);      /* close write half */
+		FD_CLR(fileno(filein), &fset);  /* no more interest on stdin */
+	    } else {                   /* else we have to write to socket */
+		nwrite = FullWrite(socket, sendbuff, strlen(sendbuff)); 
+		if (nwrite < 0) {      /* on error stop */
+		    printf("Errore in scrittura: %s", strerror(errno));
+		    return;
+		}
+	    }
+	}
+	if (FD_ISSET(socket, &fset)) { /* if ready on socket */ 
+	    nread = read(socket, recvbuff, strlen(sendbuff)); /* do read */
+	    if (nread < 0) {  /* error condition, stop client */
+		printf("Errore in lettura: %s\n", strerror(errno));
+		return;
+	    }
+	    if (nread == 0) { /* server closed connection, stop */
+		if (eof == 1) {
+		    return;
+		} else {
+		    printf("EOF prematuro sul socket\n");
+		    return;
+		}
+	    }
+	    recvbuff[nread] = 0;   /* else read is ok, write on stdout */
+	    if (fputs(recvbuff, stdout) == EOF) {
+		perror("Errore in scrittura su terminale");
+		return;
+	    }
+	}
     }
-    return;
 }