mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 18:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win32: non-ASCII names support in "include" with wildcards.

Browse Source 
Notably, ngx_open_glob() now supports opening directories with non-ASCII
characters, and pathnames returned by ngx_read_glob() are converted to UTF-8.
This commit is contained in:
Maxim Dounin 2023-02-23 20:49:41 +03:00
parent 1f8a66f199
commit 99d5ad72a4
2 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#define NGX_UTF16_BUFLEN 256 #define NGX_UTF16_BUFLEN 256
#define NGX_UTF8_BUFLEN 512
static ngx_int_t ngx_win32_check_filename(u_char *name, u_short *u, static ngx_int_t ngx_win32_check_filename(u_char *name, u_short *u,
size_t len); size_t len);
@ -547,14 +548,27 @@ ngx_open_glob(ngx_glob_t *gl)
{ {
u_char *p; u_char *p;
size_t len; size_t len;
u_short *u;
ngx_err_t err; ngx_err_t err;
u_short utf16[NGX_UTF16_BUFLEN];
gl->dir = FindFirstFile((const char *) gl->pattern, &gl->finddata); len = NGX_UTF16_BUFLEN;
u = ngx_utf8_to_utf16(utf16, gl->pattern, &len, 0);
if (u == NULL) {
return NGX_ERROR;
}
gl->dir = FindFirstFileW(u, &gl->finddata);
if (gl->dir == INVALID_HANDLE_VALUE) { if (gl->dir == INVALID_HANDLE_VALUE) {
err = ngx_errno; err = ngx_errno;
if (u != utf16) {
ngx_free(u);
}
if ((err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND) if ((err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND)
&& gl->test) && gl->test)
{ {
@ -562,6 +576,8 @@ ngx_open_glob(ngx_glob_t *gl)
return NGX_OK; return NGX_OK;
} }
ngx_set_errno(err);
return NGX_ERROR; return NGX_ERROR;
} }
@ -571,18 +587,10 @@ ngx_open_glob(ngx_glob_t *gl)
} }
} }
len = ngx_strlen(gl->finddata.cFileName); if (u != utf16) {
gl->name.len = gl->last + len; ngx_free(u);
gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
if (gl->name.data == NULL) {
return NGX_ERROR;
} }
ngx_memcpy(gl->name.data, gl->pattern, gl->last);
ngx_cpystrn(gl->name.data + gl->last, (u_char *) gl->finddata.cFileName,
len + 1);
gl->ready = 1; gl->ready = 1;
return NGX_OK; return NGX_OK;
@ -592,40 +600,25 @@ ngx_open_glob(ngx_glob_t *gl)
ngx_int_t ngx_int_t
ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name) ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
{ {
size_t len; u_char *p;
ngx_err_t err; size_t len;
ngx_err_t err;
u_char utf8[NGX_UTF8_BUFLEN];
if (gl->no_match) { if (gl->no_match) {
return NGX_DONE; return NGX_DONE;
} }
if (gl->ready) { if (gl->ready) {
*name = gl->name;
gl->ready = 0; gl->ready = 0;
return NGX_OK; goto convert;
} }
ngx_free(gl->name.data); ngx_free(gl->name.data);
gl->name.data = NULL; gl->name.data = NULL;
if (FindNextFile(gl->dir, &gl->finddata) != 0) { if (FindNextFileW(gl->dir, &gl->finddata) != 0) {
goto convert;
len = ngx_strlen(gl->finddata.cFileName);
gl->name.len = gl->last + len;
gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
if (gl->name.data == NULL) {
return NGX_ERROR;
}
ngx_memcpy(gl->name.data, gl->pattern, gl->last);
ngx_cpystrn(gl->name.data + gl->last, (u_char *) gl->finddata.cFileName,
len + 1);
*name = gl->name;
return NGX_OK;
} }
err = ngx_errno; err = ngx_errno;
@ -638,6 +631,43 @@ ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
"FindNextFile(%s) failed", gl->pattern); "FindNextFile(%s) failed", gl->pattern);
return NGX_ERROR; return NGX_ERROR;
convert:
len = NGX_UTF8_BUFLEN;
p = ngx_utf16_to_utf8(utf8, gl->finddata.cFileName, &len, NULL);
if (p == NULL) {
return NGX_ERROR;
}
gl->name.len = gl->last + len - 1;
gl->name.data = ngx_alloc(gl->name.len + 1, gl->log);
if (gl->name.data == NULL) {
goto failed;
}
ngx_memcpy(gl->name.data, gl->pattern, gl->last);
ngx_cpystrn(gl->name.data + gl->last, p, len);
if (p != utf8) {
ngx_free(p);
}
*name = gl->name;
return NGX_OK;
failed:
if (p != utf8) {
err = ngx_errno;
ngx_free(p);
ngx_set_errno(err);
}
return NGX_ERROR;
} }

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

@ -44,7 +44,7 @@ typedef struct {
typedef struct { typedef struct {
HANDLE dir; HANDLE dir;
WIN32_FIND_DATA finddata; WIN32_FIND_DATAW finddata;
unsigned ready:1; unsigned ready:1;
unsigned test:1; unsigned test:1;