Mercurial > hg > nginx

changeset 1632:2142e5cf62da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix win32 glob
author Igor Sysoev <igor@sysoev.ru>
date Sun, 11 Nov 2007 17:50:47 +0000
parents b67b75bb09b7
children 74b2a52bc3c9
files src/os/win32/ngx_files.c src/os/win32/ngx_files.h
diffstat 2 files changed, 47 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -327,12 +327,33 @@ ngx_read_dir(ngx_dir_t *dir)
 ngx_int_t
 ngx_open_glob(ngx_glob_t *gl)
 {
+    u_char  *p;
+    size_t   len;
+
     gl->dir = FindFirstFile((const char *) gl->pattern, &gl->finddata);
 
     if (gl->dir == INVALID_HANDLE_VALUE) {
         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;
 
     return NGX_OK;
@@ -342,19 +363,34 @@ ngx_open_glob(ngx_glob_t *gl)
 ngx_int_t
 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
 {
+    size_t     len;
     ngx_err_t  err;
 
     if (gl->ready) {
-        name->len = ngx_strlen(gl->finddata.cFileName);
-        name->data = (u_char *) gl->finddata.cFileName;
+        *name = gl->name;
 
         gl->ready = 0;
         return NGX_OK;
     }
 
+    ngx_free(gl->name.data);
+    gl->name.data = NULL;
+
     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;
     }
@@ -375,7 +411,11 @@ ngx_read_glob(ngx_glob_t *gl, ngx_str_t 
 void
 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,
                       "FindClose(%s) failed", gl->pattern);
     }
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -185,6 +185,8 @@ typedef struct {
     WIN32_FIND_DATA   finddata;
     ngx_int_t         ready;
     u_char           *pattern;
+    ngx_str_t         name;
+    size_t            last;
     ngx_log_t        *log;
 } ngx_glob_t;