From 34b0bbac263ab2ba953a58d064d146fc0bc33fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 24 Dec 2023 20:52:05 +0800 Subject: [PATCH] PhysicalDisk (Linux): be more careful to detect connection type --- src/detection/physicaldisk/physicaldisk_linux.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c index 89105dbec..52f79ff20 100644 --- a/src/detection/physicaldisk/physicaldisk_linux.c +++ b/src/detection/physicaldisk/physicaldisk_linux.c @@ -70,15 +70,12 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options) ffStrbufInit(&device->interconnect); if (strstr(pathSysDeviceReal, "/usb") != NULL) ffStrbufSetS(&device->interconnect, "usb"); + if (strstr(pathSysDeviceReal, "/ata") != NULL) + ffStrbufSetS(&device->interconnect, "ata"); else { snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/transport", devName); - if (!ffAppendFileBuffer(pathSysBlock, &device->interconnect)) - { - snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/uevent", devName); - if (ffParsePropFile(pathSysBlock, "DEVTYPE=", &device->interconnect)) - ffStrbufSubstrBeforeLastC(&device->interconnect, '_'); - } + ffAppendFileBuffer(pathSysBlock, &device->interconnect); } }