diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2023-02-23 20:50:00 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2023-02-23 20:50:00 +0300 |
commit | 6c5fe80bc69b12cc2bd0e8ed7bc67b240795f66b (patch) | |
tree | 90418a5614716baa21e6dc8e644c44703ae0c769 | |
parent | 2062ddef3989525e22445b1965220ffaf8e161c9 (diff) | |
download | nginx-6c5fe80bc69b12cc2bd0e8ed7bc67b240795f66b.tar.gz |
Win32: removed attempt to use a drive letter in ngx_fs_bsize().
Just a drive letter might not correctly represent file system being used,
notably when using symlinks (as created by "mklink /d"). As such, instead
of trying to call GetDiskFreeSpace() with just a drive letter, we now always
use GetDiskFreeSpace() with full path.
Further, it looks like the code to use just a drive letter never worked,
since it tried to test name[2] instead of name[1] to be ':'.
-rw-r--r-- | src/os/win32/ngx_files.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index 6f57a1775..3e0037859 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -967,14 +967,8 @@ ngx_directio_off(ngx_fd_t fd) size_t ngx_fs_bsize(u_char *name) { - u_char root[4]; u_long sc, bs, nfree, ncl; - if (name[2] == ':') { - ngx_cpystrn(root, name, 4); - name = root; - } - if (GetDiskFreeSpace((const char *) name, &sc, &bs, &nfree, &ncl) == 0) { return 512; } |