# HG changeset patch # User Maxim Dounin <mdou...@mdounin.ru> # Date 1673548994 -10800 # Thu Jan 12 21:43:14 2023 +0300 # Node ID e62c8e9724ba68a698a2c3613edca73fe4e1c4ae # Parent 718bf1f036e6e00f09bb4569b124540ed3153392 Win32: non-ASCII names support in ngx_open_tempfile().
This makes it possible to use temporary directories with non-ASCII characters, either explicitly or via a prefix with non-ASCII characters in it. diff -r 718bf1f036e6 -r e62c8e9724ba src/os/win32/ngx_files.c --- a/src/os/win32/ngx_files.c Thu Jan 12 21:43:02 2023 +0300 +++ b/src/os/win32/ngx_files.c Thu Jan 12 21:43:14 2023 +0300 @@ -62,6 +62,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 ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset) { diff -r 718bf1f036e6 -r e62c8e9724ba src/os/win32/ngx_files.h --- a/src/os/win32/ngx_files.h Thu Jan 12 21:43:02 2023 +0300 +++ b/src/os/win32/ngx_files.h Thu Jan 12 21:43:14 2023 +0300 @@ -90,16 +90,8 @@ ngx_fd_t ngx_open_file(u_char *name, u_l #define NGX_FILE_OWNER_ACCESS 0 -#define ngx_open_tempfile(name, persistent, access) \ - CreateFile((const char *) name, \ - 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); - +ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent, + ngx_uint_t access); #define ngx_open_tempfile_n "CreateFile()" _______________________________________________ nginx-devel mailing list nginx-devel@nginx.org https://mailman.nginx.org/mailman/listinfo/nginx-devel