nginx-0.0.1-2003-04-11-20:01:14 import
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index 3918657..3f6be6c 100644
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -10,6 +10,7 @@
#define NGX_ENOENT ENOENT
#define NGX_EINTR EINTR
#define NGX_EACCES EACCES
+#define NGX_EEXIST EEXIST
#define NGX_ENOTDIR ENOTDIR
#define NGX_EAGAIN EWOULDBLOCK
#define NGX_EINPROGRESS EINPROGRESS
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 8aac3e2..732cfdf 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -1,7 +1,11 @@
#include <ngx_config.h>
#include <ngx_core.h>
+#include <ngx_hunk.h>
+#include <ngx_array.h>
#include <ngx_file.h>
+#include <ngx_files.h>
+
ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
{
@@ -12,7 +16,7 @@
n = pread(file->fd, buf, size, offset);
if (n == -1) {
- ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "pread() failed");
+ ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "pread() failed");
return NGX_ERROR;
}
@@ -29,12 +33,12 @@
n = pwrite(file->fd, buf, size, offset);
if (n == -1) {
- ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "pwrite() failed");
+ ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "pwrite() failed");
return NGX_ERROR;
}
- if (n != size) {
- ngx_log_error(NGX_LOG_ERR, file->log, 0,
+ if ((size_t) n != size) {
+ ngx_log_error(NGX_LOG_CRIT, file->log, 0,
"pwrite() has written only %d of %d", n, size);
return NGX_ERROR;
}
@@ -45,6 +49,59 @@
}
+ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce,
+ off_t offset, ngx_pool_t *pool)
+{
+ size_t size;
+ ssize_t n;
+ struct iovec *iov;
+ ngx_err_t err;
+ ngx_array_t io;
+
+ /* use pwrite() if there's the only hunk in a chain */
+
+ if (ce->next == NULL) {
+ return ngx_write_file(file, ce->hunk->pos,
+ ce->hunk->last - ce->hunk->pos, offset);
+ }
+
+ ngx_init_array(io, pool, 10, sizeof(struct iovec), NGX_ERROR);
+ size = 0;
+
+ while (ce) {
+ ngx_test_null(iov, ngx_push_array(&io), NGX_ERROR);
+ iov->iov_base = ce->hunk->pos;
+ iov->iov_len = ce->hunk->last - ce->hunk->pos;
+ size += ce->hunk->last - ce->hunk->pos;
+ ce = ce->next;
+ }
+
+ if (lseek(file->fd, offset, SEEK_SET) == -1) {
+ ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "lseek() failed");
+ return NGX_ERROR;
+ }
+
+ n = writev(file->fd, (struct iovec *) io.elts, io.nelts);
+
+ ngx_destroy_array(&io);
+
+ if (n == -1) {
+ ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "writev() failed");
+ return NGX_ERROR;
+ }
+
+ if ((size_t) n != size) {
+ ngx_log_error(NGX_LOG_CRIT, file->log, 0,
+ "writev() has written only %d of %d", n, size);
+ return NGX_ERROR;
+ }
+
+ file->offset += n;
+
+ return n;
+}
+
+
#if 0
ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index d35382f..92448cc 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -5,6 +5,8 @@
#include <ngx_config.h>
#include <ngx_types.h>
+#include <ngx_alloc.h>
+#include <ngx_hunk.h>
#include <ngx_file.h>
@@ -19,11 +21,24 @@
#define ngx_close_file close
#define ngx_close_file_n "close()"
+#define ngx_open_tempfile(name, persistent) \
+ open(name, O_CREAT|O_EXCL|O_WRONLY, 0600)
+#define ngx_open_tempfile_n "open()"
+
ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset);
#define ngx_read_file_n "read()"
#define NGX_FILE_RDONLY O_RDONLY
+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 ngx_mkdir(name) mkdir(name, 0700)
+#define ngx_mkdir_n "mkdir()"
+
#define ngx_file_type(file, sb) stat(file, sb)
#define ngx_file_type_n "stat()"
diff --git a/src/os/unix/ngx_freebsd_write_chain.c b/src/os/unix/ngx_freebsd_write_chain.c
index 1c16377..09c0120 100644
--- a/src/os/unix/ngx_freebsd_write_chain.c
+++ b/src/os/unix/ngx_freebsd_write_chain.c
@@ -140,7 +140,7 @@
c->sent += sent;
- for (ce = in; ce; ce = ce->next) {
+ for (ce = in; ce && sent > 0; ce = ce->next) {
if (ce->hunk->type & NGX_HUNK_IN_MEMORY) {
size = ce->hunk->last - ce->hunk->pos;
diff --git a/src/os/unix/ngx_recv_chain.c b/src/os/unix/ngx_recv_chain.c
index 221f306..18054e7 100644
--- a/src/os/unix/ngx_recv_chain.c
+++ b/src/os/unix/ngx_recv_chain.c
@@ -8,10 +8,10 @@
ssize_t ngx_recv_chain(ngx_connection_t *c, ngx_chain_t *ce)
{
- int n;
- struct iovec *iov;
- ngx_err_t err;
- ngx_array_t io;
+ ssize_t n;
+ struct iovec *iov;
+ ngx_err_t err;
+ ngx_array_t io;
ngx_init_array(io, c->pool, 10, sizeof(struct iovec), NGX_ERROR);
