NGX_ENOPATH

This commit is contained in:
Igor Sysoev 2009-08-11 14:25:04 +00:00
parent 98ab9ce988
commit c9538c069f
3 changed files with 5 additions and 15 deletions

View File

@ -99,13 +99,7 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
continue; continue;
} }
if ((path->level[0] == 0) if ((path->level[0] == 0) || (err != NGX_ENOPATH)) {
|| (err != NGX_ENOENT
#if (NGX_WIN32)
&& err != NGX_ENOTDIR
#endif
))
{
ngx_log_error(NGX_LOG_CRIT, file->log, err, ngx_log_error(NGX_LOG_CRIT, file->log, err,
ngx_open_tempfile_n " \"%s\" failed", ngx_open_tempfile_n " \"%s\" failed",
file->name.data); 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; err = ngx_errno;
if (err if (err == NGX_ENOPATH) {
#if (NGX_WIN32)
== ERROR_PATH_NOT_FOUND
#else
== NGX_ENOENT
#endif
)
{
if (!ext->create_path) { if (!ext->create_path) {
goto failed; goto failed;
} }

View File

@ -16,6 +16,7 @@ typedef int ngx_err_t;
#define NGX_EPERM EPERM #define NGX_EPERM EPERM
#define NGX_ENOENT ENOENT #define NGX_ENOENT ENOENT
#define NGX_ENOPATH ENOENT
#define NGX_ESRCH ESRCH #define NGX_ESRCH ESRCH
#define NGX_EINTR EINTR #define NGX_EINTR EINTR
#define NGX_ECHILD ECHILD #define NGX_ECHILD ECHILD

View File

@ -21,6 +21,7 @@ typedef DWORD ngx_err_t;
#define NGX_EPERM ERROR_ACCESS_DENIED #define NGX_EPERM ERROR_ACCESS_DENIED
#define NGX_ENOENT ERROR_FILE_NOT_FOUND #define NGX_ENOENT ERROR_FILE_NOT_FOUND
#define NGX_ENOPATH ERROR_PATH_NOT_FOUND
#define NGX_ENOMEM ERROR_NOT_ENOUGH_MEMORY #define NGX_ENOMEM ERROR_NOT_ENOUGH_MEMORY
#define NGX_EACCES ERROR_ACCESS_DENIED #define NGX_EACCES ERROR_ACCESS_DENIED
/* it's seems that ERROR_FILE_EXISTS is not appropriate error code */ /* it's seems that ERROR_FILE_EXISTS is not appropriate error code */