mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete win32 ngx_file_append_mode() as we use reliable

Browse Source 
FILE_APPEND_DATA|SYNCHRONIZE flags
This commit is contained in:
Igor Sysoev 2009-04-08 19:13:28 +00:00
parent 2ec2e35efe
commit a2de7b9b93
3 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/ngx_cycle.c
View File

@ -375,14 +375,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
goto failed;
}
#if (NGX_WIN32)
if (ngx_file_append_mode(file[i].fd) != NGX_OK) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
ngx_file_append_mode_n " \"%s\" failed",
file[i].name.data);
goto failed;
}
#else
#if !(NGX_WIN32)
if (fcntl(file[i].fd, F_SETFD, FD_CLOEXEC) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
"fcntl(FD_CLOEXEC) \"%s\" failed",
@ -1077,21 +1070,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user)
continue;
}
#if (NGX_WIN32)
if (ngx_file_append_mode(fd) == NGX_ERROR) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
ngx_file_append_mode_n " \"%s\" failed",
file[i].name.data);
if (ngx_close_file(fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
ngx_close_file_n " \"%s\" failed",
file[i].name.data);
}
continue;
}
#else
#if !(NGX_WIN32)
if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) {
ngx_file_info_t fi;

25
src/os/win32/ngx_files.c
View File

@ -505,31 +505,6 @@ ngx_de_link_info(u_char *name, ngx_dir_t *dir)
}
ngx_int_t
ngx_file_append_mode(ngx_fd_t fd)
{
#if 0
if (LockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) {
return NGX_ERROR;
}
#endif
if (SetFilePointer(fd, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {
if (ngx_errno != NO_ERROR) {
return NGX_ERROR;
}
}
#if 0
if (UnlockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) {
return NGX_ERROR;
}
#endif
return NGX_OK;
}
ngx_int_t
ngx_directio_on(ngx_fd_t fd)
{

4
src/os/win32/ngx_files.h
View File

@ -73,10 +73,6 @@ ngx_fd_t ngx_open_file(u_char *name, u_long mode, u_long create, u_long access);
#define NGX_FILE_OWNER_ACCESS 0
ngx_int_t ngx_file_append_mode(ngx_fd_t fd);
#define ngx_file_append_mode_n "SetFilePointer()"
#define ngx_open_tempfile(name, persistent, access) \
CreateFile((const char *) name, \
GENERIC_READ|GENERIC_WRITE, \