Win32: ngx_open_dir() and ngx_close_dir() fixes.
The ngx_open_dir() function changed to restore name passed to it. This
fixes removing destination directory in dav module, as caught by dav.t.
The ngx_close_dir() function introduced to properly convert errors, as
FindClose() returns 0 on error.
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 32e28b5..881ffef 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -430,6 +430,8 @@
dir->dir = FindFirstFile((const char *) name->data, &dir->finddata);
+ name->data[name->len] = '\0';
+
if (dir->dir == INVALID_HANDLE_VALUE) {
return NGX_ERROR;
}
@@ -459,6 +461,17 @@
ngx_int_t
+ngx_close_dir(ngx_dir_t *dir)
+{
+ if (FindClose(dir->dir) == 0) {
+ return NGX_ERROR;
+ }
+
+ return NGX_OK;
+}
+
+
+ngx_int_t
ngx_open_glob(ngx_glob_t *gl)
{
u_char *p;
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 08e5dc6..aafb5d0 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -193,7 +193,7 @@
#define ngx_read_dir_n "FindNextFile()"
-#define ngx_close_dir(d) FindClose((d)->dir)
+ngx_int_t ngx_close_dir(ngx_dir_t *dir);
#define ngx_close_dir_n "FindClose()"
