details: https://hg.nginx.org/nginx/rev/061ec464813f
branches:
changeset: 7433:061ec464813f
user: Maxim Dounin <mdounin@mdounin.ru>
date: Mon Dec 24 21:07:05 2018 +0300
description:
Win32: removed NGX_DIR_MASK concept.

Previous interface of ngx_open_dir() assumed that passed directory name
has a room for NGX_DIR_MASK at the end (NGX_DIR_MASK_LEN bytes). While all
direct users of ngx_dir_open() followed this interface, this also implied
similar requirements for indirect uses - in particular, via ngx_walk_tree().

Currently none of ngx_walk_tree() uses provides appropriate space, and
fixing this does not look like a right way to go. Instead, ngx_dir_open()
interface was changed to not require any additional space and use
appropriate allocations instead.

diffstat:

src/core/ngx_file.c | 4 ++--
src/http/modules/ngx_http_autoindex_module.c | 2 --
src/http/modules/ngx_http_random_index_module.c | 2 +-
src/os/unix/ngx_files.h | 3 ---
src/os/win32/ngx_files.c | 21 ++++++++++++++++++---
src/os/win32/ngx_files.h | 3 ---
6 files changed, 21 insertions(+), 14 deletions(-)

diffs (107 lines):

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -1017,13 +1017,13 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_s

file.len = tree->len + 1 + len;

- if (file.len + NGX_DIR_MASK_LEN > buf.len) {
+ if (file.len > buf.len) {

if (buf.len) {
ngx_free(buf.data);
}

- buf.len = tree->len + 1 + len + NGX_DIR_MASK_LEN;
+ buf.len = tree->len + 1 + len;

buf.data = ngx_alloc(buf.len + 1, ctx->log);
if (buf.data == NULL) {
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c
--- a/src/http/modules/ngx_http_autoindex_module.c
+++ b/src/http/modules/ngx_http_autoindex_module.c
@@ -186,8 +186,6 @@ ngx_http_autoindex_handler(ngx_http_requ
return rc;
}

- /* NGX_DIR_MASK_LEN is lesser than NGX_HTTP_AUTOINDEX_PREALLOCATE */
-
last = ngx_http_map_uri_to_path(r, &path, &root,
NGX_HTTP_AUTOINDEX_PREALLOCATE);
if (last == NULL) {
diff --git a/src/http/modules/ngx_http_random_index_module.c b/src/http/modules/ngx_http_random_index_module.c
--- a/src/http/modules/ngx_http_random_index_module.c
+++ b/src/http/modules/ngx_http_random_index_module.c
@@ -98,7 +98,7 @@ ngx_http_random_index_handler(ngx_http_r
}

#if (NGX_HAVE_D_TYPE)
- len = NGX_DIR_MASK_LEN;
+ len = 0;
#else
len = NGX_HTTP_RANDOM_INDEX_PREALLOCATE;
#endif
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -213,9 +213,6 @@ void ngx_close_file_mapping(ngx_file_map
#endif


-#define NGX_DIR_MASK_LEN 0
-
-
ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
#define ngx_open_dir_n "opendir()"

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -427,16 +427,31 @@ ngx_realpath(u_char *path, u_char *resol
ngx_int_t
ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
{
- ngx_cpystrn(name->data + name->len, NGX_DIR_MASK, NGX_DIR_MASK_LEN + 1);
+ u_char *pattern, *p;
+ ngx_err_t err;
+
+ pattern = malloc(name->len + 3);
+ if (pattern == NULL) {
+ return NGX_ERROR;
+ }

- dir->dir = FindFirstFile((const char *) name->data, &dir->finddata);
+ p = ngx_cpymem(pattern, name->data, name->len);

- name->data[name->len] = '\0';
+ *p++ = '/';
+ *p++ = '*';
+ *p = '\0';
+
+ dir->dir = FindFirstFile((const char *) pattern, &dir->finddata);

if (dir->dir == INVALID_HANDLE_VALUE) {
+ err = ngx_errno;
+ ngx_free(pattern);
+ ngx_set_errno(err);
return NGX_ERROR;
}

+ ngx_free(pattern);
+
dir->valid_info = 1;
dir->ready = 1;

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -181,9 +181,6 @@ u_char *ngx_realpath(u_char *path, u_cha
#define NGX_HAVE_MAX_PATH 1
#define NGX_MAX_PATH MAX_PATH

-#define NGX_DIR_MASK (u_char *) "/*"
-#define NGX_DIR_MASK_LEN 2
-

ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
#define ngx_open_dir_n "FindFirstFile()"
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel