Mercurial > hg > nginx

diff src/os/unix/ngx_files.c @ 2199:ffb512f0eabd
fix building on FreeBSD prior to 4.8, it has no GLOB_NOMATCH
author: Igor Sysoev <igor@sysoev.ru>
date: Fri, 22 Aug 2008 12:54:32 +0000
parents: 25add486e7aa
children: 2cae41e51622
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -265,10 +265,14 @@ ngx_open_glob(ngx_glob_t *gl)
         return NGX_OK;
     }
 
+#ifdef GLOB_NOMATCH
+
     if (n == GLOB_NOMATCH && gl->test) {
         return NGX_OK;
     }
 
+#endif
+
     return NGX_ERROR;
 }
 
@@ -276,7 +280,7 @@ ngx_open_glob(ngx_glob_t *gl)
 ngx_int_t
 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->data = (u_char *) gl->pglob.gl_pathv[gl->n];