Changeset 740 for vendor/current/source3/lib/sendfile.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/sendfile.c (modified) (6 diffs)

vendor/current/source3/lib/sendfile.c

@@ -64 +64 @@
                         nwritten = sendfile(tofd, fromfd, &offset, total);
 #endif
-                } while (nwritten == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+                } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+                } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
                 if (nwritten == -1) {
                         if (errno == ENOSYS || errno == EINVAL) {
@@ -146 +150 @@
                 do {
                         nwritten = sendfile(tofd, fromfd, &small_offset, small_total);
-                } while (nwritten == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+                } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+                } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
                 if (nwritten == -1) {
                         if (errno == ENOSYS || errno == EINVAL) {
@@ -227 +235 @@
                         nwritten = sendfilev(tofd, vec, sfvcnt, &xferred);
 #endif
-                if (nwritten == -1 && errno == EINTR) {
+#if defined(EWOULDBLOCK)
+                if  (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) {
+#else
+                if (nwritten == -1 && (errno == EINTR || errno == EAGAIN)) {
+#endif
                         if (xferred == 0)
                                 continue; /* Nothing written yet. */
@@ -301 +313 @@
                         nwritten = sendfile(tofd, fromfd, offset, total, &hdtrl[0], 0);
 #endif
-                } while (nwritten == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+                } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+                } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
                 if (nwritten == -1)
                         return -1;
@@ -372 +388 @@
                 do {
                         ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
-                } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+                } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+                } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
                 if (ret == -1)
                         return -1;
@@ -450 +470 @@
                 do {
                         ret = send_file(&tofd, &hdtrl, 0);
-                } while ( (ret == 1) || (ret == -1 && errno == EINTR) );
+#if defined(EWOULDBLOCK)
+                } while ((ret == 1) || (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)));
+#else
+                } while ((ret == 1) || (ret == -1 && (errno == EINTR || errno == EAGAIN)));
+#endif
                 if ( ret == -1 )
                         return -1;