From 830716fd1c142f023c36a25c7eb34b6733bbc647 Mon Sep 17 00:00:00 2001
From: Edward Emelianov <eddy@sao.ru>
Date: Mon, 24 Jan 2022 11:12:04 +0300
Subject: [PATCH] remove doubled waittoread from sersock.c

---
 serialsock/sersock.c | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/serialsock/sersock.c b/serialsock/sersock.c
index 26a6566..e524d07 100644
--- a/serialsock/sersock.c
+++ b/serialsock/sersock.c
@@ -26,37 +26,6 @@
 #include "cmdlnopts.h"
 #include "sersock.h"
 
-/**
- * wait for answer from socket
- * @param sock - socket fd
- * @return 0 in case of error or timeout, 1 in case of socket ready
- */
-static int waittoread(int sock){
-    fd_set fds;
-    struct timeval timeout;
-    int rc;
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 100;
-    FD_ZERO(&fds);
-    FD_SET(sock, &fds);
-    do{
-        rc = select(sock+1, &fds, NULL, NULL, &timeout);
-        if(rc < 0){
-            if(errno != EINTR){
-                WARN("select()");
-                return 0;
-            }
-            continue;
-        }
-        break;
-    }while(1);
-    if(FD_ISSET(sock, &fds)){
-        //DBG("FD_ISSET");
-        return 1;
-    }
-    return 0;
-}
-
 // work with single client, return FALSE if disconnected
 static int handle_socket(int sock, TTY_descr *d){
     char buff[BUFLEN];
@@ -305,7 +274,7 @@ static void client_(int sock){
             if(msg[L-1] == '\n') msg[L-1] = 0;
             LOGMSG("TERMINAL: %s", msg);
         }
-        if(!waittoread(sock)) continue;
+        if(1 != canberead(sock)) continue;
         int n = read(sock, recvBuff, Bufsiz-1);
         if(n == 0){
             WARNX("Server disconnected");