# HG changeset patch # User Maxim Dounin <mdou...@mdounin.ru> # Date 1673548978 -10800 # Thu Jan 12 21:42:58 2023 +0300 # Node ID d680dedf87fb861f6265218b5d53b49e951947e0 # Parent c86a1405cba4d5c1be6d1bbf3160ba567b3c6f50 Win32: non-ASCII names support in ngx_delete_file().
This makes it possible to delete files with non-ASCII characters when using the dav module (ticket #1433). diff -r c86a1405cba4 -r d680dedf87fb src/os/win32/ngx_files.c --- a/src/os/win32/ngx_files.c Thu Jan 12 21:42:52 2023 +0300 +++ b/src/os/win32/ngx_files.c Thu Jan 12 21:42:58 2023 +0300 @@ -206,6 +206,42 @@ ngx_write_console(ngx_fd_t fd, void *buf } +ngx_int_t +ngx_delete_file(u_char *name) +{ + long rc; + size_t len; + u_short *u; + 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 NGX_FILE_ERROR; + } + + rc = NGX_FILE_ERROR; + + if (ngx_win32_check_filename(u, len, 0) != NGX_OK) { + goto failed; + } + + rc = DeleteFileW(u); + +failed: + + if (u != utf16) { + err = ngx_errno; + ngx_free(u); + ngx_set_errno(err); + } + + return rc; +} + + ngx_err_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log) { diff -r c86a1405cba4 -r d680dedf87fb src/os/win32/ngx_files.h --- a/src/os/win32/ngx_files.h Thu Jan 12 21:42:52 2023 +0300 +++ b/src/os/win32/ngx_files.h Thu Jan 12 21:42:58 2023 +0300 @@ -123,7 +123,7 @@ ssize_t ngx_write_console(ngx_fd_t fd, v #define NGX_LINEFEED CRLF -#define ngx_delete_file(name) DeleteFile((const char *) name) +ngx_int_t ngx_delete_file(u_char *name); #define ngx_delete_file_n "DeleteFile()" _______________________________________________ nginx-devel mailing list nginx-devel@nginx.org https://mailman.nginx.org/mailman/listinfo/nginx-devel