fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Disk (Linux): detect USB devices as external volumes only

Browse Source 
Fixes #559
This commit is contained in:
李通洲
2023-09-18 00:14:05 +08:00
parent d8e4575157
commit 2bb78af1a7
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/disk/disk_linux.c
+11 -8
View File
@@ -87,13 +87,17 @@ static void detectNameFromPath(FFDisk* disk, const struct stat* deviceStat, FFst
closedir(dir);
}
static void detectName(FFDisk* disk, const struct mntent* device)
static void detectName(FFDisk* disk)
{
struct stat deviceStat;
if(stat(device->mnt_fsname, &deviceStat) != 0)
if(stat(disk->mountFrom.chars, &deviceStat) != 0)
return;
FF_STRBUF_AUTO_DESTROY basePath = ffStrbufCreate();
//Detect external devices. Code is put here to reuse deviceStat
FF_STRBUF_AUTO_DESTROY basePath = ffStrbufCreateS("/dev/disk/by-id/");
detectNameFromPath(disk, &deviceStat, &basePath);
disk->type = ffStrbufStartsWithS(&disk->name, "usb-") ? FF_DISK_VOLUME_TYPE_EXTERNAL_BIT : FF_DISK_VOLUME_TYPE_NONE;
ffStrbufClear(&disk->name);
//Try label first
ffStrbufSetS(&basePath, "/dev/disk/by-label/");
@@ -176,12 +180,10 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
return false;
}
static void detectType(const FFlist* disks, FFDisk* currentDisk, const struct mntent* options)
static void detectType(const FFlist* disks, FFDisk* currentDisk)
{
if(isSubvolume(disks, currentDisk))
currentDisk->type = FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
else if(strstr(options->mnt_opts, MNTOPT_NOSUID) != NULL || strstr(options->mnt_opts, "nodev") != NULL)
currentDisk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
else if(ffStrbufStartsWithS(&currentDisk->mountpoint, "/boot") || ffStrbufStartsWithS(&currentDisk->mountpoint, "/efi"))
currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
else
@@ -237,10 +239,11 @@ const char* ffDetectDisksImpl(FFlist* disks)
//detect name
ffStrbufInit(&disk->name);
detectName(disk, device);
detectName(disk); // Also detects external devices
//detect type
detectType(disks, disk, device);
if (disk->type == FF_DISK_VOLUME_TYPE_NONE)
detectType(disks, disk);
//Detects stats
detectStats(disk);