comparison src/os/win32/ngx_files.h @ 7433:061ec464813f

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Dec 2018 21:07:05 +0300
parents db138b3b645e
children ccb5ff87ab3e
comparison
equal deleted inserted replaced
7432:ecc97cb0eda4 7433:061ec464813f
179 #define ngx_path_separator(c) ((c) == '/' || (c) == '\\') 179 #define ngx_path_separator(c) ((c) == '/' || (c) == '\\')
180 180
181 #define NGX_HAVE_MAX_PATH 1 181 #define NGX_HAVE_MAX_PATH 1
182 #define NGX_MAX_PATH MAX_PATH 182 #define NGX_MAX_PATH MAX_PATH
183 183
184 #define NGX_DIR_MASK (u_char *) "/*"
185 #define NGX_DIR_MASK_LEN 2
186
187 184
188 ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir); 185 ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
189 #define ngx_open_dir_n "FindFirstFile()" 186 #define ngx_open_dir_n "FindFirstFile()"
190 187
191 188