mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 20:53:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win32: additional error code NGX_EEXIST_FILE (ticket #910).

Browse Source 
On Windows there are two possible error codes which correspond to
the EEXIST error code: ERROR_FILE_EXISTS used by CreateFile(CREATE_NEW),
and ERROR_ALREADY_EXISTS used by CreateDirectory().

MoveFile() seems to use both: ERROR_ALREADY_EXISTS when moving within
one filesystem, and ERROR_FILE_EXISTS when copying a file to a different
drive.
This commit is contained in:
Maxim Dounin 2016-03-29 09:51:46 +03:00
parent 4618c03f4c
commit 6871615528
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_file.c
View File

@ -196,7 +196,7 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
err = ngx_errno; err = ngx_errno;
if (err == NGX_EEXIST) { if (err == NGX_EEXIST_FILE) {
n = (uint32_t) ngx_next_temp_number(1); n = (uint32_t) ngx_next_temp_number(1);
continue; continue;
} }
@ -692,7 +692,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to, ngx_ext_rename_file_t *ext)
#if (NGX_WIN32) #if (NGX_WIN32)
if (err == NGX_EEXIST) { if (err == NGX_EEXIST || err == NGX_EEXIST_FILE) {
err = ngx_win32_rename_file(src, to, ext->log); err = ngx_win32_rename_file(src, to, ext->log);
if (err == 0) { if (err == 0) {

1
src/os/unix/ngx_errno.h
View File

@ -25,6 +25,7 @@ typedef int ngx_err_t;
#define NGX_EACCES EACCES #define NGX_EACCES EACCES
#define NGX_EBUSY EBUSY #define NGX_EBUSY EBUSY
#define NGX_EEXIST EEXIST #define NGX_EEXIST EEXIST
#define NGX_EEXIST_FILE EEXIST
#define NGX_EXDEV EXDEV #define NGX_EXDEV EXDEV
#define NGX_ENOTDIR ENOTDIR #define NGX_ENOTDIR ENOTDIR
#define NGX_EISDIR EISDIR #define NGX_EISDIR EISDIR

8
src/os/win32/ngx_errno.h
View File

@ -25,8 +25,14 @@ typedef DWORD ngx_err_t;
#define NGX_ENOPATH ERROR_PATH_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 */ /*
* there are two EEXIST error codes:
* ERROR_FILE_EXISTS used by CreateFile(CREATE_NEW),
* and ERROR_ALREADY_EXISTS used by CreateDirectory();
* MoveFile() uses both
*/
#define NGX_EEXIST ERROR_ALREADY_EXISTS #define NGX_EEXIST ERROR_ALREADY_EXISTS
#define NGX_EEXIST_FILE ERROR_FILE_EXISTS
/* /*
* could not found cross volume directory move error code, * could not found cross volume directory move error code,
* so use ERROR_WRONG_DISK as stub one * so use ERROR_WRONG_DISK as stub one