/*
- * usb_id.c
- *
- * Identify an USB (block) device
+ * usb_id - identify an USB device
*
* Copyright (c) 2005 SUSE Linux Products GmbH, Germany
*
#include <errno.h>
#include <getopt.h>
-#include "../../udev.h"
+#include "../../udev/udev.h"
-#define MAX_PATH_LEN 512
-#define MAX_SERIAL_LEN 256
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+int debug;
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
+static void log_fn(struct udev *udev, int priority,
+ const char *file, int line, const char *fn,
+ const char *format, va_list args)
{
- va_list args;
- static int udev_log = -1;
-
- if (udev_log == -1) {
- const char *value;
-
- value = getenv("UDEV_LOG");
- if (value)
- udev_log = log_priority(value);
- else
- udev_log = LOG_ERR;
+ if (debug) {
+ fprintf(stderr, "%s: ", fn != NULL ? fn : file);
+ vfprintf(stderr, format, args);
+ } else {
+ vsyslog(priority, format, args);
}
-
- if (priority > udev_log)
- return;
-
- va_start(args, format);
- vsyslog(priority, format, args);
- va_end(args);
}
-#endif
static char vendor_str[64];
static char model_str[64];
-static char serial_str[MAX_SERIAL_LEN];
+static char serial_str[UTIL_NAME_SIZE];
static char revision_str[64];
static char type_str[64];
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";
type = "floppy";
break;
case 1: /* RBC devices */
+ type = "rbc";
+ break;
case 6: /* Transparent SPC-2 devices */
- type = "disk";
+ type = "scsi";
break;
default:
break;
}
}
- strlcpy(to, type, len);
+ util_strlcpy(to, type, len);
return type_num;
}
break;
}
}
- strlcpy(to, type, len);
+ util_strlcpy(to, type, len);
}
/*
* 6.) If the device supplies a serial number, this number
* is concatenated with the identification with an underscore '_'.
*/
-static int usb_id(const char *devpath)
+static int usb_id(struct udev_device *dev)
{
- struct sysfs_device *dev;
- struct sysfs_device *dev_interface;
- struct sysfs_device *dev_usb;
- const char *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
- const char *usb_model = NULL, *usb_vendor = NULL, *usb_rev, *usb_serial;
+ struct udev *udev = udev_device_get_udev(dev);
+ struct udev_device *dev_interface;
+ struct udev_device *dev_usb;
const char *if_class, *if_subclass;
int if_class_num;
int protocol = 0;
- dbg("devpath %s\n", devpath);
-
- /* get all usb specific information: dev_interface, if_class, dev_usb */
- dev = sysfs_device_get(devpath);
- if (dev == NULL) {
- err("unable to access '%s'", devpath);
- return 1;
- }
+ dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
/* usb interface directory */
- dev_interface = sysfs_device_get_parent_with_subsystem(dev, "usb");
+ dev_interface = udev_device_get_parent_with_subsystem(dev, "usb");
if (dev_interface == NULL) {
- info("unable to access usb_interface device of '%s'", devpath);
+ info(udev, "unable to access usb_interface device of '%s'\n",
+ udev_device_get_syspath(dev));
return 1;
}
- if_class = sysfs_attr_get_value(dev_interface->devpath, "bInterfaceClass");
+ if_class = udev_device_get_sysattr_value(dev_interface, "bInterfaceClass");
if (!if_class) {
- info("%s: cannot get bInterfaceClass attribute", dev_interface->kernel);
+ info(udev, "%s: cannot get bInterfaceClass attribute\n",
+ udev_device_get_sysname(dev));
return 1;
}
if_class_num = strtoul(if_class, NULL, 16);
if (if_class_num == 8) {
- if_subclass = sysfs_attr_get_value(dev_interface->devpath, "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
+ } else {
set_usb_iftype(type_str, if_class_num, sizeof(type_str)-1);
+ }
- info("%s: if_class %d protocol %d\n", dev_interface->devpath, if_class_num, protocol);
+ info(udev, "%s: if_class %d protocol %d\n",
+ udev_device_get_syspath(dev_interface), if_class_num, protocol);
/* usb device directory */
- dev_usb = sysfs_device_get_parent_with_subsystem(dev_interface, "usb");
+ dev_usb = udev_device_get_parent_with_subsystem(dev_interface, "usb");
if (!dev_usb) {
- info("unable to find parent 'usb' device of '%s'", devpath);
+ info(udev, "unable to find parent 'usb' device of '%s'\n",
+ udev_device_get_syspath(dev));
return 1;
}
/* mass storage */
if (protocol == 6 && !use_usb_info) {
- struct sysfs_device *dev_scsi;
+ struct udev_device *dev_scsi;
+ const char *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
int host, bus, target, lun;
/* get scsi device */
- dev_scsi = sysfs_device_get_parent_with_subsystem(dev, "scsi");
+ dev_scsi = udev_device_get_parent_with_subsystem(dev, "scsi");
if (dev_scsi == NULL) {
- info("unable to find parent 'scsi' device of '%s'", devpath);
+ info(udev, "unable to find parent 'scsi' device of '%s'\n",
+ udev_device_get_syspath(dev));
goto fallback;
}
- if (sscanf(dev_scsi->kernel, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4) {
- info("invalid scsi device '%s'", dev_scsi->kernel);
+ if (sscanf(udev_device_get_sysname(dev_scsi), "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4) {
+ info(udev, "invalid scsi device '%s'\n", udev_device_get_sysname(dev_scsi));
goto fallback;
}
/* Generic SPC-2 device */
- scsi_vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
+ scsi_vendor = udev_device_get_sysattr_value(dev_scsi, "vendor");
if (!scsi_vendor) {
- info("%s: cannot get SCSI vendor attribute", dev_scsi->kernel);
+ 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);
- scsi_model = sysfs_attr_get_value(dev_scsi->devpath, "model");
+ scsi_model = udev_device_get_sysattr_value(dev_scsi, "model");
if (!scsi_model) {
- info("%s: cannot get SCSI model attribute", dev_scsi->kernel);
+ 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);
- scsi_type = sysfs_attr_get_value(dev_scsi->devpath, "type");
+ scsi_type = udev_device_get_sysattr_value(dev_scsi, "type");
if (!scsi_type) {
- info("%s: cannot get SCSI type attribute", dev_scsi->kernel);
+ info(udev, "%s: cannot get SCSI type attribute\n",
+ udev_device_get_sysname(dev_scsi));
goto fallback;
}
set_scsi_type(type_str, scsi_type, sizeof(type_str)-1);
- scsi_rev = sysfs_attr_get_value(dev_scsi->devpath, "rev");
+ scsi_rev = udev_device_get_sysattr_value(dev_scsi, "rev");
if (!scsi_rev) {
- info("%s: cannot get SCSI revision attribute", dev_scsi->kernel);
+ 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);
/*
* some broken devices have the same identifiers
}
fallback:
- /* Fallback to USB vendor & device */
+ /* fallback to USB vendor & device */
if (vendor_str[0] == '\0') {
+ const char *usb_vendor = NULL;
+
if (!use_num_info)
- if (!(usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "manufacturer")))
- dbg("No USB vendor string found, using idVendor");
+ usb_vendor = udev_device_get_sysattr_value(dev_usb, "manufacturer");
+
+ if (!usb_vendor)
+ usb_vendor = udev_device_get_sysattr_value(dev_usb, "idVendor");
if (!usb_vendor) {
- if (!(usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "idVendor"))) {
- dbg("No USB vendor information available\n");
- sprintf(vendor_str,"0000");
- }
+ 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);
}
-
+
if (model_str[0] == '\0') {
+ const char *usb_model = NULL;
+
if (!use_num_info)
- if (!(usb_model = sysfs_attr_get_value(dev_usb->devpath, "product")))
- dbg("No USB model string found, using idProduct");
-
+ usb_model = udev_device_get_sysattr_value(dev_usb, "product");
+
+ if (!usb_model)
+ usb_model = udev_device_get_sysattr_value(dev_usb, "idProduct");
+
if (!usb_model) {
- if (!(usb_model = sysfs_attr_get_value(dev_usb->devpath, "idProduct")))
- dbg("No USB model information available\n"); sprintf(model_str,"0000");
+ 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);
}
if (revision_str[0] == '\0') {
- usb_rev = sysfs_attr_get_value(dev_usb->devpath, "bcdDevice");
+ 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);
+ udev_util_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1);
}
if (serial_str[0] == '\0') {
- usb_serial = sysfs_attr_get_value(dev_usb->devpath, "serial");
+ 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);
+ udev_util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1);
}
return 0;
}
int main(int argc, char **argv)
{
- int retval = 0;
- const char *env;
- char devpath[MAX_PATH_LEN];
- static int export;
static const struct option options[] = {
- { "usb-info", 0, NULL, 'u' },
- { "num-info", 0, NULL, 'n' },
- { "export", 0, NULL, 'x' },
- { "help", 0, NULL, 'h' },
+ { "usb-info", no_argument, NULL, 'u' },
+ { "num-info", no_argument, NULL, 'n' },
+ { "export", no_argument, NULL, 'x' },
+ { "debug", no_argument, NULL, 'd' },
+ { "help", no_argument, NULL, 'h' },
{}
};
+ struct udev *udev;
+ struct udev_device *dev = NULL;
+ char syspath[UTIL_PATH_SIZE];
+ const char *devpath;
+ static int export;
+ int retval = 0;
+
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
logging_init("usb_id");
- sysfs_init();
+ udev_set_log_fn(udev, log_fn);
while (1) {
int option;
- option = getopt_long(argc, argv, "nuxh", options, NULL);
+ option = getopt_long(argc, argv, "dnuxh", options, NULL);
if (option == -1)
break;
switch (option) {
+ case 'd':
+ debug = 1;
+ if (udev_get_log_priority(udev) < LOG_INFO)
+ udev_set_log_priority(udev, LOG_INFO);
+ break;
case 'n':
use_num_info = 1;
use_usb_info = 1;
}
}
- env = getenv("DEVPATH");
- if (env != NULL)
- strlcpy(devpath, env, sizeof(devpath));
- else {
- if (argv[optind] == NULL) {
- fprintf(stderr, "No device specified\n");
- retval = 1;
- goto exit;
- }
- strlcpy(devpath, argv[optind], sizeof(devpath));
+ devpath = getenv("DEVPATH");
+ if (devpath == NULL)
+ devpath = argv[optind];
+ if (devpath == NULL) {
+ fprintf(stderr, "No device specified\n");
+ retval = 1;
+ goto exit;
}
- retval = usb_id(devpath);
+ util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
+ util_strlcat(syspath, devpath, sizeof(syspath));
+ dev = udev_device_new_from_syspath(udev, syspath);
+ if (dev == NULL) {
+ err(udev, "unable to access '%s'\n", devpath);
+ return 1;
+ }
+ retval = usb_id(dev);
if (retval == 0) {
char serial[256];
- strlcpy(serial, vendor_str, sizeof(serial));
- strlcat(serial, "_", sizeof(serial));
- strlcat(serial, model_str, sizeof(serial));
+ util_strlcpy(serial, vendor_str, sizeof(serial));
+ util_strlcat(serial, "_", sizeof(serial));
+ util_strlcat(serial, model_str, sizeof(serial));
if (serial_str[0] != '\0') {
- strlcat(serial, "_", sizeof(serial));
- strlcat(serial, serial_str, sizeof(serial));
+ util_strlcat(serial, "_", sizeof(serial));
+ util_strlcat(serial, serial_str, sizeof(serial));
}
if (instance_str[0] != '\0') {
- strlcat(serial, "-", sizeof(serial));
- strlcat(serial, instance_str, sizeof(serial));
+ util_strlcat(serial, "-", sizeof(serial));
+ util_strlcat(serial, instance_str, sizeof(serial));
}
if (export) {
}
exit:
- sysfs_cleanup();
+ udev_device_unref(dev);
+ udev_unref(udev);
logging_close();
return retval;
}