From 9949aa0b97e44d67713eed79859028c5ba92b1a3 Mon Sep 17 00:00:00 2001 From: "Leandro A. F. Pereira" Date: Sun, 15 Oct 2006 18:38:06 +0000 Subject: More hddtemp fixes (shouldn't fail anymore) --- hardinfo2/socket.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'hardinfo2/socket.c') diff --git a/hardinfo2/socket.c b/hardinfo2/socket.c index c17c9f5c..d1bd4af3 100644 --- a/hardinfo2/socket.c +++ b/hardinfo2/socket.c @@ -61,14 +61,36 @@ int sock_write(Socket * s, gchar * str) return write(s->sock, str, strlen(str)); } +/* From: http://www.erlenstar.demon.co.uk/unix/faq_3.html#SEC26 */ +int sock_is_ready(Socket *s) +{ + int rc, fd = s->sock; + fd_set fds; + struct timeval tv; + + FD_ZERO(&fds); + FD_SET(fd, &fds); + tv.tv_sec = tv.tv_usec = 0; + + rc = select(fd+1, &fds, NULL, NULL, &tv); + if (rc < 0) + return -1; + + return FD_ISSET(fd, &fds) ? 1 : 0; +} + int sock_read(Socket * s, gchar * buffer, gint size) { - gint n; + if (sock_is_ready(s)) { + gint n; - n = read(s->sock, buffer, size); - buffer[n] = '\0'; + n = read(s->sock, buffer, size); + buffer[n] = '\0'; + + return n; + } - return n; + return 0; } void sock_close(Socket * s) -- cgit v1.2.3