starred/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-03 05:32:34 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

PhysicalDisk (Linux): simplify

Browse Source
This commit is contained in:
Carter Li
2024-10-15 10:29:50 +08:00
parent e73d6db2e5
commit b5a9d64e75
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/physicaldisk/physicaldisk_linux.c
+23 -25
View File
@@ -28,10 +28,10 @@ static double detectNvmeTemp(int devfd)
return FF_PHYSICALDISK_TEMP_UNSET; return FF_PHYSICALDISK_TEMP_UNSET;
} }
static void parsePhysicalDisk(int dfd, const char* devName, const char* pathSysDeviceReal, FFPhysicalDiskOptions* options, FFlist* result) static void parsePhysicalDisk(int dfd, const char* devName, FFPhysicalDiskOptions* options, FFlist* result)
{ {
int devfd = openat(dfd, "device", O_RDONLY | O_CLOEXEC); int devfd = openat(dfd, "device", O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
if (devfd < 0) return; if (devfd < 0) return; // virtual device
FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate(); FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
@@ -80,18 +80,25 @@ static void parsePhysicalDisk(int dfd, const char* devName, const char* pathSysD
{ {
ffStrbufInit(&device->interconnect); ffStrbufInit(&device->interconnect);
if (strstr(pathSysDeviceReal, "/usb") != NULL) char pathSysDeviceReal[PATH_MAX];
ffStrbufSetS(&device->interconnect, "USB"); ssize_t pathLength = readlinkat(dfd, "device", pathSysDeviceReal, sizeof(pathSysDeviceReal) - 1);
else if (strstr(pathSysDeviceReal, "/nvme") != NULL) if (pathLength > 0)
ffStrbufSetS(&device->interconnect, "NVMe");
else if (strstr(pathSysDeviceReal, "/ata") != NULL)
ffStrbufSetS(&device->interconnect, "ATA");
else if (strstr(pathSysDeviceReal, "/scsi") != NULL)
ffStrbufSetS(&device->interconnect, "SCSI");
else
{ {
if (ffAppendFileBufferRelative(devfd, "transport", &device->interconnect)) pathSysDeviceReal[pathLength] = '\0';
ffStrbufTrimRightSpace(&device->interconnect);
if (strstr(pathSysDeviceReal, "/usb") != NULL)
ffStrbufSetS(&device->interconnect, "USB");
else if (strstr(pathSysDeviceReal, "/nvme") != NULL)
ffStrbufSetS(&device->interconnect, "NVMe");
else if (strstr(pathSysDeviceReal, "/ata") != NULL)
ffStrbufSetS(&device->interconnect, "ATA");
else if (strstr(pathSysDeviceReal, "/scsi") != NULL)
ffStrbufSetS(&device->interconnect, "SCSI");
else
{
if (ffAppendFileBufferRelative(devfd, "transport", &device->interconnect))
ffStrbufTrimRightSpace(&device->interconnect);
}
} }
} }
@@ -165,17 +172,8 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
char pathSysBlock[sizeof("/sys/block/") + sizeof(sysBlockEntry->d_name)]; char pathSysBlock[sizeof("/sys/block/") + sizeof(sysBlockEntry->d_name)];
snprintf(pathSysBlock, sizeof(pathSysBlock), "/sys/block/%s", devName); snprintf(pathSysBlock, sizeof(pathSysBlock), "/sys/block/%s", devName);
char pathSysDeviceReal[PATH_MAX]; int dfd = openat(dirfd(sysBlockDirp), devName, O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
ssize_t pathLength = readlink(pathSysBlock, pathSysDeviceReal, sizeof(pathSysDeviceReal) - 1); if (dfd > 0) parsePhysicalDisk(dfd, devName, options, result);
if (pathLength < 0)
continue;
pathSysDeviceReal[pathLength] = '\0';
if (strstr(pathSysDeviceReal, "/virtual/")) // virtual device
continue;
int dfd = openat(dirfd(sysBlockDirp), devName, O_RDONLY | O_CLOEXEC);
if (dfd > 0) parsePhysicalDisk(dfd, devName, pathSysDeviceReal, options, result);
} }
return NULL; return NULL;