mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
fix build on Linux and Solaris introduced in r2200
This commit is contained in:
parent
e56cc8e503
commit
316eafb88d
@ -280,7 +280,15 @@ 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)
|
||||||
{
|
{
|
||||||
if (gl->n < (size_t) gl->pglob.gl_matchc) {
|
size_t count;
|
||||||
|
|
||||||
|
#ifdef GLOB_NOMATCH
|
||||||
|
count = (size_t) gl->pglob.gl_pathc;
|
||||||
|
#else
|
||||||
|
count = (size_t) gl->pglob.gl_matchc;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (gl->n < count) {
|
||||||
|
|
||||||
name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
|
name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
|
||||||
name->data = (u_char *) gl->pglob.gl_pathv[gl->n];
|
name->data = (u_char *) gl->pglob.gl_pathv[gl->n];
|
||||||
|
Loading…
Reference in New Issue
Block a user