Welcome! Log In Create A New Profile

Advanced

[PATCH 09 of 12] Win32: non-ASCII names support in ngx_rename_file()

Maxim Dounin
January 12, 2023 04:40PM
# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1673548982 -10800
# Thu Jan 12 21:43:02 2023 +0300
# Node ID 718bf1f036e6e00f09bb4569b124540ed3153392
# Parent d680dedf87fb861f6265218b5d53b49e951947e0
Win32: non-ASCII names support in ngx_rename_file().

This makes it possible to upload files with non-ASCII characters
when using the dav module (ticket #1433).

diff -r d680dedf87fb -r 718bf1f036e6 src/os/win32/ngx_files.c
--- a/src/os/win32/ngx_files.c Thu Jan 12 21:42:58 2023 +0300
+++ b/src/os/win32/ngx_files.c Thu Jan 12 21:43:02 2023 +0300
@@ -242,6 +242,61 @@ failed:
}


+ngx_int_t
+ngx_rename_file(u_char *from, u_char *to)
+{
+ long rc;
+ size_t len;
+ u_short *fu, *tu;
+ ngx_err_t err;
+ u_short utf16f[NGX_UTF16_BUFLEN];
+ u_short utf16t[NGX_UTF16_BUFLEN];
+
+ len = NGX_UTF16_BUFLEN;
+ fu = ngx_utf8_to_utf16(utf16f, from, &len, 0);
+
+ if (fu == NULL) {
+ return NGX_FILE_ERROR;
+ }
+
+ rc = NGX_FILE_ERROR;
+ tu = NULL;
+
+ if (ngx_win32_check_filename(fu, len, 0) != NGX_OK) {
+ goto failed;
+ }
+
+ len = NGX_UTF16_BUFLEN;
+ tu = ngx_utf8_to_utf16(utf16t, to, &len, 0);
+
+ if (tu == NULL) {
+ goto failed;
+ }
+
+ if (ngx_win32_check_filename(tu, len, 1) != NGX_OK) {
+ goto failed;
+ }
+
+ rc = MoveFileW(fu, tu);
+
+failed:
+
+ if (fu != utf16f) {
+ err = ngx_errno;
+ ngx_free(fu);
+ ngx_set_errno(err);
+ }
+
+ if (tu && tu != utf16t) {
+ err = ngx_errno;
+ ngx_free(tu);
+ 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 d680dedf87fb -r 718bf1f036e6 src/os/win32/ngx_files.h
--- a/src/os/win32/ngx_files.h Thu Jan 12 21:42:58 2023 +0300
+++ b/src/os/win32/ngx_files.h Thu Jan 12 21:43:02 2023 +0300
@@ -127,7 +127,7 @@ ngx_int_t ngx_delete_file(u_char *name);
#define ngx_delete_file_n "DeleteFile()"


-#define ngx_rename_file(o, n) MoveFile((const char *) o, (const char *) n)
+ngx_int_t ngx_rename_file(u_char *from, u_char *to);
#define ngx_rename_file_n "MoveFile()"
ngx_err_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log);

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[PATCH 00 of 12] win32 non-ASCII names support fixes

Maxim Dounin 158 January 12, 2023 04:40PM

[PATCH 03 of 12] Win32: non-ASCII directory names support in ngx_getcwd()

Maxim Dounin 14 January 12, 2023 04:40PM

[PATCH 01 of 12] Win32: non-ASCII names support in autoindex (ticket #458)

Maxim Dounin 11 January 12, 2023 04:40PM

[PATCH 02 of 12] Win32: non-ASCII names support in "include" with wildcards

Maxim Dounin 16 January 12, 2023 04:40PM

[PATCH 04 of 12] Win32: non-ASCII directory names support in ngx_create_dir()

Maxim Dounin 19 January 12, 2023 04:40PM

[PATCH 05 of 12] Win32: non-ASCII directory names support in ngx_delete_dir()

Maxim Dounin 9 January 12, 2023 04:40PM

[PATCH 06 of 12] Win32: reworked ngx_win32_rename_file() to check errors

Maxim Dounin 13 January 12, 2023 04:40PM

[PATCH 07 of 12] Win32: reworked ngx_win32_rename_file() to use nginx wrappers

Maxim Dounin 8 January 12, 2023 04:40PM

[PATCH 09 of 12] Win32: non-ASCII names support in ngx_rename_file()

Maxim Dounin 22 January 12, 2023 04:40PM

[PATCH 10 of 12] Win32: non-ASCII names support in ngx_open_tempfile()

Maxim Dounin 13 January 12, 2023 04:40PM

[PATCH 08 of 12] Win32: non-ASCII names support in ngx_delete_file()

Maxim Dounin 7 January 12, 2023 04:40PM

[PATCH 12 of 12] Win32: non-ASCII names in ngx_fs_bsize(), ngx_fs_available()

Maxim Dounin 13 January 12, 2023 04:40PM

[PATCH 11 of 12] Win32: fixed ngx_fs_bsize() for symlinks

Maxim Dounin 14 January 12, 2023 04:40PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 104
Record Number of Users: 6 on February 13, 2018
Record Number of Guests: 421 on December 02, 2018
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready