diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-08-11 14:25:04 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-08-11 14:25:04 +0000 |
| commit | c9538c069f95043d9a922a7ca3d311f7e2b7fde7 (patch) | |
| tree | 35e5a2f9791a56c6d551b8aeed460f3526f82383 | |
| parent | 98ab9ce9883bd0c3985eaf248021b7a833db3d24 (diff) | |
| download | nginx-c9538c069f95043d9a922a7ca3d311f7e2b7fde7.tar.gz nginx-c9538c069f95043d9a922a7ca3d311f7e2b7fde7.zip | |
NGX_ENOPATH
| -rw-r--r-- | src/core/ngx_file.c | 18 | ||||
| -rw-r--r-- | src/os/unix/ngx_errno.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_errno.h | 1 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 19ed86df0..2b9e8b362 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -99,13 +99,7 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool, continue; } - if ((path->level[0] == 0) - || (err != NGX_ENOENT -#if (NGX_WIN32) - && err != NGX_ENOTDIR -#endif - )) - { + if ((path->level[0] == 0) || (err != NGX_ENOPATH)) { ngx_log_error(NGX_LOG_CRIT, file->log, err, ngx_open_tempfile_n " \"%s\" failed", file->name.data); @@ -560,14 +554,8 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to, ngx_ext_rename_file_t *ext) err = ngx_errno; - if (err -#if (NGX_WIN32) - == ERROR_PATH_NOT_FOUND -#else - == NGX_ENOENT -#endif - ) - { + if (err == NGX_ENOPATH) { + if (!ext->create_path) { goto failed; } diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h index 3dbfa227e..379f36777 100644 --- a/src/os/unix/ngx_errno.h +++ b/src/os/unix/ngx_errno.h @@ -16,6 +16,7 @@ typedef int ngx_err_t; #define NGX_EPERM EPERM #define NGX_ENOENT ENOENT +#define NGX_ENOPATH ENOENT #define NGX_ESRCH ESRCH #define NGX_EINTR EINTR #define NGX_ECHILD ECHILD diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h index 75ae73f5d..e5e1a3744 100644 --- a/src/os/win32/ngx_errno.h +++ b/src/os/win32/ngx_errno.h @@ -21,6 +21,7 @@ typedef DWORD ngx_err_t; #define NGX_EPERM ERROR_ACCESS_DENIED #define NGX_ENOENT ERROR_FILE_NOT_FOUND +#define NGX_ENOPATH ERROR_PATH_NOT_FOUND #define NGX_ENOMEM ERROR_NOT_ENOUGH_MEMORY #define NGX_EACCES ERROR_ACCESS_DENIED /* it's seems that ERROR_FILE_EXISTS is not appropriate error code */ |