Changeset 988 for vendor/current/source3/lib/recvfile.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/recvfile.c (modified) (13 diffs)

vendor/current/source3/lib/recvfile.c

@@ -26 +26 @@
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/sys_rw.h"
 
 /* Do this on our own in TRANSFER_BUF_SIZE chunks.
@@ -45 +46 @@
 static ssize_t default_sys_recvfile(int fromfd,
                         int tofd,
-                        SMB_OFF_T offset,
+                        off_t offset,
                         size_t count)
 {
@@ -52 +53 @@
         size_t bufsize = MIN(TRANSFER_BUF_SIZE,count);
         size_t total_written = 0;
-        char *buffer = NULL;
+        char buffer[bufsize];
 
         DEBUG(10,("default_sys_recvfile: from = %d, to = %d, "
@@ -63 +64 @@
         }
 
-        if (tofd != -1 && offset != (SMB_OFF_T)-1) {
-                if (sys_lseek(tofd, offset, SEEK_SET) == -1) {
+        if (tofd != -1 && offset != (off_t)-1) {
+                if (lseek(tofd, offset, SEEK_SET) == -1) {
                         if (errno != ESPIPE) {
                                 return -1;
                         }
                 }
-        }
-
-        buffer = SMB_MALLOC_ARRAY(char, bufsize);
-        if (buffer == NULL) {
-                return -1;
         }
 
@@ -81 +77 @@
                 size_t toread = MIN(bufsize,count - total);
 
-                /* Read from socket - ignore EINTR. */
-                read_ret = sys_read(fromfd, buffer, toread);
+                /*
+                 * Read from socket - ignore EINTR.
+                 * Can't use sys_read() as that also
+                 * ignores EAGAIN and EWOULDBLOCK.
+                 */
+                do {
+                        read_ret = read(fromfd, buffer, toread);
+                } while (read_ret == -1 && errno == EINTR);
+
+                if (read_ret == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
+                        /*
+                         * fromfd socket is in non-blocking mode.
+                         * If we already read some and wrote
+                         * it successfully, return that.
+                         * Only return -1 if this is the first read
+                         * attempt. Caller will handle both cases.
+                         */
+                        if (total_written != 0) {
+                                return total_written;
+                        }
+                        return -1;
+                }
+
                 if (read_ret <= 0) {
                         /* EOF or socket error. */
-                        free(buffer);
                         return -1;
                 }
@@ -120 +136 @@
         }
 
-        free(buffer);
         if (saved_errno) {
                 /* Return the correct write error. */
@@ -141 +156 @@
 ssize_t sys_recvfile(int fromfd,
                         int tofd,
-                        SMB_OFF_T offset,
+                        off_t offset,
                         size_t count)
 {
@@ -191 +206 @@
                                 return default_sys_recvfile(fromfd, tofd,
                                                             offset, count);
+                        }
+                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                                /*
+                                 * fromfd socket is in non-blocking mode.
+                                 * If we already read some and wrote
+                                 * it successfully, return that.
+                                 * Only return -1 if this is the first read
+                                 * attempt. Caller will handle both cases.
+                                 */
+                                if (total_written != 0) {
+                                        return total_written;
+                                }
+                                return -1;
                         }
                         break;
@@ -231 +259 @@
 ssize_t sys_recvfile(int fromfd,
                         int tofd,
-                        SMB_OFF_T offset,
+                        off_t offset,
                         size_t count)
 {
@@ -241 +269 @@
  Throw away "count" bytes from the client socket.
  Returns count or -1 on error.
+ Must only operate on a blocking socket.
 *****************************************************************/
 
@@ -247 +276 @@
         size_t total = 0;
         size_t bufsize = MIN(TRANSFER_BUF_SIZE,count);
-        char *buffer = NULL;
+        char buffer[bufsize];
+        int old_flags = 0;
 
         if (count == 0) {
@@ -253 +283 @@
         }
 
-        buffer = SMB_MALLOC_ARRAY(char, bufsize);
-        if (buffer == NULL) {
+        old_flags = fcntl(sockfd, F_GETFL, 0);
+        if (set_blocking(sockfd, true) == -1) {
                 return -1;
         }
@@ -266 +296 @@
                 if (read_ret <= 0) {
                         /* EOF or socket error. */
-                        free(buffer);
-                        return -1;
+                        count = (size_t)-1;
+                        goto out;
                 }
                 total += read_ret;
         }
 
-        free(buffer);
+  out:
+
+        if (fcntl(sockfd, F_SETFL, old_flags) == -1) {
+                return -1;
+        }
         return count;
 }