nginx-0.0.1-2002-09-02-18:48:24 import
diff --git a/src/os/unix/freebsd/ngx_sendfile.c b/src/os/unix/freebsd/ngx_sendfile.c
index 1b60774..ff577db 100644
--- a/src/os/unix/freebsd/ngx_sendfile.c
+++ b/src/os/unix/freebsd/ngx_sendfile.c
@@ -1,5 +1,6 @@
#include <ngx_config.h>
+#include <ngx_core.h>
#include <ngx_types.h>
#include <ngx_file.h>
#include <ngx_socket.h>
@@ -14,12 +15,6 @@
check sent if errno == EINTR then should return right sent.
*/
-/*
- returns
- 0 done
- -1 error
-*/
-
#if (HAVE_FREEBSD_SENDFILE)
int ngx_sendfile(ngx_socket_t s,
@@ -50,7 +45,7 @@
if (err != NGX_EAGAIN && err != NGX_EINTR) {
ngx_log_error(NGX_LOG_ERR, log, err,
"ngx_sendfile: sendfile failed");
- return -1;
+ return NGX_ERROR;
} else {
ngx_log_error(NGX_LOG_INFO, log, err,
@@ -61,7 +56,7 @@
ngx_log_debug(log, "ngx_sendfile: %d, @%qd %qd:%d" _
rc _ offset _ *sent _ nbytes);
- return 0;
+ return NGX_OK;
}
#endif
diff --git a/src/os/unix/ngx_file.c b/src/os/unix/ngx_files.c
similarity index 80%
rename from src/os/unix/ngx_file.c
rename to src/os/unix/ngx_files.c
index 69b6975..a3dc36d 100644
--- a/src/os/unix/ngx_file.c
+++ b/src/os/unix/ngx_files.c
@@ -1,8 +1,19 @@
+#include <ngx_core.h>
+#include <ngx_file.h>
-ssize_t ngx_read_file(ngx_file_t file, char *buf, size_t size, off_t offset)
+ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
{
- return pread(file->fd, buf, size, offset);
+ ssize_t n;
+
+ ngx_log_debug(file->log, "read: %x, %d, %qd" _ buf _ size _ offset);
+
+ n = pread(file->fd, buf, size, offset);
+
+ if (n == NGX_ERROR)
+ ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "read() failed");
+
+ return n;
}
#if 0
diff --git a/src/os/unix/ngx_file.h b/src/os/unix/ngx_files.h
similarity index 82%
rename from src/os/unix/ngx_file.h
rename to src/os/unix/ngx_files.h
index 33ba6d8..9369db0 100644
--- a/src/os/unix/ngx_file.h
+++ b/src/os/unix/ngx_files.h
@@ -1,5 +1,5 @@
-#ifndef _NGX_FILE_H_INCLUDED_
-#define _NGX_FILE_H_INCLUDED_
+#ifndef _NGX_FILES_H_INCLUDED_
+#define _NGX_FILES_H_INCLUDED_
#include <sys/types.h>
@@ -12,7 +12,6 @@
#define ngx_open_file open
#define ngx_open_file_n "open()"
-#define ngx_read_file read
#define ngx_read_file_n "read()"
#define NGX_FILE_RDONLY O_RDONLY
@@ -29,4 +28,4 @@
#define ngx_file_mtime(sb) sb.st_mtime
-#endif /* _NGX_FILE_H_INCLUDED_ */
+#endif /* _NGX_FILES_H_INCLUDED_ */
diff --git a/src/os/unix/ngx_sendfile.h b/src/os/unix/ngx_sendfile.h
index 768e23c..c9a5923 100644
--- a/src/os/unix/ngx_sendfile.h
+++ b/src/os/unix/ngx_sendfile.h
@@ -3,7 +3,7 @@
#include <ngx_types.h>
-#include <ngx_file.h>
+#include <ngx_files.h>
#include <ngx_socket.h>
#include <ngx_log.h>
#include <ngx_sendv.h>
diff --git a/src/os/unix/ngx_sendv.c b/src/os/unix/ngx_sendv.c
index 22838c2..dec16a1 100644
--- a/src/os/unix/ngx_sendv.c
+++ b/src/os/unix/ngx_sendv.c
@@ -1,15 +1,18 @@
+#include <ngx_core.h>
#include <ngx_types.h>
#include <ngx_socket.h>
#include <ngx_sendv.h>
ssize_t ngx_sendv(ngx_socket_t s, ngx_iovec_t *iovec, int n, size_t *sent)
{
- ssize_t rc = writev(s, iovec, n);
+ ssize_t rc;
+
+ rc = writev(s, iovec, n);
if (rc == -1)
- return -1;
+ return NGX_ERROR;
*sent = rc;
- return 0;
+ return NGX_OK;
}
diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h
index f81ee4e..42bb716 100644
--- a/src/os/unix/ngx_time.h
+++ b/src/os/unix/ngx_time.h
@@ -4,6 +4,8 @@
#include <ngx_config.h>
+typedef u_int ngx_msec_t;
+
typedef struct tm ngx_tm_t;
#define ngx_tm_sec tm_sec
@@ -18,7 +20,7 @@
void ngx_localtime(ngx_tm_t *tm);
-u_int ngx_msec(void);
+ngx_msec_t ngx_msec(void);
#endif /* _NGX_TIME_H_INCLUDED_ */
