adopt NGX_FILE_TRUNCATE for win32

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index d566f850cb98563b8e6f7065d14cdb57e1852e4c..8635895e1516b1a30f29179abcd5ca70886bc8a6 100644 (file)
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -930,7 +930,7 @@ ngx_int_t
 ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log)
 {
     size_t            len;
-    ngx_uint_t        trunc;
+    ngx_uint_t        create;
     ngx_file_t        file;
     u_char            pid[NGX_INT64_LEN + 2];
 
@@ -939,11 +939,10 @@ ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log)
     file.name = *name;
     file.log = log;
 
-    trunc = ngx_test_config ? 0 : NGX_FILE_TRUNCATE;
+    create = ngx_test_config ? NGX_FILE_CREATE_OR_OPEN : NGX_FILE_TRUNCATE;
 
     file.fd = ngx_open_file(file.name.data, NGX_FILE_RDWR,
-                            NGX_FILE_CREATE_OR_OPEN|trunc,
-                            NGX_FILE_DEFAULT_ACCESS);
+                            create, NGX_FILE_DEFAULT_ACCESS);
 
     if (file.fd == NGX_INVALID_FILE) {
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 982ab12b3277604fab9d73681287fa41e895528e..c4d2b7f327345eb627f723cf5a378cc5a8ad7b33 100644 (file)
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -63,7 +63,7 @@ typedef struct {
 #define NGX_FILE_RDWR            O_RDWR
 #define NGX_FILE_CREATE_OR_OPEN  O_CREAT
 #define NGX_FILE_OPEN            0
-#define NGX_FILE_TRUNCATE        O_TRUNC
+#define NGX_FILE_TRUNCATE        O_CREAT|O_TRUNC
 #define NGX_FILE_APPEND          O_WRONLY|O_APPEND
 
 #define NGX_FILE_DEFAULT_ACCESS  0644

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 5efd0fe1a3d95f47a7b82862bca493bcf818058b..2efbc204362db197534f34dc73255916789c0aba 100644 (file)
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -67,6 +67,7 @@ ngx_fd_t ngx_open_file(u_char *name, u_long mode, u_long create, u_long access);
 
 #define NGX_FILE_CREATE_OR_OPEN     OPEN_ALWAYS
 #define NGX_FILE_OPEN               OPEN_EXISTING
+#define NGX_FILE_TRUNCATE           CREATE_ALWAYS
 
 #define NGX_FILE_DEFAULT_ACCESS     0
 #define NGX_FILE_OWNER_ACCESS       0