nginx-0.0.1-2003-11-13-09:14:05 import

6 files changed, 115 insertions, 5 deletions

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index f07ef5444..1fd69fc4c 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -14,6 +14,8 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
     ngx_log_debug(file->log, "read: %d, %x, %d, %qd" _
                   file->fd _ buf _ size _ offset);
 
+#if (HAVE_PREAD)
+
     n = pread(file->fd, buf, size, offset);
 
     if (n == -1) {
@@ -21,6 +23,24 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
         return NGX_ERROR;
     }
 
+#else
+
+    if (file->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;
+        }
+    }
+
+    n = read(file->fd, buf, size);
+
+    if (n == -1) {
+        ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "read() failed");
+        return NGX_ERROR;
+    }
+
+#endif
+
     file->offset += n;
 
     return n;
@@ -31,6 +51,8 @@ ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
 {
     ssize_t n;
 
+#if (HAVE_PWRITE)
+
     n = pwrite(file->fd, buf, size, offset);
 
     if (n == -1) {
@@ -44,6 +66,30 @@ ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
         return NGX_ERROR;
     }
 
+#else
+
+    if (file->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;
+        }
+    }
+
+    n = write(file->fd, buf, size);
+
+    if (n == -1) {
+        ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "write() failed");
+        return NGX_ERROR;
+    }
+
+    if ((size_t) n != size) {
+        ngx_log_error(NGX_LOG_CRIT, file->log, 0,
+                      "write() has written only %d of %d", n, size);
+        return NGX_ERROR;
+    }
+
+#endif
+
     file->offset += n;
 
     return n;
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index 890d6cc1c..233cae50a 100644
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -76,6 +76,12 @@
 #endif
 
 
+/* STUB */
+#define HAVE_PREAD         1
+#define HAVE_PWRITE        1
+#define HAVE_LOCALTIME_R   1
+
+
        /* FreeBSD sendfile */
 
 #if __FreeBSD_version >= 300007
diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h
index 9dc4aea40..d942900df 100644
--- a/src/os/unix/ngx_time.h
+++ b/src/os/unix/ngx_time.h
@@ -20,6 +20,7 @@ typedef struct tm      ngx_tm_t;
 #define ngx_tm_mon     tm_mon
 #define ngx_tm_year    tm_year
 #define ngx_tm_wday    tm_wday
+#define ngx_tm_zone    tm_zone
 
 
 void ngx_localtime(ngx_tm_t *tm);
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 7c3b1f6d4..faeb93d5c 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -5,9 +5,37 @@
 
 ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
 {
-    size_t n;
+    size_t      n;
+    long        high_offset;
+    ngx_err_t   err;
+    OVERLAPPED  ovlp, *povlp;
+
+    if (ngx_win32_version < NGX_WIN_NT) {
+        high_offset = (long) (offset >> 32);
+        if (SetFilePointer(file->fd, (long) offset, &high_offset, FILE_BEGIN)
+                                                                 == 0xFFFFFFFF)
+        {
+            err = ngx_errno;
+            if (err != NO_ERROR) {
+                ngx_log_error(NGX_LOG_ERR, file->log, err,
+                              "SeekFilePointer() failed");
+                return NGX_ERROR;
+            }
+        }
 
-    if (ReadFile(file->fd, buf, size, &n, NULL) == 0) {
+        povlp = NULL;
+
+    } else {
+        ovlp.Internal = 0;
+        ovlp.InternalHigh = 0;
+        ovlp.Offset = (DWORD) offset;
+        ovlp.OffsetHigh = (DWORD) (offset >> 32);
+        ovlp.hEvent = NULL;
+
+        povlp = &ovlp;
+    }
+
+    if (ReadFile(file->fd, buf, size, &n, povlp) == 0) {
         ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "ReadFile() failed");
         return NGX_ERROR;
     }
@@ -18,6 +46,25 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
 }
 
 
+/* TODO: as read file */
+
+ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
+{
+    size_t n;
+
+    if (WriteFile(file->fd, buf, size, &n, NULL) == 0) {
+        ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "WriteFile() failed");
+        return NGX_ERROR;
+    }
+
+    file->offset += n;
+
+    return n;
+}
+
+
+/* TODO: log error */
+
 int ngx_file_append_mode(ngx_fd_t fd)
 {
     if (SetFilePointer(fd, 0, NULL, FILE_END) == 0xFFFFFFFF) {
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 7692585c2..8e739e9fb 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -85,6 +85,12 @@ int ngx_file_type(char *filename, ngx_file_info_t *fi);
 ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
 #define ngx_read_file_n             "ReadFile()"
 
+ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
+
+ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce,
+                                off_t offset, ngx_pool_t *pool);
+
+
 
 #define STDERR_FILENO               (HANDLE) 2
 
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index c72aaffc9..9ec07cf88 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -2,7 +2,13 @@
 #define _NGX_WIN32_CONFIG_H_INCLUDED_
 
 
-#define WIN32 1
+#define WIN32       1
+
+/* STUB */
+#define NGX_WIN_NT  200000
+extern int  ngx_win32_version;
+/**/
+
 
 
 #include <winsock2.h>
@@ -12,8 +18,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include <time.h>      /* gmtime, strftime */
-
 
 #define ngx_inline   __inline