]> git.kaiwu.me - nginx.git/commitdiff
Fixed unix ngx_write_chain_to_file() to return total bytes written.
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 20 Oct 2011 12:40:26 +0000 (12:40 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 20 Oct 2011 12:40:26 +0000 (12:40 +0000)
Previously result of last iteration's writev() was returned.  This was
unnoticed as return value was only used if chain contained only one or
two buffers.

src/os/unix/ngx_files.c

index 89ab8d6bc050f40756f5d5af0df71e40df0dd624..4bfde44f4a2c64932119e078d460e9a7ad0e4e2d 100644 (file)
@@ -153,7 +153,7 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
 {
     u_char        *prev;
     size_t         size;
-    ssize_t        n;
+    ssize_t        total, n;
     ngx_array_t    vec;
     struct iovec  *iov, iovs[NGX_IOVS];
 
@@ -165,6 +165,8 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
                               offset);
     }
 
+    total = 0;
+
     vec.elts = iovs;
     vec.size = sizeof(struct iovec);
     vec.nalloc = NGX_IOVS;
@@ -233,10 +235,11 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
 
         file->sys_offset += n;
         file->offset += n;
+        total += n;
 
     } while (cl);
 
-    return n;
+    return total;
 }