From 6dd14fed6db519a2feb77a5b2b6e73ff03c4d043 Mon Sep 17 00:00:00 2001 From: jamesbond Date: Mon, 28 Jul 2014 17:01:25 +0000 Subject: revert commit [d5afcb6851]; fix the real cause of missing RAM display (use moreinfo_lookup rather than hi_more_info); fix usb display crashing (util.c now looks for lsusb in /usr/sbin first); fix glibc version not showing (glibc located in /lib64/libc.so.6); initial support for DDR3 spd-decoding (incomplete, the manufacturer is not shown yet). --- modules/devices/usb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/devices/usb.c') diff --git a/modules/devices/usb.c b/modules/devices/usb.c index b8d9e305..3452932a 100644 --- a/modules/devices/usb.c +++ b/modules/devices/usb.c @@ -244,7 +244,7 @@ gboolean __scan_usb_procfs(void) return n > 0; } -void __scan_usb_lsusb_add_device(char *buffer, FILE *lsusb, int usb_device_number) +void __scan_usb_lsusb_add_device(char *buffer, int bufsize, FILE *lsusb, int usb_device_number) { gint bus, device, vendor_id, product_id; gchar *version = NULL, *product = NULL, *vendor = NULL, *dev_class = NULL, *int_class = NULL; @@ -255,7 +255,7 @@ void __scan_usb_lsusb_add_device(char *buffer, FILE *lsusb, int usb_device_numbe sscanf(buffer, "Bus %d Device %d: ID %x:%x", &bus, &device, &vendor_id, &product_id); - for (position = ftell(lsusb); fgets(buffer, 512, lsusb); position = ftell(lsusb)) { + for (fgets(buffer, bufsize, lsusb); position = ftell(lsusb); fgets(buffer, bufsize, lsusb)) { g_strstrip(buffer); if (g_str_has_prefix(buffer, "idVendor")) { @@ -371,7 +371,7 @@ gboolean __scan_usb_lsusb(void) while (fgets(buffer, sizeof(buffer), temp_lsusb)) { if (g_str_has_prefix(buffer, "Bus ")) { - __scan_usb_lsusb_add_device(buffer, temp_lsusb, ++usb_device_number); + __scan_usb_lsusb_add_device(buffer, sizeof(buffer), temp_lsusb, ++usb_device_number); } } -- cgit v1.2.3