nginx-0.0.1-2002-12-15-09:25:09 import

2 files changed, 17 insertions, 13 deletions

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 90d6dd6c8..f0c324e40 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -6,6 +6,9 @@
 #include <sys/stat.h>
 
 typedef int                      ngx_fd_t;
+#define NGX_INVALID_FILE         -1
+#define NGX_FILE_ERROR           -1
+
 typedef struct stat              ngx_file_info_t;
 
 
@@ -27,6 +30,7 @@ typedef struct stat              ngx_file_info_t;
 #define ngx_stat_fd_n            "fstat()"
 
 #define ngx_is_dir(sb)           (S_ISDIR(sb.st_mode))
+#define ngx_is_file(sb)          (S_ISREG(sb.st_mode))
 #define ngx_file_size(sb)        sb.st_size
 #define ngx_file_mtime(sb)       sb.st_mtime
 
diff --git a/src/os/unix/ngx_sendv.c b/src/os/unix/ngx_sendv.c
index 409456890..810caaee9 100644
--- a/src/os/unix/ngx_sendv.c
+++ b/src/os/unix/ngx_sendv.c
@@ -8,21 +8,21 @@
 
 ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n)
 {
-     ssize_t rc;
-     ngx_err_t err;
+    ssize_t rc;
+    ngx_err_t err;
 
-     rc = writev(c->fd, iovec, n);
+    rc = writev(c->fd, iovec, n);
 
-     if (rc == -1) {
-         err = ngx_socket_errno;
-         if (err == NGX_EAGAIN) {
-             ngx_log_error(NGX_LOG_INFO, c->log, err, "sendv() eagain");
-             return NGX_AGAIN;
-         }
+    if (rc == -1) {
+        err = ngx_socket_errno;
+        if (err == NGX_EAGAIN) {
+            ngx_log_error(NGX_LOG_INFO, c->log, err, "sendv() eagain");
+            return NGX_AGAIN;
+        }
 
-         ngx_log_error(NGX_LOG_ERR, c->log, err, "sendv() failed");
-         return NGX_ERROR;
-     }
+        ngx_log_error(NGX_LOG_ERR, c->log, err, "sendv() failed");
+        return NGX_ERROR;
+    }
 
-     return rc;
+    return rc;
 }