Mercurial > hg > nginx

changeset 6469:7cdf612fd58c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: replaced NGX_EXDEV with more appropriate error code. Correct error code for NGX_EXDEV on Windows is ERROR_NOT_SAME_DEVICE, "The system cannot move the file to a different disk drive". Previously used ERROR_WRONG_DISK is about wrong diskette in the drive and is not appropriate. There is no real difference though, as MoveFile() is able to copy files between disk drives, and will fail with ERROR_ACCESS_DENIED when asked to copy directories. The ERROR_NOT_SAME_DEVICE error is only used by MoveFileEx() when called without the MOVEFILE_COPY_ALLOWED flag.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 29 Mar 2016 09:52:15 +0300
parents a5897d360977
children 62d950bc0f15
files src/os/win32/ngx_errno.h
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/win32/ngx_errno.h
+++ b/src/os/win32/ngx_errno.h
@@ -33,11 +33,7 @@ typedef DWORD                      ngx_e
  */
 #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
- */
-#define NGX_EXDEV                  ERROR_WRONG_DISK
+#define NGX_EXDEV                  ERROR_NOT_SAME_DEVICE
 #define NGX_ENOTDIR                ERROR_PATH_NOT_FOUND
 #define NGX_EISDIR                 ERROR_CANNOT_MAKE
 #define NGX_ENOSPC                 ERROR_DISK_FULL