aaru-dps/aaruremote
1
0
Fork 0
mirror of https://github.com/aaru-dps/aaruremote.git synced 2025-12-16 19:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass a temporary DeviceContext to GetDeviceType.

Browse Source
This commit is contained in:
blitter
2022-12-04 14:54:51 -08:00
parent bdd467547a
commit 743f909317
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
linux/list_devices.c
View File

@@ -49,6 +49,8 @@ DeviceInfoList* ListDevices()
udev = udev_new();
has_udev = udev != 0;
#else
DeviceContext tmp_ctx;
#endif
dir = opendir(PATH_SYS_DEVBLOCK);
@@ -137,11 +139,10 @@ DeviceInfoList* ListDevices()
#else // Use sysfs
if(!has_udev && !strstr(dirent->d_name, "loop"))
{
tmp_string = malloc(1024);
memset((void*)tmp_string, 0, 1024);
snprintf((char*)tmp_string, 1024, "/dev/%s", dirent->d_name);
memset((void*)tmp_ctx.device_path, 0, 4096);
snprintf((char*)tmp_ctx.device_path, 4096, "/dev/%s", dirent->d_name);
switch(GetDeviceType(tmp_string))
switch(GetDeviceType(&tmp_ctx))
{
case AARUREMOTE_DEVICE_TYPE_ATA: strncpy(list_next->this.bus, "ATA", 256); break;
case AARUREMOTE_DEVICE_TYPE_ATAPI: strncpy(list_next->this.bus, "ATAPI", 256); break;
@@ -149,6 +150,7 @@ DeviceInfoList* ListDevices()
case AARUREMOTE_DEVICE_TYPE_SECURE_DIGITAL: strncpy(list_next->this.bus, "MMC/SD", 256); break;
case AARUREMOTE_DEVICE_TYPE_NVME: strncpy(list_next->this.bus, "NVMe", 256); break;
case AARUREMOTE_DEVICE_TYPE_SCSI:
tmp_string = malloc(1024);
memset((void*)tmp_string, 0, 1024);
snprintf((char*)tmp_string, 1024, "%s/%s/device", PATH_SYS_DEVBLOCK, dirent->d_name);
line_str = malloc(1024);
@@ -208,11 +210,10 @@ DeviceInfoList* ListDevices()
free(line_str);
}
free((void*)tmp_string);
break;
default: memset(&list_next->this.bus, 0, 256); break;
}
free((void*)tmp_string);
}
#endif