nginx-0.0.1-2002-08-26-19:18:19 import
diff --git a/src/os/unix/freebsd/ngx_sendfile.c b/src/os/unix/freebsd/ngx_sendfile.c
index 31915e4..1b60774 100644
--- a/src/os/unix/freebsd/ngx_sendfile.c
+++ b/src/os/unix/freebsd/ngx_sendfile.c
@@ -24,7 +24,7 @@
int ngx_sendfile(ngx_socket_t s,
ngx_iovec_t *headers, int hdr_cnt,
- ngx_file_t fd, off_t offset, size_t nbytes,
+ ngx_fd_t fd, off_t offset, size_t nbytes,
ngx_iovec_t *trailers, int trl_cnt,
off_t *sent,
ngx_log_t *log)
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index dd66db2..1ea9906 100644
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -11,6 +11,7 @@
#define NGX_EINTR EINTR
#define NGX_EAGAIN EWOULDBLOCK
#define NGX_EADDRINUSE EADDRINUSE
+#define NGX_ETIMEDOUT ETIMEDOUT
#define ngx_errno errno
#define ngx_socket_errno errno
diff --git a/src/os/unix/ngx_file.c b/src/os/unix/ngx_file.c
index 1b05b92..69b6975 100644
--- a/src/os/unix/ngx_file.c
+++ b/src/os/unix/ngx_file.c
@@ -1,8 +1,8 @@
-ssize_t ngx_read_file(ngx_file_t file, char *buf, size_t size)
+ssize_t ngx_read_file(ngx_file_t file, char *buf, size_t size, off_t offset)
{
- read();
+ return pread(file->fd, buf, size, offset);
}
#if 0
diff --git a/src/os/unix/ngx_file.h b/src/os/unix/ngx_file.h
index 5fda896..33ba6d8 100644
--- a/src/os/unix/ngx_file.h
+++ b/src/os/unix/ngx_file.h
@@ -5,7 +5,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-typedef int ngx_file_t;
+typedef int ngx_fd_t;
typedef struct stat ngx_file_info_t;
diff --git a/src/os/unix/ngx_sendfile.h b/src/os/unix/ngx_sendfile.h
index 0a0a25e..768e23c 100644
--- a/src/os/unix/ngx_sendfile.h
+++ b/src/os/unix/ngx_sendfile.h
@@ -10,7 +10,7 @@
int ngx_sendfile(ngx_socket_t s,
ngx_iovec_t *headers, int hdr_cnt,
- ngx_file_t fd, off_t offset, size_t nbytes,
+ ngx_fd_t fd, off_t offset, size_t nbytes,
ngx_iovec_t *trailers, int trl_cnt,
off_t *sent,
ngx_log_t *log);
diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
index e9e7974..f3fffd6 100644
--- a/src/os/unix/ngx_socket.h
+++ b/src/os/unix/ngx_socket.h
@@ -9,11 +9,14 @@
#define ngx_init_sockets
+#define ngx_socket(af, type, proto, flags) socket(af, type, proto)
+#define ngx_socket_n "socket()"
+
#define ngx_nonblocking(s) fcntl(s, F_SETFL, O_NONBLOCK)
-#define ngx_nonblocking_n "fcntl (O_NONBLOCK)"
+#define ngx_nonblocking_n "fcntl(O_NONBLOCK)"
#define ngx_close_socket close
-#define ngx_close_socket_n "close"
+#define ngx_close_socket_n "close()"
#endif /* _NGX_SOCKET_H_INCLUDED_ */
