comparison src/os/unix/ngx_files.c @ 408:df7b79c859c3 NGINX_0_7_13

nginx 0.7.13 *) Bugfix: nginx could not be built on Linux and Solaris; the bug had appeared in 0.7.12.
author Igor Sysoev <http://sysoev.ru>
date Tue, 26 Aug 2008 00:00:00 +0400
parents 6ebbca3d5ed7
children 79c5df00501e
comparison
equal deleted inserted replaced
407:d1c2a7a85713 408:df7b79c859c3
278 278
279 279
280 ngx_int_t 280 ngx_int_t
281 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name) 281 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
282 { 282 {
283 if (gl->n < (size_t) gl->pglob.gl_matchc) { 283 size_t count;
284
285 #ifdef GLOB_NOMATCH
286 count = (size_t) gl->pglob.gl_pathc;
287 #else
288 count = (size_t) gl->pglob.gl_matchc;
289 #endif
290
291 if (gl->n < count) {
284 292
285 name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]); 293 name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
286 name->data = (u_char *) gl->pglob.gl_pathv[gl->n]; 294 name->data = (u_char *) gl->pglob.gl_pathv[gl->n];
287 gl->n++; 295 gl->n++;
288 296