X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=serial_console%2Fusocket.c;h=d00a8b5f3cbe9ff172417c618f4fe916fe2dd361;hb=51b8c0cb530de874de351d6a7d954c21a7644a3e;hp=7008090b48b69040ca170fd6ba61286fc3172eea;hpb=9fb50288fde0eb8919287a49e015a5f21645dd81;p=svn42.git diff --git a/serial_console/usocket.c b/serial_console/usocket.c index 7008090..d00a8b5 100644 --- a/serial_console/usocket.c +++ b/serial_console/usocket.c @@ -64,7 +64,7 @@ void connect_terminal(int fd) { send(fd,buffer,num_byte,0); } - if (num_byte <0 && errno != EAGAIN) + if (num_byte == 0 || (num_byte <0 && errno != EAGAIN)) return; } @@ -109,30 +109,23 @@ int main(int argc, char* argv[]) if (argc > 0) socket_file_ = argv[1]; - for(;;) + socket_fd = establish_socket_connection(socket_file_); + if(socket_fd) { - socket_fd = establish_socket_connection(socket_file_); - if(socket_fd < 0) - ret = 2; - else { - //~ ret = set_tty_raw(STDIN_FILENO,&tmio_prev); - //~ if (ret) - //~ break; - fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK); - connect_terminal(socket_fd); - - //~ ret = restore_tty(STDIN_FILENO,&tmio_prev); - //~ if (ret) - //~ break; - } - if (ret == 2) { - fprintf(stderr, "%s error, trying to reopen in 5 seconds..\n", socket_file_); - if(socket_fd > 0) - shutdown(socket_fd,SHUT_RDWR); - sleep(5); - } - else - break; + //~ ret = set_tty_raw(STDIN_FILENO,&tmio_prev); + //~ if (ret) + //~ break; + fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK); + connect_terminal(socket_fd); + + //~ ret = restore_tty(STDIN_FILENO,&tmio_prev); + //~ if (ret) + //~ break; + } + else + { + fprintf(stderr, "%s error, aborting..\n", socket_file_); + ret=2; } if(socket_fd > 0)