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

Win32: non-ASCII names support in ngx_open_tempfile().

Browse Source 
This makes it possible to use temporary directories with non-ASCII characters,
either explicitly or via a prefix with non-ASCII characters in it.
This commit is contained in:
Maxim Dounin 2023-02-23 20:49:57 +03:00
parent 4d84bc4929
commit 2062ddef39
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,41 @@ failed:
} }
ngx_fd_t
ngx_open_tempfile(u_char *name, ngx_uint_t persistent, ngx_uint_t access)
{
size_t len;
u_short *u;
ngx_fd_t fd;
ngx_err_t err;
u_short utf16[NGX_UTF16_BUFLEN];
len = NGX_UTF16_BUFLEN;
u = ngx_utf8_to_utf16(utf16, name, &len, 0);
if (u == NULL) {
return INVALID_HANDLE_VALUE;
}
fd = CreateFileW(u,
GENERIC_READ|GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
NULL,
CREATE_NEW,
persistent ? 0:
FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE,
NULL);
if (u != utf16) {
err = ngx_errno;
ngx_free(u);
ngx_set_errno(err);
}
return fd;
}
ssize_t ssize_t
ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
{ {

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

@ -90,16 +90,8 @@ ngx_fd_t ngx_open_file(u_char *name, u_long mode, u_long create, u_long access);
#define NGX_FILE_OWNER_ACCESS 0 #define NGX_FILE_OWNER_ACCESS 0
#define ngx_open_tempfile(name, persistent, access) \ ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent,
CreateFile((const char *) name, \ ngx_uint_t access);
GENERIC_READ|GENERIC_WRITE, \
FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \
NULL, \
CREATE_NEW, \
persistent ? 0: \
FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE, \
NULL);
#define ngx_open_tempfile_n "CreateFile()" #define ngx_open_tempfile_n "CreateFile()"