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

fix win32 glob

Browse Source
This commit is contained in:
Igor Sysoev 2007-11-11 17:50:47 +00:00
parent d7a7bedeb6
commit 2afdfdcadb
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,12 +327,33 @@ ngx_read_dir(ngx_dir_t *dir)
ngx_int_t ngx_int_t
ngx_open_glob(ngx_glob_t *gl) ngx_open_glob(ngx_glob_t *gl)
{ {
u_char *p;
size_t len;
gl->dir = FindFirstFile((const char *) gl->pattern, &gl->finddata); gl->dir = FindFirstFile((const char *) gl->pattern, &gl->finddata);
if (gl->dir == INVALID_HANDLE_VALUE) { if (gl->dir == INVALID_HANDLE_VALUE) {
return NGX_ERROR; return NGX_ERROR;
} }
for (p = gl->pattern; *p; p++) {
if (*p == '/') {
gl->last = p + 1 - gl->pattern;
}
}
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);
gl->ready = 1; gl->ready = 1;
return NGX_OK; return NGX_OK;
@ -342,19 +363,34 @@ 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;
ngx_err_t err; ngx_err_t err;
if (gl->ready) { if (gl->ready) {
name->len = ngx_strlen(gl->finddata.cFileName); *name = gl->name;
name->data = (u_char *) gl->finddata.cFileName;
gl->ready = 0; gl->ready = 0;
return NGX_OK; return NGX_OK;
} }
ngx_free(gl->name.data);
gl->name.data = NULL;
if (FindNextFile(gl->dir, &gl->finddata) != 0) { if (FindNextFile(gl->dir, &gl->finddata) != 0) {
name->len = ngx_strlen(gl->finddata.cFileName);
name->data = (u_char *) gl->finddata.cFileName; 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; return NGX_OK;
} }
@ -375,7 +411,11 @@ ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
void void
ngx_close_glob(ngx_glob_t *gl) ngx_close_glob(ngx_glob_t *gl)
{ {
if (FindClose(gl->dir) != 0) { if (gl->name.data) {
ngx_free(gl->name.data);
}
if (FindClose(gl->dir) == 0) {
ngx_log_error(NGX_LOG_ALERT, gl->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, gl->log, ngx_errno,
"FindClose(%s) failed", gl->pattern); "FindClose(%s) failed", gl->pattern);
} }

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

@ -185,6 +185,8 @@ typedef struct {
WIN32_FIND_DATA finddata; WIN32_FIND_DATA finddata;
ngx_int_t ready; ngx_int_t ready;
u_char *pattern; u_char *pattern;
ngx_str_t name;
size_t last;
ngx_log_t *log; ngx_log_t *log;
} ngx_glob_t; } ngx_glob_t;