webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Improve formatting of disk vendors/models.

Browse Source
This commit is contained in:
Michael Tremer
2014-07-30 23:14:17 +02:00
parent b83b8f7092
commit 4c812463e4
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/installer/hw.c
View File

@@ -228,10 +228,11 @@ struct hw_disk** hw_find_disks(struct hw* hw) {
vendor = udev_device_get_sysattr_value(dev, "vendor"); vendor = udev_device_get_sysattr_value(dev, "vendor");
if (!vendor) if (!vendor)
vendor = udev_device_get_sysattr_value(dev, "manufacturer"); vendor = udev_device_get_sysattr_value(dev, "manufacturer");
if (!vendor)
vendor = "N/A";
strncpy(disk->vendor, vendor, sizeof(disk->vendor)); if (vendor)
strncpy(disk->vendor, vendor, sizeof(disk->vendor));
else
*disk->vendor = '\0';
// Model // Model
const char* model = udev_device_get_property_value(dev, "ID_MODEL"); const char* model = udev_device_get_property_value(dev, "ID_MODEL");
@@ -239,14 +240,28 @@ struct hw_disk** hw_find_disks(struct hw* hw) {
model = udev_device_get_sysattr_value(dev, "model"); model = udev_device_get_sysattr_value(dev, "model");
if (!model) if (!model)
model = udev_device_get_sysattr_value(dev, "product"); model = udev_device_get_sysattr_value(dev, "product");
if (!model)
model = "N/A";
strncpy(disk->model, model, sizeof(disk->model)); if (model)
strncpy(disk->model, model, sizeof(disk->model));
else
*disk->model = '\0';
snprintf(disk->description, sizeof(disk->description), // Format description
"%4.1fGB %s - %s", (double)disk->size / pow(1024, 3), char size_str[STRING_SIZE];
disk->vendor, disk->model); snprintf(size_str, sizeof(size_str), "%4.1fGB", (double)disk->size / pow(1024, 3));
if (*disk->vendor && *disk->model) {
snprintf(disk->description, sizeof(disk->description),
"%s | %s - %s", size_str, disk->vendor, disk->model);
} else if (*disk->vendor || *disk->model) {
snprintf(disk->description, sizeof(disk->description),
"%s | %s", size_str, (*disk->vendor) ? disk->vendor : disk->model);
} else {
snprintf(disk->description, sizeof(disk->description),
"%s | N/A", size_str);
}
*disks++ = disk; *disks++ = disk;