X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fusb_id%2Fusb_id.c;h=9ee4e6ece34a248025f29e67e3225147d4bb7891;hp=22f075b5d96aefd28d8d7fe1e354cfdccba3cd22;hb=61ee8cc92d5298da4fd4f46016991369a933ef7f;hpb=f6bb9e981aea06f1a7460868fb60f1a9ff14c504 diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index 22f075b5d..9ee4e6ece 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 = "image"; + 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,7 +192,7 @@ 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", NULL); if (dev_interface == NULL) { info(udev, "unable to access usb_interface device of '%s'\n", udev_device_get_syspath(dev)); @@ -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", NULL); 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", NULL); if (dev_scsi == NULL) { info(udev, "unable to find parent 'scsi' device of '%s'\n", udev_device_get_syspath(dev)); @@ -272,7 +250,8 @@ static int usb_id(struct udev_device *dev) 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_sysattr_value(dev_scsi, "model"); if (!scsi_model) { @@ -280,7 +259,8 @@ static int usb_id(struct udev_device *dev) 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_sysattr_value(dev_scsi, "type"); if (!scsi_type) { @@ -296,7 +276,8 @@ static int usb_id(struct udev_device *dev) 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 @@ -320,7 +301,8 @@ fallback: 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') { @@ -336,23 +318,28 @@ fallback: 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_sysattr_value(dev_usb, "bcdDevice"); - if (usb_rev) - set_str(revision_str, usb_rev, sizeof(revision_str)-1); + 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_sysattr_value(dev_usb, "serial"); - if (usb_serial) - set_str(serial_str, usb_serial, sizeof(serial_str)-1); + if (usb_serial) { + udev_util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1); + udev_util_replace_chars(serial_str, NULL); + } } return 0; }