X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=52d409df88c520a5e6ef844027835269569ff353;hp=e892b1092e311687058b5e3c2ec4dd20c5f37bac;hb=573bdd7e7588b70105c2976859696037899e9d4d;hpb=31de3a2ba18ffa011f5054016ccc4a500cbe0cc3 diff --git a/udevinfo.c b/udevinfo.c index e892b1092..52d409df8 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -31,21 +31,6 @@ #include "udev.h" - -#ifdef USE_LOG -void log_message (int priority, const char *format, ...) -{ - va_list args; - - if (priority > udev_log_priority) - return; - - va_start(args, format); - vsyslog(priority, format, args); - va_end(args); -} -#endif - static void print_all_attributes(const char *devpath, const char *key) { char path[PATH_SIZE]; @@ -67,6 +52,9 @@ static void print_all_attributes(const char *devpath, const char *key) if (dent->d_name[0] == '.') continue; + if (strcmp(dent->d_name, "uevent") == 0) + continue; + strlcpy(filename, path, sizeof(filename)); strlcat(filename, "/", sizeof(filename)); strlcat(filename, dent->d_name, sizeof(filename)); @@ -79,6 +67,8 @@ static void print_all_attributes(const char *devpath, const char *key) if (attr_value == NULL) continue; len = strlcpy(value, attr_value, sizeof(value)); + if(len >= sizeof(value)) + len = sizeof(value) - 1; dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len); /* remove trailing newlines */ @@ -93,7 +83,6 @@ static void print_all_attributes(const char *devpath, const char *key) continue; } - replace_untrusted_chars(value); printf(" %s{%s}==\"%s\"\n", key, dent->d_name, value); } } @@ -146,20 +135,17 @@ static void print_record(struct udevice *udev) printf("N: %s\n", udev->name); list_for_each_entry(name_loop, &udev->symlink_list, node) printf("S: %s\n", name_loop->name); + if (udev->link_priority != 0) + printf("L: %i\n", udev->link_priority); + if (udev->partitions != 0) + printf("A:%u\n", udev->partitions); + if (udev->ignore_remove) + printf("R:%u\n", udev->ignore_remove); list_for_each_entry(name_loop, &udev->env_list, node) printf("E: %s\n", name_loop->name); } -static void export_name_devpath(struct udevice *udev) { - printf("%s=%s/%s\n", udev->dev->devpath, udev_root, udev->name); -} - -static void export_record(struct udevice *udev) { - print_record(udev); - printf("\n"); -} - -static void export_db(void fnct(struct udevice *udev)) { +static void export_db(void) { LIST_HEAD(name_list); struct name_entry *name_loop; @@ -171,7 +157,8 @@ static void export_db(void fnct(struct udevice *udev)) { if (udev_db == NULL) continue; if (udev_db_get_device(udev_db, name_loop->name) == 0) - fnct(udev_db); + print_record(udev_db); + printf("\n"); udev_device_cleanup(udev_db); } name_list_cleanup(&name_list); @@ -180,13 +167,17 @@ static void export_db(void fnct(struct udevice *udev)) { static int lookup_device_by_name(struct udevice *udev, const char *name) { LIST_HEAD(name_list); + int count; struct name_entry *device; int rc = -1; - if (udev_db_get_devices_by_name(name, &name_list) <= 0) + count = udev_db_get_devices_by_name(name, &name_list); + if (count <= 0) goto out; - /* select the device that matches the dev_t of name */ + info("found %i devices for '%s'", count, name); + + /* select the device that seems to match */ list_for_each_entry(device, &name_list, node) { char filename[PATH_SIZE]; struct stat statbuf; @@ -196,23 +187,36 @@ static int lookup_device_by_name(struct udevice *udev, const char *name) continue; info("found db entry '%s'", device->name); + /* make sure, we don't get a link of a differnt device */ strlcpy(filename, udev_root, sizeof(filename)); strlcat(filename, "/", sizeof(filename)); strlcat(filename, name, sizeof(filename)); if (stat(filename, &statbuf) != 0) continue; - if (statbuf.st_rdev == udev->devt) { - info("found '%s', dev_t matches", udev->name); - rc = 0; - break; + if (major(udev->devt) > 0 && udev->devt != statbuf.st_rdev) { + info("skip '%s', dev_t doesn't match", udev->name); + continue; } + rc = 0; + break; } out: name_list_cleanup(&name_list); return rc; } -int main(int argc, char *argv[], char *envp[]) +static int stat_device(const char *name) +{ + struct stat statbuf; + + if (stat(name, &statbuf) != 0) + return -1; + + printf("%d %d\n", major(statbuf.st_dev), minor(statbuf.st_dev)); + return 0; +} + +int udevinfo(int argc, char *argv[], char *envp[]) { int option; struct udevice *udev; @@ -225,6 +229,7 @@ int main(int argc, char *argv[], char *envp[]) { "attribute-walk", 0, NULL, 'a' }, { "export-db", 0, NULL, 'e' }, { "root", 0, NULL, 'r' }, + { "device-id-of-file", 1, NULL, 'd' }, { "version", 0, NULL, 1 }, /* -V outputs braindead format */ { "help", 0, NULL, 'h' }, {} @@ -235,6 +240,7 @@ int main(int argc, char *argv[], char *envp[]) ACTION_QUERY, ACTION_ATTRIBUTE_WALK, ACTION_ROOT, + ACTION_DEVICE_ID_FILE, } action = ACTION_NONE; enum query_type { @@ -261,9 +267,8 @@ int main(int argc, char *argv[], char *envp[]) goto exit; } - /* get command line options */ while (1) { - option = getopt_long(argc, argv, "aden:p:q:rVh", options, NULL); + option = getopt_long(argc, argv, "aed:n:p:q:rVh", options, NULL); if (option == -1) break; @@ -275,7 +280,8 @@ int main(int argc, char *argv[], char *envp[]) strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name)); else strlcpy(name, optarg, sizeof(name)); - dbg("name: %s\n", name); + remove_trailing_chars(name, '/'); + dbg("name: %s", name); break; case 'p': /* remove /sys if given */ @@ -283,10 +289,30 @@ int main(int argc, char *argv[], char *envp[]) strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path)); else strlcpy(path, optarg, sizeof(path)); - dbg("path: %s\n", path); + remove_trailing_chars(path, '/'); + + /* possibly resolve to real devpath */ + if (sysfs_resolve_link(path, sizeof(path)) != 0) { + char temp[PATH_SIZE]; + char *pos; + + /* also check if the parent is a link */ + strlcpy(temp, path, sizeof(temp)); + pos = strrchr(temp, '/'); + if (pos != 0) { + char tail[PATH_SIZE]; + + strlcpy(tail, pos, sizeof(tail)); + pos[0] = '\0'; + if (sysfs_resolve_link(temp, sizeof(temp)) == 0) { + strlcpy(path, temp, sizeof(path)); + strlcat(path, tail, sizeof(path)); + } + } + } + dbg("path: %s", path); break; case 'q': - dbg("udev query: %s\n", optarg); action = ACTION_QUERY; if (strcmp(optarg, "name") == 0) { query = QUERY_NAME; @@ -316,14 +342,15 @@ int main(int argc, char *argv[], char *envp[]) action = ACTION_ROOT; root = 1; break; + case 'd': + action = ACTION_DEVICE_ID_FILE; + strlcpy(name, optarg, sizeof(name)); + break; case 'a': action = ACTION_ATTRIBUTE_WALK; break; - case 'd': - export_db(export_name_devpath); - goto exit; case 'e': - export_db(export_record); + export_db(); goto exit; case 1: printf("%s\n", UDEV_VERSION); @@ -332,21 +359,21 @@ int main(int argc, char *argv[], char *envp[]) printf("udevinfo, version %s\n", UDEV_VERSION); goto exit; case 'h': - printf("Usage: udevinfo OPTIONS\n" - " --query= query database for the specified value:\n" - " name name of device node\n" - " symlink pointing to node\n" - " path sysfs device path\n" - " env the device related imported environment\n" - " all all values\n" - "\n" - " --path= sysfs device path used for query or chain\n" - " --name= node or symlink name used for query\n" - "\n" - " --root prepend to query result or print udev_root\n" - " --attribute-walk print all SYSFS_attributes along the device chain\n" - " --export-db export the content of the udev database\n" - " --help print this text\n" + printf("Usage: udevadm info OPTIONS\n" + " --query= query database for the specified value:\n" + " name name of device node\n" + " symlink pointing to node\n" + " path sysfs 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" + " of parent devices\n" + " --device-id-of-file= print major/minor of underlying device\n" + " --export-db export the content of the udev database\n" + " --help print this text\n" "\n"); goto exit; default: @@ -384,15 +411,14 @@ int main(int argc, char *argv[], char *envp[]) printf("%s\n", udev->name); break; case QUERY_SYMLINK: - if (list_empty(&udev->symlink_list)) - goto exit; - if (root) - list_for_each_entry(name_loop, &udev->symlink_list, node) - printf("%s/%s ", udev_root, name_loop->name); - else - list_for_each_entry(name_loop, &udev->symlink_list, node) - printf("%s ", name_loop->name); - printf("\n"); + list_for_each_entry(name_loop, &udev->symlink_list, node) { + char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n'; + + if (root) + printf("%s/%s%c", udev_root, name_loop->name, c); + else + printf("%s%c", name_loop->name, c); + } break; case QUERY_PATH: printf("%s\n", udev->dev->devpath); @@ -412,7 +438,7 @@ int main(int argc, char *argv[], char *envp[]) case ACTION_ATTRIBUTE_WALK: if (path[0] != '\0') { if (print_device_chain(path) != 0) { - fprintf(stderr, "device not found\n"); + fprintf(stderr, "no valid sysfs device found\n"); rc = 4; goto exit; } @@ -423,7 +449,7 @@ int main(int argc, char *argv[], char *envp[]) goto exit; } if (print_device_chain(udev->dev->devpath) != 0) { - fprintf(stderr, "device not found\n"); + fprintf(stderr, "no valid sysfs device found\n"); rc = 4; goto exit; } @@ -433,6 +459,10 @@ int main(int argc, char *argv[], char *envp[]) goto exit; } break; + case ACTION_DEVICE_ID_FILE: + if (stat_device(name) != 0) + rc = 6; + break; case ACTION_ROOT: printf("%s\n", udev_root); break;