X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=31e719fe35f32c8810cc962524089f98c92935de;hp=ccc3e58e2b8f884d73a7075252dcd21d5eb688ff;hb=17f2b1a7e0d10334af7f9622848788add125dea8;hpb=911847864f1c9183cfca6e7255964d8ee622e943 diff --git a/udevinfo.c b/udevinfo.c index ccc3e58e2..31e719fe3 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -36,12 +36,15 @@ #ifdef USE_LOG -void log_message (int level, const char *format, ...) +void log_message (int priority, const char *format, ...) { va_list args; + if (priority > udev_log_priority) + return; + va_start(args, format); - vsyslog(level, format, args); + vsyslog(priority, format, args); va_end(args); } #endif @@ -50,30 +53,29 @@ static void print_all_attributes(struct dlist *attr_list) { struct sysfs_attribute *attr; char value[VALUE_SIZE]; - int len; + size_t len; dlist_for_each_data(attr_list, attr, struct sysfs_attribute) { - if (attr->value != NULL) { - strlcpy(value, attr->value, sizeof(value)); - len = strlen(value); - if (len == 0) - continue; - - /* remove trailing newline */ - if (value[len-1] == '\n') { - value[len-1] = '\0'; - len--; - } + if (attr->value == NULL) + continue; + len = strlcpy(value, attr->value, sizeof(value)); + if (len >= sizeof(value)) { + dbg("attribute value of '%s' too long, skip", attr->name); + continue; + } - /* skip nonprintable values */ - while (len) { - if (isprint(value[len-1]) == 0) - break; - len--; - } - if (len == 0) - printf(" SYSFS{%s}=\"%s\"\n", attr->name, value); + /* remove trailing newlines */ + while (len && value[len-1] == '\n') + value[--len] = '\0'; + /* skip nonprintable attributes */ + while (len && isprint(value[len-1])) + len--; + if (len) { + dbg("attribute value of '%s' non-printable, skip", attr->name); + continue; } + replace_untrusted_chars(value); + printf(" SYSFS{%s}==\"%s\"\n", attr->name, value); } printf("\n"); } @@ -104,14 +106,13 @@ static int print_device_chain(const char *path) struct sysfs_class_device *class_dev_parent; struct sysfs_attribute *attr; struct sysfs_device *sysfs_dev; - struct sysfs_device *sysfs_dev_parent; struct dlist *attr_list; int retval = 0; /* get the class dev */ class_dev = sysfs_open_class_device_path(path); if (class_dev == NULL) { - printf("couldn't get the class device\n"); + fprintf(stderr, "couldn't get the class device\n"); return -1; } @@ -129,11 +130,11 @@ static int print_device_chain(const char *path) /* open sysfs class device directory and print all attributes */ printf(" looking at class device '%s':\n", class_dev->path); - printf(" SUBSYSTEM=\"%s\"\n", class_dev->classname); + printf(" SUBSYSTEM==\"%s\"\n", class_dev->classname); attr_list = sysfs_get_classdev_attributes(class_dev); if (attr_list == NULL) { - printf("couldn't open class device directory\n"); + fprintf(stderr, "couldn't open class device directory\n"); retval = -1; goto exit; } @@ -141,36 +142,33 @@ static int print_device_chain(const char *path) /* get the device link (if parent exists look here) */ class_dev_parent = sysfs_get_classdev_parent(class_dev); - if (class_dev_parent != NULL) + if (class_dev_parent != NULL) sysfs_dev = sysfs_get_classdev_device(class_dev_parent); else sysfs_dev = sysfs_get_classdev_device(class_dev); if (sysfs_dev != NULL) - printf("follow the class device's \"device\"\n"); + printf("follow the \"device\"-link to the physical device:\n"); /* look the device chain upwards */ while (sysfs_dev != NULL) { attr_list = sysfs_get_device_attributes(sysfs_dev); if (attr_list == NULL) { - printf("couldn't open device directory\n"); + fprintf(stderr, "couldn't open device directory\n"); retval = -1; goto exit; } printf(" looking at the device chain at '%s':\n", sysfs_dev->path); - printf(" BUS=\"%s\"\n", sysfs_dev->bus); - printf(" ID=\"%s\"\n", sysfs_dev->bus_id); - printf(" DRIVER=\"%s\"\n", sysfs_dev->driver_name); + printf(" BUS==\"%s\"\n", sysfs_dev->bus); + printf(" ID==\"%s\"\n", sysfs_dev->bus_id); + printf(" DRIVER==\"%s\"\n", sysfs_dev->driver_name); - /* open sysfs device directory and print all attributes */ print_all_attributes(attr_list); - sysfs_dev_parent = sysfs_get_device_parent(sysfs_dev); - if (sysfs_dev_parent == NULL) + sysfs_dev = sysfs_get_device_parent(sysfs_dev); + if (sysfs_dev == NULL) break; - - sysfs_dev = sysfs_dev_parent; } exit: @@ -201,7 +199,7 @@ int main(int argc, char *argv[], char *envp[]) logging_init("udevinfo"); udev_init_config(); - udev_init_device(&udev, NULL, NULL); + udev_init_device(&udev, NULL, NULL, NULL); /* get command line options */ while (1) { @@ -244,7 +242,7 @@ int main(int argc, char *argv[], char *envp[]) break; } - printf("unknown query type\n"); + fprintf(stderr, "unknown query type\n"); retval = 1; goto exit; @@ -290,7 +288,7 @@ int main(int argc, char *argv[], char *envp[]) } retval = udev_db_get_device(&udev, pos); if (retval != 0) { - printf("device not found in database\n"); + fprintf(stderr, "device not found in database\n"); goto exit; } goto print; @@ -309,14 +307,14 @@ int main(int argc, char *argv[], char *envp[]) retval = udev_db_search_name(devpath, sizeof(devpath), pos); if (retval != 0) { - printf("device not found in database\n"); + fprintf(stderr, "device not found in database\n"); goto exit; } udev_db_get_device(&udev, devpath); goto print; } - printf("query needs device path(-p) or node name(-n) specified\n"); + fprintf(stderr, "query needs device path(-p) or node name(-n) specified\n"); retval = 3; goto exit; @@ -352,7 +350,7 @@ print: if (attributes) { if (path[0] == '\0') { - printf("attribute walk on device chain needs path(-p) specified\n"); + fprintf(stderr, "attribute walk on device chain needs path(-p) specified\n"); retval = 4; goto exit; } else { @@ -373,7 +371,7 @@ print: } help: - printf("Usage: udevinfo [-anpqrVh]\n" + fprintf(stderr, "Usage: udevinfo [-anpqrVh]\n" " -q TYPE query database for the specified value:\n" " 'name' name of device node\n" " 'symlink' pointing to node\n"