2007-05-30 Chris Toshok <toshok@ximian.com>

[mono.git] / support / serial.c

diff --git a/support/serial.c b/support/serial.c
index 34d3943142d064db85829fb41129aef88ee0092d..f7746c41a866419171a091c593fd838600a71ca7 100644 (file)
--- a/support/serial.c
+++ b/support/serial.c
@@ -103,7 +103,9 @@ write_serial (int fd, guchar *buffer, int offset, int count, int timeout)
        ufd.fd = fd;
        ufd.events = POLLHUP | POLLOUT | POLLERR;
 
-       poll (&ufd, 1, timeout);
+       while (poll (&ufd, 1, timeout) == -1 && errno == EINTR){
+               
+       }
 
        if ((ufd.revents & POLLOUT) != POLLOUT) {
                return;
@@ -333,12 +335,12 @@ poll_serial (int fd, gint32 *error, int timeout)
        pinfo.events = POLLIN;
        pinfo.revents = 0;
 
-       if (poll (&pinfo, 1, timeout) == -1) {
+       while (poll (&pinfo, 1, timeout) == -1 && errno == EINTR) {
                /* EINTR is an OK condition, we should not throw in the upper layer an IOException */
-               if (errno == EINTR)
+               if (errno != EINTR){
+                       *error = -1;
                        return FALSE;
-               *error = -1;
-               return FALSE;
+               }
        }
 
        return (pinfo.revents & POLLIN) != 0 ? 1 : 0;