From: Maxim Dounin <mdounin@mdounin.ru>
Date: Thu, 23 Feb 2023 17:50:00 +0000 (+0300)
Subject: Win32: removed attempt to use a drive letter in ngx_fs_bsize().
X-Git-Tag: release-1.23.4~15
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=6c5fe80bc69b12cc2bd0e8ed7bc67b240795f66b;p=nginx.git

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 ':'.
---

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;
     }