Mercurial > hg > nginx

changeset 6468:a5897d360977

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: additional error code NGX_EEXIST_FILE (ticket #910). 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.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 29 Mar 2016 09:51:46 +0300
parents 91c8d990fb45
children 7cdf612fd58c
files src/core/ngx_file.c src/os/unix/ngx_errno.h src/os/win32/ngx_errno.h
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_file.c	Mon Mar 28 19:50:19 2016 +0300
+++ b/src/core/ngx_file.c	Tue Mar 29 09:51:46 2016 +0300
@@ -196,7 +196,7 @@
 
         err = ngx_errno;
 
-        if (err == NGX_EEXIST) {
+        if (err == NGX_EEXIST_FILE) {
             n = (uint32_t) ngx_next_temp_number(1);
             continue;
         }
@@ -692,7 +692,7 @@
 
 #if (NGX_WIN32)
 
-    if (err == NGX_EEXIST) {
+    if (err == NGX_EEXIST || err == NGX_EEXIST_FILE) {
         err = ngx_win32_rename_file(src, to, ext->log);
 
         if (err == 0) {
--- a/src/os/unix/ngx_errno.h	Mon Mar 28 19:50:19 2016 +0300
+++ b/src/os/unix/ngx_errno.h	Tue Mar 29 09:51:46 2016 +0300
@@ -25,6 +25,7 @@
 #define NGX_EACCES        EACCES
 #define NGX_EBUSY         EBUSY
 #define NGX_EEXIST        EEXIST
+#define NGX_EEXIST_FILE   EEXIST
 #define NGX_EXDEV         EXDEV
 #define NGX_ENOTDIR       ENOTDIR
 #define NGX_EISDIR        EISDIR
--- a/src/os/win32/ngx_errno.h	Mon Mar 28 19:50:19 2016 +0300
+++ b/src/os/win32/ngx_errno.h	Tue Mar 29 09:51:46 2016 +0300
@@ -25,8 +25,14 @@
 #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 */
+/*
+ * 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_FILE            ERROR_FILE_EXISTS
 /*
  * could not found cross volume directory move error code,
  * so use ERROR_WRONG_DISK as stub one