X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fusb_id%2Fusb_id.c;h=0565e6403f2fd358844a33d2ebd228a10660c9c1;hb=fdcd1f4666a4cceb0de7935a72567f30f1905c08;hp=4d5265532dd258011763e6b75477b398a852e260;hpb=2f1a291e2f50075e46cd55568a5ba6ba4f6a2afc;p=elogind.git diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index 4d5265532..0565e6403 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -46,44 +46,6 @@ static char instance_str[64]; static int use_usb_info; static int use_num_info; -static void set_str(char *to, const char *from, size_t count) -{ - size_t i, j, len; - - /* strip trailing whitespace */ - len = strnlen(from, count); - while (len && isspace(from[len-1])) - len--; - - /* strip leading whitespace */ - i = 0; - while (isspace(from[i]) && (i < len)) - i++; - - j = 0; - while (i < len) { - /* substitute multiple whitespace */ - if (isspace(from[i])) { - while (isspace(from[i])) - i++; - to[j++] = '_'; - } - /* Replace '/' with '.' */ - if (from[i] == '/') { - to[j++] = '.'; - i++; - continue; - } - /* skip non-printable chars */ - if (!isalnum(from[i]) && !ispunct(from[i])) { - i++; - continue; - } - to[j++] = from[i++]; - } - to[j] = '\0'; -} - static void set_usb_iftype(char *to, int if_class_num, size_t len) { char *type = "generic"; @@ -92,26 +54,40 @@ static void set_usb_iftype(char *to, int if_class_num, size_t len) case 1: type = "audio"; break; + case 2: /* CDC-Control */ + break; case 3: type = "hid"; break; + case 5: /* Physical */ + break; + case 6: + type = "media"; + break; case 7: type = "printer"; break; case 8: type = "storage"; break; - case 2: /* CDC-Control */ - case 5: /* Physical */ - case 6: /* Image */ - case 9: /* HUB */ + case 9: + type = "hub"; + break; case 0x0a: /* CDC-Data */ + break; case 0x0b: /* Chip/Smart Card */ + break; case 0x0d: /* Content Security */ - case 0x0e: /* Video */ + break; + case 0x0e: + type = "video"; + break; case 0xdc: /* Diagnostic Device */ + break; case 0xe0: /* Wireless Controller */ - case 0xf2: /* Application-specific */ + break; + case 0xfe: /* Application-specific */ + break; case 0xff: /* Vendor-specific */ break; default: @@ -141,8 +117,10 @@ static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len type = "floppy"; break; case 1: /* RBC devices */ + type = "rbc"; + break; case 6: /* Transparent SPC-2 devices */ - type = "disk"; + type = "scsi"; break; default: break; @@ -214,14 +192,14 @@ static int usb_id(struct udev_device *dev) dbg(udev, "syspath %s\n", udev_device_get_syspath(dev)); /* usb interface directory */ - dev_interface = udev_device_get_parent_with_subsystem(dev, "usb"); + dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_interface"); if (dev_interface == NULL) { info(udev, "unable to access usb_interface device of '%s'\n", udev_device_get_syspath(dev)); return 1; } - if_class = udev_device_get_attr_value(dev_interface, "bInterfaceClass"); + if_class = udev_device_get_sysattr_value(dev_interface, "bInterfaceClass"); if (!if_class) { info(udev, "%s: cannot get bInterfaceClass attribute\n", udev_device_get_sysname(dev)); @@ -229,7 +207,7 @@ static int usb_id(struct udev_device *dev) } if_class_num = strtoul(if_class, NULL, 16); if (if_class_num == 8) { - if_subclass = udev_device_get_attr_value(dev_interface, "bInterfaceSubClass"); + if_subclass = udev_device_get_sysattr_value(dev_interface, "bInterfaceSubClass"); if (if_subclass != NULL) protocol = set_usb_mass_storage_ifsubtype(type_str, if_subclass, sizeof(type_str)-1); } else { @@ -240,7 +218,7 @@ static int usb_id(struct udev_device *dev) udev_device_get_syspath(dev_interface), if_class_num, protocol); /* usb device directory */ - dev_usb = udev_device_get_parent_with_subsystem(dev_interface, "usb"); + dev_usb = udev_device_get_parent_with_subsystem_devtype(dev_interface, "usb", "usb_device"); if (!dev_usb) { info(udev, "unable to find parent 'usb' device of '%s'\n", udev_device_get_syspath(dev)); @@ -254,7 +232,7 @@ static int usb_id(struct udev_device *dev) int host, bus, target, lun; /* get scsi device */ - dev_scsi = udev_device_get_parent_with_subsystem(dev, "scsi"); + dev_scsi = udev_device_get_parent_with_subsystem_devtype(dev, "scsi", "scsi_device"); if (dev_scsi == NULL) { info(udev, "unable to find parent 'scsi' device of '%s'\n", udev_device_get_syspath(dev)); @@ -266,23 +244,25 @@ static int usb_id(struct udev_device *dev) } /* Generic SPC-2 device */ - scsi_vendor = udev_device_get_attr_value(dev_scsi, "vendor"); + scsi_vendor = udev_device_get_sysattr_value(dev_scsi, "vendor"); if (!scsi_vendor) { info(udev, "%s: cannot get SCSI vendor attribute\n", udev_device_get_sysname(dev_scsi)); goto fallback; } - set_str(vendor_str, scsi_vendor, sizeof(vendor_str)-1); + udev_util_replace_whitespace(scsi_vendor, vendor_str, sizeof(vendor_str)-1); + udev_util_replace_chars(vendor_str, NULL); - scsi_model = udev_device_get_attr_value(dev_scsi, "model"); + scsi_model = udev_device_get_sysattr_value(dev_scsi, "model"); if (!scsi_model) { info(udev, "%s: cannot get SCSI model attribute\n", udev_device_get_sysname(dev_scsi)); goto fallback; } - set_str(model_str, scsi_model, sizeof(model_str)-1); + udev_util_replace_whitespace(scsi_model, model_str, sizeof(model_str)-1); + udev_util_replace_chars(model_str, NULL); - scsi_type = udev_device_get_attr_value(dev_scsi, "type"); + scsi_type = udev_device_get_sysattr_value(dev_scsi, "type"); if (!scsi_type) { info(udev, "%s: cannot get SCSI type attribute\n", udev_device_get_sysname(dev_scsi)); @@ -290,13 +270,14 @@ static int usb_id(struct udev_device *dev) } set_scsi_type(type_str, scsi_type, sizeof(type_str)-1); - scsi_rev = udev_device_get_attr_value(dev_scsi, "rev"); + scsi_rev = udev_device_get_sysattr_value(dev_scsi, "rev"); if (!scsi_rev) { info(udev, "%s: cannot get SCSI revision attribute\n", udev_device_get_sysname(dev_scsi)); goto fallback; } - set_str(revision_str, scsi_rev, sizeof(revision_str)-1); + udev_util_replace_whitespace(scsi_rev, revision_str, sizeof(revision_str)-1); + udev_util_replace_chars(revision_str, NULL); /* * some broken devices have the same identifiers @@ -311,48 +292,54 @@ fallback: const char *usb_vendor = NULL; if (!use_num_info) - usb_vendor = udev_device_get_attr_value(dev_usb, "manufacturer"); + usb_vendor = udev_device_get_sysattr_value(dev_usb, "manufacturer"); if (!usb_vendor) - usb_vendor = udev_device_get_attr_value(dev_usb, "idVendor"); + usb_vendor = udev_device_get_sysattr_value(dev_usb, "idVendor"); if (!usb_vendor) { info(udev, "No USB vendor information available\n"); return 1; } - set_str(vendor_str, usb_vendor, sizeof(vendor_str)-1); + udev_util_replace_whitespace(usb_vendor, vendor_str, sizeof(vendor_str)-1); + udev_util_replace_chars(vendor_str, NULL); } if (model_str[0] == '\0') { const char *usb_model = NULL; if (!use_num_info) - usb_model = udev_device_get_attr_value(dev_usb, "product"); + usb_model = udev_device_get_sysattr_value(dev_usb, "product"); if (!usb_model) - usb_model = udev_device_get_attr_value(dev_usb, "idProduct"); + usb_model = udev_device_get_sysattr_value(dev_usb, "idProduct"); if (!usb_model) { dbg(udev, "No USB model information available\n"); return 1; } - set_str(model_str, usb_model, sizeof(model_str)-1); + udev_util_replace_whitespace(usb_model, model_str, sizeof(model_str)-1); + udev_util_replace_chars(model_str, NULL); } if (revision_str[0] == '\0') { const char *usb_rev; - usb_rev = udev_device_get_attr_value(dev_usb, "bcdDevice"); - if (usb_rev) - set_str(revision_str, usb_rev, sizeof(revision_str)-1); + usb_rev = udev_device_get_sysattr_value(dev_usb, "bcdDevice"); + if (usb_rev) { + udev_util_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1); + udev_util_replace_chars(revision_str, NULL); + } } if (serial_str[0] == '\0') { const char *usb_serial; - usb_serial = udev_device_get_attr_value(dev_usb, "serial"); - if (usb_serial) - set_str(serial_str, usb_serial, sizeof(serial_str)-1); + usb_serial = udev_device_get_sysattr_value(dev_usb, "serial"); + if (usb_serial) { + udev_util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1); + udev_util_replace_chars(serial_str, NULL); + } } return 0; } @@ -368,7 +355,7 @@ int main(int argc, char **argv) {} }; struct udev *udev; - struct udev_device *dev; + struct udev_device *dev = NULL; char syspath[UTIL_PATH_SIZE]; const char *devpath; static int export; @@ -408,7 +395,7 @@ int main(int argc, char **argv) printf("Usage: usb_id [--usb-info] [--num-info] [--export] [--help] \n" " --usb-info use usb strings instead\n" " --num-info use numerical values\n" - " --export print values as environemt keys\n" + " --export print values as environment keys\n" " --help print this help text\n\n"); default: retval = 1;