summaryrefslogtreecommitdiffhomepage
path: root/src/os/win32
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/win32')
-rw-r--r--src/os/win32/ngx_files.c120
-rw-r--r--src/os/win32/ngx_files.h10
-rw-r--r--src/os/win32/ngx_os.h49
-rw-r--r--src/os/win32/ngx_win32_config.h3
4 files changed, 158 insertions, 24 deletions
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index faeb93d5c..139d141cb 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -6,26 +6,49 @@
ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
{
size_t n;
- long high_offset;
- ngx_err_t err;
OVERLAPPED ovlp, *povlp;
+#if (WIN9X)
+
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;
+ long high_offset;
+ ngx_err_t err;
+
+ /*
+ * in Win9X the overlapped pointer must be NULL
+ * so we need to use SetFilePointer() to set the offset
+ */
+
+ if (file->offset != offset) {
+
+ /*
+ * the maximum file size on FAT16 is 2G, but on FAT32 it's 4G so we
+ * need to use high_offset because a single offset is signed value
+ */
+
+ high_offset = (long) (offset >> 32);
+ if (SetFilePointer(file->fd, (long) offset, &high_offset,
+ FILE_BEGIN) == INVALID_SET_FILE_POINTER)
+ {
+ /*
+ * INVALID_SET_FILE_POINTER is 0xffffffff and it can be valid
+ * value for large file so we need also to check GetLastError()
+ */
+
+ err = ngx_errno;
+ if (err != NO_ERROR) {
+ ngx_log_error(NGX_LOG_ERR, file->log, err,
+ "SeekFilePointer() failed");
+ return NGX_ERROR;
+ }
}
}
povlp = NULL;
} else {
+
+#endif
ovlp.Internal = 0;
ovlp.InternalHigh = 0;
ovlp.Offset = (DWORD) offset;
@@ -33,7 +56,10 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
ovlp.hEvent = NULL;
povlp = &ovlp;
+
+#if (WIN9X)
}
+#endif
if (ReadFile(file->fd, buf, size, &n, povlp) == 0) {
ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "ReadFile() failed");
@@ -46,13 +72,66 @@ 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;
+ size_t n;
+ OVERLAPPED ovlp, *povlp;
+
+#if (WIN9X)
+
+ if (ngx_win32_version < NGX_WIN_NT) {
+ long high_offset;
+ ngx_err_t err;
+
+ /*
+ * in Win9X the overlapped pointer must be NULL
+ * so we need to use SetFilePointer() to set the offset
+ */
+
+ if (file->offset != offset) {
+
+ /*
+ * the maximum file size on FAT16 is 2G, but on FAT32 it's 4G so we
+ * need to use high_offset because a single offset is signed value
+ */
+
+ high_offset = (long) (offset >> 32);
+ if (SetFilePointer(file->fd, (long) offset, &high_offset,
+ FILE_BEGIN) == INVALID_SET_FILE_POINTER)
+ {
+ /*
+ * INVALID_SET_FILE_POINTER is 0xffffffff and it can be valid
+ * value for large file so we need also to check GetLastError()
+ */
+
+ err = ngx_errno;
+ if (err != NO_ERROR) {
+ ngx_log_error(NGX_LOG_ERR, file->log, err,
+ "SeekFilePointer() failed");
+ return NGX_ERROR;
+ }
+ }
+ }
+
+ povlp = NULL;
+
+ } else {
+
+#endif
+
+ ovlp.Internal = 0;
+ ovlp.InternalHigh = 0;
+ ovlp.Offset = (DWORD) offset;
+ ovlp.OffsetHigh = (DWORD) (offset >> 32);
+ ovlp.hEvent = NULL;
+
+ povlp = &ovlp;
- if (WriteFile(file->fd, buf, size, &n, NULL) == 0) {
+#if (WIN9X)
+ }
+#endif
+
+ if (WriteFile(file->fd, buf, size, &n, povlp) == 0) {
ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "WriteFile() failed");
return NGX_ERROR;
}
@@ -63,12 +142,15 @@ ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
}
-/* TODO: log error */
-
int ngx_file_append_mode(ngx_fd_t fd)
{
- if (SetFilePointer(fd, 0, NULL, FILE_END) == 0xFFFFFFFF) {
- if (GetLastError() != NO_ERROR) {
+ ngx_err_t err;
+
+ if (SetFilePointer(fd, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {
+ err = ngx_errno;
+ if (err != NO_ERROR) {
+ ngx_log_error(NGX_LOG_ERR, file->log, err,
+ "SeekFilePointer() failed");
return NGX_ERROR;
}
}
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 8e739e9fb..8e386e8ca 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -6,11 +6,17 @@
#include <ngx_core.h>
-/* INVALID_FILE_ATTRIBUTES specified but not defined at least in MSVC6SP2 */
+/* INVALID_FILE_ATTRIBUTES is specified but not defined at least in MSVC6SP2 */
#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
+#define INVALID_FILE_ATTRIBUTES 0xffffffff
#endif
+/* INVALID_SET_FILE_POINTER is not defined at least in MSVC6SP2 */
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER 0xffffffff
+#endif
+
+
#define NGX_INVALID_FILE INVALID_HANDLE_VALUE
#define NGX_FILE_ERROR 0
diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h
new file mode 100644
index 000000000..96f1c2d1f
--- /dev/null
+++ b/src/os/win32/ngx_os.h
@@ -0,0 +1,49 @@
+ifndef _NGX_OS_H_INCLUDED_
+#define _NGX_OS_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+#define NGX_IO_SENDFILE 1
+#define NGX_IO_ZEROCOPY 2
+
+#if (HAVE_SENDFILE)
+#define NGX_HAVE_SENDFILE NGX_IO_SENDFILE
+#else
+#define NGX_HAVE_SENDFILE 0
+#endif
+
+#if (HAVE_ZEROCOPY)
+#define NGX_HAVE_ZEROCOPY NGX_IO_ZEROCOPY
+#else
+#define NGX_HAVE_ZEROCOPY 0
+#endif
+
+
+
+typedef struct {
+ ssize_t (*recv)(ngx_connection_t *c, char *buf, size_t size);
+ ssize_t (*recv_chain)(ngx_connection_t *c, ngx_chain_t *in);
+ ssize_t (*send)(ngx_connection_t *c, char *buf, size_t size);
+ ngx_chain_t *(*send_chain)(ngx_connection_t *c, ngx_chain_t *in);
+ int flags;
+} ngx_os_io_t;
+
+
+int ngx_os_init(ngx_log_t *log);
+
+
+extern ngx_os_io_t ngx_os_io;
+extern int ngx_max_sockets;
+extern int ngx_inherited_nonblocking;
+extern int ngx_win32_version;
+
+
+extern int restart;
+extern int rotate;
+
+
+
+#endif /* _NGX_OS_H_INCLUDED_ */
+
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 9ec07cf88..23164328b 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -4,10 +4,7 @@
#define WIN32 1
-/* STUB */
#define NGX_WIN_NT 200000
-extern int ngx_win32_version;
-/**/
generated by cgit (git 2.34.1) at 2026-01-03 16:51:50 +0000