Disk (Windows): add --disk-ignore-remote

This commit is contained in:
李通洲
2024-04-29 23:28:20 +08:00
parent c597b7ec3a
commit c71b04ba93
9 changed files with 38 additions and 6 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
#include "disk.h"
const char* ffDetectDisksImpl(FFlist* disks);
const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks);
static int compareDisks(const FFDisk* disk1, const FFDisk* disk2)
{
@@ -9,7 +9,7 @@ static int compareDisks(const FFDisk* disk1, const FFDisk* disk2)
const char* ffDetectDisks(FFDiskOptions* options, FFlist* disks)
{
const char* error = ffDetectDisksImpl(disks);
const char* error = ffDetectDisksImpl(options, disks);
if (error) return error;
if (disks->length == 0) return "No disks found";
+1 -1
View File
@@ -90,7 +90,7 @@ void detectFsInfo(struct statfs* fs, FFDisk* disk)
}
#endif
const char* ffDetectDisksImpl(FFlist* disks)
const char* ffDetectDisksImpl(FF_MAYBE_UNUSED FFDiskOptions* options, FFlist* disks)
{
int size = getfsstat(NULL, 0, MNT_WAIT);
+1 -1
View File
@@ -250,7 +250,7 @@ static void detectStats(FFDisk* disk)
#endif
}
const char* ffDetectDisksImpl(FFlist* disks)
const char* ffDetectDisksImpl(FF_MAYBE_UNUSED FFDiskOptions* options, FFlist* disks)
{
FILE* mountsFile = setmntent("/proc/mounts", "r");
if(mountsFile == NULL)
+2 -2
View File
@@ -6,7 +6,7 @@
#include <winioctl.h>
#include <assert.h>
const char* ffDetectDisksImpl(FFlist* disks)
const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
{
wchar_t buf[MAX_PATH + 1];
uint32_t length = GetLogicalDriveStringsW(sizeof(buf) / sizeof(*buf), buf);
@@ -18,7 +18,7 @@ const char* ffDetectDisksImpl(FFlist* disks)
wchar_t* mountpoint = buf + i;
UINT driveType = GetDriveTypeW(mountpoint);
if(driveType == DRIVE_NO_ROOT_DIR)
if(driveType == DRIVE_NO_ROOT_DIR || (driveType == DRIVE_REMOTE && options->ignoreRemote))
{
i += (uint32_t)wcslen(mountpoint);
continue;