PhysicalDisk (NetBSD): honors namePrefix

This commit is contained in:
Carter Li
2026-04-08 14:30:14 +08:00
committed by 李通洲
parent e15049856f
commit ab32056c3f
2 changed files with 10 additions and 1 deletions
@@ -24,6 +24,14 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
char* diskName = NULL;
size_t len = 0;
while (ffStrbufGetdelim(&diskName, &len, ' ', &diskNames)) {
if (options->namePrefix.length && !ffStrbufStartsWith(&(FFstrbuf) {
.chars = diskName,
.length = (uint32_t) len,
},
&options->namePrefix)) {
continue;
}
char devPath[256];
FF_AUTO_CLOSE_FD int f = opendisk(diskName, O_RDONLY, devPath, ARRAY_SIZE(devPath), 0);
if (f < 0) {
@@ -105,6 +113,7 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
ffStrbufAppendNS(&device->name, (uint32_t) ARRAY_SIZE(inquiry.vendor), inquiry.vendor);
ffStrbufTrimRight(&device->name, '\0');
ffStrbufTrimRight(&device->name, ' ');
ffStrbufTrimRight(&device->name, ',');
ffStrbufAppendC(&device->name, ' ');
ffStrbufAppendNS(&device->name, (uint32_t) ARRAY_SIZE(inquiry.product), inquiry.product);
ffStrbufTrimRight(&device->name, '\0');