mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-09 19:12:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix building on FreeBSD prior to 4.8, it has no GLOB_NOMATCH

Browse Source
This commit is contained in:
Igor Sysoev 2008-08-22 12:54:32 +00:00
parent c5849a6381
commit 843ad94e81
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/unix/ngx_files.c
View File

@ -265,10 +265,14 @@ ngx_open_glob(ngx_glob_t *gl)
return NGX_OK; return NGX_OK;
} }
#ifdef GLOB_NOMATCH
if (n == GLOB_NOMATCH && gl->test) { if (n == GLOB_NOMATCH && gl->test) {
return NGX_OK; return NGX_OK;
} }
#endif
return NGX_ERROR; return NGX_ERROR;
} }
@ -276,7 +280,7 @@ 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_pathc) { if (gl->n < (size_t) gl->pglob.gl_matchc) {
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];