commit 44be39475c29e2866f1a2bcd8775ec5e489d1813
author Igor Sysoev <igor@sysoev.ru> Tue Dec 15 13:47:02 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Dec 15 13:47:02 2009 +0000
tree 28c6ba7b1510b4a412d366a588a7b046632f2ae3
parent 29b5a1378460c746a9e9eec7110df31e845b31b2

fix Win32 error messages when an temporary file replaces an existent file:

*) do not rename an already renamed file
*) now ngx_win32_rename_file() returns error code
*) do not log failure inside ngx_win32_rename_file()

src/core/ngx_file.c

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 54adf34..9c8275b 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -591,17 +591,7 @@
 #if (NGX_WIN32)
 
     if (err == NGX_EEXIST) {
-        if (ngx_win32_rename_file(src, to, ext->log) == NGX_OK) {
-
-            if (ngx_rename_file(src->data, to->data) != NGX_FILE_ERROR) {
-                return NGX_OK;
-            }
-
-            err = ngx_errno;
-
-        } else {
-            err = 0;
-        }
+        err = ngx_win32_rename_file(src, to, ext->log);
     }
 
 #endif

src/os/win32/ngx_files.c

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index fab74ae..ee1a784 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -187,17 +187,17 @@
 }
 
 
-ngx_int_t
+ngx_err_t
 ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log)
 {
     u_char             *name;
-    ngx_int_t           rc;
+    ngx_err_t           err;
     ngx_uint_t          collision;
     ngx_atomic_uint_t   num;
 
     name = ngx_alloc(to->len + 1 + 10 + 1 + sizeof("DELETE"), log);
     if (name == NULL) {
-        return NGX_ERROR;
+        return NGX_ENOMEM;
     }
 
     ngx_memcpy(name, to->data, to->len);
@@ -222,10 +222,10 @@
     }
 
     if (MoveFile((const char *) from->data, (const char *) to->data) == 0) {
-        rc = NGX_ERROR;
+        err = ngx_errno;
 
     } else {
-        rc = NGX_OK;
+        err = 0;
     }
 
     if (DeleteFile((const char *) name) == 0) {
@@ -233,17 +233,11 @@
                       "DeleteFile() \"%s\" failed", name);
     }
 
-    if (rc == NGX_ERROR) {
-        ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,
-                      "MoveFile() \"%s\" to \"%s\" failed",
-                      from->data, to->data);
-    }
-
     /* mutex_unlock() */
 
     ngx_free(name);
 
-    return rc;
+    return err;
 }
 
 

src/os/win32/ngx_files.h

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index cc9fa8f..610fcd0 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -111,7 +111,7 @@
 
 #define ngx_rename_file(o, n)       MoveFile((const char *) o, (const char *) n)
 #define ngx_rename_file_n           "MoveFile()"
-ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log);
+ngx_err_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log);