Disk (Windows): don't rely on env vars

CarterLi · CarterLi · commit 9afcc00201b0 · 2024-05-01T19:32:15.000+08:00
diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c
@@ -4,7 +4,6 @@
 
 #include <windows.h>
 #include <winioctl.h>
-#include <assert.h>
 
 const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
 {
@@ -18,8 +17,9 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
     // For cross-platform portability; used by `presets/examples/13.jsonc`
     if (__builtin_expect(options->folders.length == 1 && options->folders.chars[0] == '/', 0))
     {
-        ffStrbufSetS(&options->folders, getenv("SystemDrive"));
-        ffStrbufEnsureEndsWithC(&options->folders, '\\');
+        wchar_t path[MAX_PATH + 1];
+        GetSystemWindowsDirectoryW(path, sizeof(path) / sizeof(*path));
+        ffStrbufSetF(&options->folders, "%c:\\", (char) path[0]);
     }
 
     for(uint32_t i = 0; i < length; i++)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`#include <windows.h>`
`6`	`6`	`#include <winioctl.h>`
`7`		`-#include <assert.h>`
`8`	`7`
`9`	`8`	`const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)`
`10`	`9`	`{`
`@@ -18,8 +17,9 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)`
`18`	`17`	// For cross-platform portability; used by `presets/examples/13.jsonc`
`19`	`18`	`if (__builtin_expect(options->folders.length == 1 && options->folders.chars[0] == '/', 0))`
`20`	`19`	`{`
`21`		`- ffStrbufSetS(&options->folders, getenv("SystemDrive"));`
`22`		`- ffStrbufEnsureEndsWithC(&options->folders, '\\');`
	`20`	`+ wchar_t path[MAX_PATH + 1];`
	`21`	`+ GetSystemWindowsDirectoryW(path, sizeof(path) / sizeof(*path));`
	`22`	`+ ffStrbufSetF(&options->folders, "%c:\\", (char) path[0]);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`for(uint32_t i = 0; i < length; i++)`