Changeset 325 for trunk/src

Timestamp:

Apr 6, 2011, 1:04:06 PM (14 years ago)

Author:

katerina

Message:

More fixes for ticket #244: timeout error in retry_lstat() not propagated

File:

• trunk/src/sh_sub.c (modified) (3 diffs)

trunk/src/sh_sub.c

@@ -348 +348 @@
 }
 
+#ifndef ETIMEDOUT
+#define ETIMEDOUT EIO
+#endif
+
 static ssize_t sh_sub_read(int fd, void *buf, size_t count)
 {
@@ -371 +375 @@
         else
           {
+            if (rcount >= 0) 
+              errno = ETIMEDOUT;
             return -1;
           }
       }
-  } while (count > 0 && (errno == EAGAIN || errno == EWOULDBLOCK));
+  } while (count > 0 && 
+           (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR));
 
   if (count > 0)
@@ -471 +478 @@
   } while (retval < 0 && errno == EINTR);
 
-#ifndef ETIMEDOUT
-#define ETIMEDOUT EIO
-#endif
-
   if (retval <= 0)
     {