X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=78c218eef0b22355d2d08a74c4d76a309b1f3a8a;hp=9ce83aabd884abecd04ab769b08b86180141504c;hb=fc233a874bc93ac82bed7eda1d6967d6281a6fe2;hpb=8753fadf2a6ecead372e71b8bf9336cf29f9c958 diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index 9ce83aabd..78c218eef 100644 --- a/udev/udevadm-info.c +++ b/udev/udevadm-info.c @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include "config.h" - #include #include #include @@ -34,6 +32,7 @@ static void print_all_attributes(struct udev_device *device, const char *key) { + struct udev *udev = udev_device_get_udev(device); DIR *dir; struct dirent *dent; @@ -71,7 +70,7 @@ static void print_all_attributes(struct udev_device *device, const char *key) while (len > 0 && isprint(value[len-1])) len--; if (len > 0) { - dbg(info, "attribute value of '%s' non-printable, skip\n", dent->d_name); + dbg(udev, "attribute value of '%s' non-printable, skip\n", dent->d_name); continue; } @@ -128,135 +127,42 @@ static int print_device_chain(struct udev_device *device) return 0; } -static int print_record_devlinks_cb(struct udev_device *device, const char *value, void *data) -{ - size_t len; - - len = strlen(udev_get_dev_path(udev_device_get_udev(device))); - printf("S: %s\n", &value[len+1]); - return 0; -} - -static int print_record_properties_cb(struct udev_device *device, const char *key, const char *value, void *data) -{ - printf("E: %s=%s\n", key, value); - return 0; -} - static void print_record(struct udev_device *device) { size_t len; + const char *str; int i; + struct udev_list_entry *list_entry; printf("P: %s\n", udev_device_get_devpath(device)); + len = strlen(udev_get_dev_path(udev_device_get_udev(device))); - printf("N: %s\n", &udev_device_get_devname(device)[len+1]); - i = device_get_devlink_priority(device); + str = udev_device_get_devnode(device); + if (str != NULL) + printf("N: %s\n", &str[len+1]); + + i = udev_device_get_devlink_priority(device); if (i != 0) printf("L: %i\n", i); - i = device_get_num_fake_partitions(device); + + i = udev_device_get_num_fake_partitions(device); if (i != 0) printf("A:%u\n", i); - i = device_get_ignore_remove(device); + + i = udev_device_get_ignore_remove(device); if (i != 0) printf("R:%u\n", i); - udev_device_get_devlinks(device, print_record_devlinks_cb, NULL); - udev_device_get_properties(device, print_record_properties_cb, NULL); - printf("\n"); -} - -static int export_all_cb(struct udev *udev, - const char *syspath, const char *subsystem, const char *name, - void *data) -{ - struct udev_device *device; - - device = udev_device_new_from_syspath(udev, syspath); - if (device == NULL) - return 0; - if (udev_device_get_devname(device) != NULL) - print_record(device); - udev_device_unref(device); - return 0; -} - -static struct udev_device *lookup_device_by_name(struct udev *udev, const char *name) -{ - struct udev_device *udev_device = NULL; - LIST_HEAD(name_list); - int count; - struct name_entry *device; - - count = udev_db_get_devices_by_name(udev, name, &name_list); - if (count <= 0) - goto out; - - info(udev, "found %i devices for '%s'\n", count, name); - - /* select the device that matches */ - list_for_each_entry(device, &name_list, node) { - struct udevice *udevice_loop; - char filename[UTIL_PATH_SIZE]; - struct stat statbuf; - - udevice_loop = udev_device_init(udev); - if (udevice_loop == NULL) - break; - if (udev_db_get_device(udevice_loop, device->name) != 0) - goto next; - info(udev, "found db entry '%s'\n", device->name); - /* make sure, we don't get a link of a different device */ - util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename)); - util_strlcat(filename, "/", sizeof(filename)); - util_strlcat(filename, name, sizeof(filename)); - if (stat(filename, &statbuf) != 0) - goto next; - if (major(udevice_loop->devt) > 0 && udevice_loop->devt != statbuf.st_rdev) { - info(udev, "skip '%s', dev_t doesn't match\n", udevice_loop->name); - goto next; - } - util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename)); - util_strlcat(filename, udevice_loop->dev->devpath, sizeof(filename)); - udev_device = udev_device_new_from_syspath(udev, filename); - udev_device_cleanup(udevice_loop); - break; -next: - udev_device_cleanup(udevice_loop); - } -out: - name_list_cleanup(udev, &name_list); - return udev_device; -} - -static int add_devlink_cb(struct udev_device *device, const char *value, void *data) -{ - char **links = data; - if (*links == NULL) { - *links = strdup(value); - } else { - char *str; - - asprintf(&str, "%s %s", *links, value); - free(*links); - *links = str; + udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) { + len = strlen(udev_get_dev_path(udev_device_get_udev(device))); + printf("S: %s\n", &udev_list_entry_get_name(list_entry)[len+1]); } - return 0; -} - -static int add_devlink_noroot_cb(struct udev_device *device, const char *value, void *data) -{ - size_t len; - len = strlen(udev_get_dev_path(udev_device_get_udev(device))); - value = &value[len+1]; - return add_devlink_cb(device, value, data); -} - -static int print_property_cb(struct udev_device *device, const char *key, const char *value, void *data) -{ - printf("%s=%s\n", key, value); - return 0; + udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device)) + printf("E: %s=%s\n", + udev_list_entry_get_name(list_entry), + udev_list_entry_get_value(list_entry)); + printf("\n"); } static int stat_device(const char *name, int export, const char *prefix) @@ -278,6 +184,29 @@ static int stat_device(const char *name, int export, const char *prefix) return 0; } +static int export_devices(struct udev *udev) +{ + struct udev_enumerate *udev_enumerate; + struct udev_list_entry *list_entry; + + udev_enumerate = udev_enumerate_new(udev); + if (udev_enumerate == NULL) + return -1; + udev_enumerate_scan_devices(udev_enumerate); + udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) { + struct udev_device *device; + + device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry)); + if (device != NULL) { + if (udev_device_get_devnode(device) != NULL) + print_record(device); + udev_device_unref(device); + } + } + udev_enumerate_unref(udev_enumerate); + return 0; +} + int udevadm_info(struct udev *udev, int argc, char *argv[]) { struct udev_device *device = NULL; @@ -286,21 +215,21 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) const char *export_prefix = NULL; char path[UTIL_PATH_SIZE]; char name[UTIL_PATH_SIZE]; - char *links; + struct udev_list_entry *list_entry; int rc = 0; static const struct option options[] = { - { "name", 1, NULL, 'n' }, - { "path", 1, NULL, 'p' }, - { "query", 1, NULL, 'q' }, - { "attribute-walk", 0, NULL, 'a' }, - { "export-db", 0, NULL, 'e' }, - { "root", 0, NULL, 'r' }, - { "device-id-of-file", 1, NULL, 'd' }, - { "export", 0, NULL, 'x' }, - { "export-prefix", 1, NULL, 'P' }, - { "version", 0, NULL, 1 }, /* -V outputs braindead format */ - { "help", 0, NULL, 'h' }, + { "name", required_argument, NULL, 'n' }, + { "path", required_argument, NULL, 'p' }, + { "query", required_argument, NULL, 'q' }, + { "attribute-walk", no_argument, NULL, 'a' }, + { "export-db", no_argument, NULL, 'e' }, + { "root", no_argument, NULL, 'r' }, + { "device-id-of-file", required_argument, NULL, 'd' }, + { "export", no_argument, NULL, 'x' }, + { "export-prefix", required_argument, NULL, 'P' }, + { "version", no_argument, NULL, 1 }, /* -V outputs braindead format */ + { "help", no_argument, NULL, 'h' }, {} }; @@ -323,6 +252,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) while (1) { int option; + struct stat statbuf; option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL); if (option == -1) @@ -337,12 +267,37 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) goto exit; } /* remove /dev if given */ - if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0) - util_strlcpy(name, &optarg[strlen(udev_get_dev_path(udev))+1], sizeof(name)); - else + if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0) { + util_strlcpy(name, udev_get_dev_path(udev), sizeof(name)); + util_strlcat(name, "/", sizeof(name)); + util_strlcat(name, optarg, sizeof(name)); + } else { util_strlcpy(name, optarg, sizeof(name)); + } util_remove_trailing_chars(name, '/'); - device = lookup_device_by_name(udev, name); + if (stat(name, &statbuf) < 0) { + fprintf(stderr, "device node not found\n"); + rc = 2; + goto exit; + } else { + char type; + + if (S_ISBLK(statbuf.st_mode)) { + type = 'b'; + } else if (S_ISCHR(statbuf.st_mode)) { + type = 'c'; + } else { + fprintf(stderr, "device node has wrong file type\n"); + rc = 2; + goto exit; + } + device = udev_device_new_from_devnum(udev, type, statbuf.st_rdev); + if (device == NULL) { + fprintf(stderr, "device node not found\n"); + rc = 2; + goto exit; + } + } break; case 'p': if (device != NULL) { @@ -350,7 +305,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) rc = 2; goto exit; } - /* add /sys if needed */ + /* add sys dir if needed */ if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) { util_strlcpy(path, udev_get_sys_path(udev), sizeof(path)); util_strlcat(path, optarg, sizeof(path)); @@ -359,6 +314,11 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) } util_remove_trailing_chars(path, '/'); device = udev_device_new_from_syspath(udev, path); + if (device == NULL) { + fprintf(stderr, "device path not found\n"); + rc = 2; + goto exit; + } break; case 'q': action = ACTION_QUERY; @@ -383,7 +343,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) break; } fprintf(stderr, "unknown query type\n"); - rc = 2; + rc = 3; goto exit; case 'r': if (action == ACTION_NONE) @@ -398,7 +358,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) action = ACTION_ATTRIBUTE_WALK; break; case 'e': - udev_enumerate_devices(udev, NULL, export_all_cb, NULL); + export_devices(udev); goto exit; case 'x': export = 1; @@ -414,18 +374,18 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) goto exit; case 'h': printf("Usage: udevadm info OPTIONS\n" - " --query= query database for the specified value:\n" + " --query= query device information:\n" " name name of device node\n" " symlink pointing to node\n" - " path sysfs device path\n" + " path sys device path\n" " env the device related imported environment\n" " all all values\n" - " --path= sysfs device path used for query or chain\n" - " --name= node or symlink name used for query\n" - " --root prepend to query result or print udev_root\n" - " --attribute-walk print all key matches while walking along chain\n" + " --path= sys device path used for query or attribute walk\n" + " --name= node or symlink name used for query or attribute walk\n" + " --root prepend dev directory to path names\n" + " --attribute-walk print all key matches while walking along the chain\n" " of parent devices\n" - " --device-id-of-file= print major/minor of underlying device\n" + " --device-id-of-file= print major:minor of device containing this file\n" " --export-db export the content of the udev database\n" " --help print this text\n" "\n"); @@ -446,28 +406,47 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) switch(query) { case QUERY_NAME: if (root) { - printf("%s\n", udev_device_get_devname(device)); + printf("%s\n", udev_device_get_devnode(device)); } else { size_t len; + const char *node; len = strlen(udev_get_dev_path(udev)); - printf("%s\n", &udev_device_get_devname(device)[len+1]); + node = udev_device_get_devnode(device); + if (node == NULL) { + fprintf(stderr, "no device node found\n"); + rc = 5; + goto exit; + } + printf("%s\n", &udev_device_get_devnode(device)[len+1]); } break; case QUERY_SYMLINK: - links = NULL; - if (root) - udev_device_get_devlinks(device, add_devlink_cb, &links); - else - udev_device_get_devlinks(device, add_devlink_noroot_cb, &links); - printf("%s\n", links); - free(links); + list_entry = udev_device_get_devlinks_list_entry(device); + while (list_entry != NULL) { + if (root) { + printf("%s", udev_list_entry_get_name(list_entry)); + } else { + size_t len; + + len = strlen(udev_get_dev_path(udev_device_get_udev(device))); + printf("%s", &udev_list_entry_get_name(list_entry)[len+1]); + } + list_entry = udev_list_entry_get_next(list_entry); + if (list_entry != NULL) + printf(" "); + } + printf("\n"); break; case QUERY_PATH: printf("%s\n", udev_device_get_devpath(device)); goto exit; case QUERY_ENV: - udev_device_get_properties(device, print_property_cb, NULL); + list_entry = udev_device_get_properties_list_entry(device); + while (list_entry != NULL) { + printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry)); + list_entry = udev_list_entry_get_next(list_entry); + } break; case QUERY_ALL: print_record(device); @@ -480,14 +459,14 @@ int udevadm_info(struct udev *udev, int argc, char *argv[]) case ACTION_ATTRIBUTE_WALK: if (device == NULL) { fprintf(stderr, "query needs a valid device specified by --path= or --name=\n"); - rc = 5; + rc = 4; goto exit; } print_device_chain(device); break; case ACTION_DEVICE_ID_FILE: if (stat_device(name, export, export_prefix) != 0) - rc = 6; + rc = 1; break; case ACTION_ROOT: printf("%s\n", udev_get_dev_path(udev));