commit 1b138ed141c0bdb0c9944c1ae70e53682ed2d035
author Igor Sysoev <igor@sysoev.ru> Tue Nov 18 21:34:08 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Nov 18 21:34:08 2003 +0000
tree c5b4cabecced530570f4a2d6a93cc7d5fc8e044e
parent 222a2adf40eb25ff613c251f15032f1e39d7f609

nginx-0.0.1-2003-11-19-00:34:08 import

src/os/unix/ngx_files.c

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 76b86a0..7b9d4e4 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -25,13 +25,15 @@
 
 #else
 
-    if (file->offset != offset) {
+    if (file->sys_offset != offset) {
         if (lseek(file->fd, offset, SEEK_SET) == -1) {
             ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "lseek() failed");
             return NGX_ERROR;
         }
     }
 
+    file->sys_offset = offset;
+
     n = read(file->fd, buf, size);
 
     if (n == -1) {
@@ -39,6 +41,8 @@
         return NGX_ERROR;
     }
 
+    file->sys_offset += n;
+
 #endif
 
     file->offset += n;
@@ -68,13 +72,15 @@
 
 #else
 
-    if (file->offset != offset) {
+    if (file->sys_offset != offset) {
         if (lseek(file->fd, offset, SEEK_SET) == -1) {
             ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "lseek() failed");
             return NGX_ERROR;
         }
     }
 
+    file->sys_offset = offset;
+
     n = write(file->fd, buf, size);
 
     if (n == -1) {
@@ -88,6 +94,8 @@
         return NGX_ERROR;
     }
 
+    file->sys_offset += n;
+
 #endif
 
     file->offset += n;
@@ -150,6 +158,8 @@
         }
     }
 
+    file->sys_offset = offset;
+
     n = writev(file->fd, io.elts, io.nelts);
 
     if (n == -1) {
@@ -163,6 +173,7 @@
         return NGX_ERROR;
     }
 
+    file->sys_offset += n;
     file->offset += n;
 
     return n;