Changeset 232 for branches/samba-3.2.x/source/lib/system.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/lib/system.c (modified) (1 diff)

branches/samba-3.2.x/source/lib/system.c

@@ -149 +149 @@
         } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
 #endif
+        return ret;
+}
+
+/*******************************************************************
+A writev wrapper that will deal with EINTR.
+********************************************************************/
+
+ssize_t sys_writev(int fd, const struct iovec *iov, int iovcnt)
+{
+        ssize_t ret;
+
+#if 0
+        /* Try to confuse write_data_iov a bit */
+        if ((random() % 5) == 0) {
+                return sys_write(fd, iov[0].iov_base, iov[0].iov_len);
+        }
+        if (iov[0].iov_len > 1) {
+                return sys_write(fd, iov[0].iov_base,
+                                 (random() % (iov[0].iov_len-1)) + 1);
+        }
+#endif
+
+        do {
+                ret = writev(fd, iov, iovcnt);
+        } while (ret == -1 && errno == EINTR);
         return ret;
 }