X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevadm-info.c;h=8145e6f50c1a1ffe4f452b7e3cd8800c084fe8cf;hb=deb2e5230b4dcbc0e2e02cc47a0b2d0d7179a044;hp=229c0a2849b455a02fb637bad7098f97fe19bef1;hpb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;p=elogind.git diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 229c0a284..8145e6f50 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Kay Sievers + * Copyright (C) 2004-2009 Kay Sievers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,10 +30,11 @@ #include #include "udev.h" +#include "udev-util.h" static bool skip_attribute(const char *name) { - static const char const *skip[] = { + static const char* const skip[] = { "uevent", "dev", "modalias", @@ -45,7 +46,7 @@ static bool skip_attribute(const char *name) unsigned int i; for (i = 0; i < ELEMENTSOF(skip); i++) - if (strcmp(name, skip[i]) == 0) + if (streq(name, skip[i])) return true; return false; } @@ -251,167 +252,170 @@ static void cleanup_db(struct udev *udev) closedir(dir); } - dir = opendir("/run/udev/watch"); + dir = opendir("/run/udev/static_node-tags"); if (dir != NULL) { - cleanup_dir(dir, 0, 1); + cleanup_dir(dir, 0, 2); closedir(dir); } - dir = opendir("/run/udev/firmware-missing"); + dir = opendir("/run/udev/watch"); if (dir != NULL) { cleanup_dir(dir, 0, 1); closedir(dir); } } +static struct udev_device *find_device(struct udev *udev, const char *id, const char *prefix) +{ + char name[UTIL_PATH_SIZE]; + + if (prefix && !startswith(id, prefix)) { + strscpyl(name, sizeof(name), prefix, id, NULL); + id = name; + } + + if (startswith(id, "/dev/")) { + struct stat statbuf; + char type; + + if (stat(id, &statbuf) < 0) + return NULL; + + if (S_ISBLK(statbuf.st_mode)) + type = 'b'; + else if (S_ISCHR(statbuf.st_mode)) + type = 'c'; + else + return NULL; + + return udev_device_new_from_devnum(udev, type, statbuf.st_rdev); + } else if (startswith(id, "/sys/")) + return udev_device_new_from_syspath(udev, id); + else + return NULL; +} + static int uinfo(struct udev *udev, int argc, char *argv[]) { - struct udev_device *device = NULL; + _cleanup_udev_device_unref_ struct udev_device *device = NULL; bool root = 0; bool export = 0; const char *export_prefix = NULL; - char path[UTIL_PATH_SIZE]; char name[UTIL_PATH_SIZE]; struct udev_list_entry *list_entry; - int rc = 0; + int c; static const struct option options[] = { - { "name", required_argument, NULL, 'n' }, - { "path", required_argument, NULL, 'p' }, - { "query", required_argument, NULL, 'q' }, - { "attribute-walk", no_argument, NULL, 'a' }, - { "cleanup-db", no_argument, NULL, 'c' }, - { "export-db", no_argument, NULL, 'e' }, - { "root", no_argument, NULL, 'r' }, - { "run", no_argument, NULL, 'R' }, + { "name", required_argument, NULL, 'n' }, + { "path", required_argument, NULL, 'p' }, + { "query", required_argument, NULL, 'q' }, + { "attribute-walk", no_argument, NULL, 'a' }, + { "cleanup-db", no_argument, NULL, 'c' }, + { "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, 'V' }, - { "help", no_argument, NULL, 'h' }, + { "export", no_argument, NULL, 'x' }, + { "export-prefix", required_argument, NULL, 'P' }, + { "version", no_argument, NULL, 'V' }, + { "help", no_argument, NULL, 'h' }, {} }; + static const char *usage = + "Usage: udevadm info [OPTIONS] [DEVPATH|FILE]\n" + " -q,--query=TYPE query device information:\n" + " name name of device node\n" + " symlink pointing to node\n" + " path sys device path\n" + " property the device properties\n" + " all all values\n" + " -p,--path=SYSPATH sys device path used for query or attribute walk\n" + " -n,--name=NAME node or symlink name used for query or attribute walk\n" + " -r,--root prepend dev directory to path names\n" + " -a,--attribute-walk print all key matches walking along the chain\n" + " of parent devices\n" + " -d,--device-id-of-file=FILE print major:minor of device containing this file\n" + " -x,--export export key/value pairs\n" + " -P,--export-prefix export the key name with a prefix\n" + " -e,--export-db export the content of the udev database\n" + " -c,--cleanup-db cleanup the udev database\n" + " --version print version of the program\n" + " -h,--help print this message\n"; + enum action_type { - ACTION_NONE, ACTION_QUERY, ACTION_ATTRIBUTE_WALK, - ACTION_ROOT, ACTION_DEVICE_ID_FILE, - } action = ACTION_NONE; + } action = ACTION_QUERY; enum query_type { - QUERY_NONE, QUERY_NAME, QUERY_PATH, QUERY_SYMLINK, QUERY_PROPERTY, QUERY_ALL, - } query = QUERY_NONE; + } query = QUERY_ALL; - for (;;) { - int option; - struct stat statbuf; - - option = getopt_long(argc, argv, "aced:n:p:q:rxP:RVh", options, NULL); - if (option == -1) - break; - - switch (option) { - case 'n': + while ((c = getopt_long(argc, argv, "aced:n:p:q:rxP:RVh", options, NULL)) >= 0) + switch (c) { + case 'n': { if (device != NULL) { fprintf(stderr, "device already specified\n"); - rc = 2; - goto exit; + return 2; } - /* add /dev if not given */ - if (!startswith(optarg, "/dev")) - util_strscpyl(name, sizeof(name), "/dev/", optarg, NULL); - else - util_strscpy(name, sizeof(name), optarg); - util_remove_trailing_chars(name, '/'); - if (stat(name, &statbuf) < 0) { + + device = find_device(udev, optarg, "/dev/"); + if (device == NULL) { 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; - } + return 2; } break; + } case 'p': if (device != NULL) { fprintf(stderr, "device already specified\n"); - rc = 2; - goto exit; + return 2; } - /* add sys dir if needed */ - if (!startswith(optarg, "/sys")) - util_strscpyl(path, sizeof(path), "/sys", optarg, NULL); - else - util_strscpy(path, sizeof(path), optarg); - util_remove_trailing_chars(path, '/'); - device = udev_device_new_from_syspath(udev, path); + + device = find_device(udev, optarg, "/sys"); if (device == NULL) { - fprintf(stderr, "device path not found\n"); - rc = 2; - goto exit; + fprintf(stderr, "syspath not found\n"); + return 2; } break; case 'q': action = ACTION_QUERY; - if (strcmp(optarg, "property") == 0 || strcmp(optarg, "env") == 0) { + if (streq(optarg, "property") || streq(optarg, "env")) query = QUERY_PROPERTY; - } else if (strcmp(optarg, "name") == 0) { + else if (streq(optarg, "name")) query = QUERY_NAME; - } else if (strcmp(optarg, "symlink") == 0) { + else if (streq(optarg, "symlink")) query = QUERY_SYMLINK; - } else if (strcmp(optarg, "path") == 0) { + else if (streq(optarg, "path")) query = QUERY_PATH; - } else if (strcmp(optarg, "all") == 0) { + else if (streq(optarg, "all")) query = QUERY_ALL; - } else { + else { fprintf(stderr, "unknown query type\n"); - rc = 3; - goto exit; + return 3; } break; case 'r': - if (action == ACTION_NONE) - action = ACTION_ROOT; root = true; break; - case 'R': - printf("/run/udev\n"); - goto exit; case 'd': action = ACTION_DEVICE_ID_FILE; - util_strscpy(name, sizeof(name), optarg); + strscpy(name, sizeof(name), optarg); break; case 'a': action = ACTION_ATTRIBUTE_WALK; break; case 'e': export_devices(udev); - goto exit; + return 0; case 'c': cleanup_db(udev); - goto exit; + return 0; case 'x': export = true; break; @@ -420,39 +424,26 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) break; case 'V': printf("%s\n", VERSION); - goto exit; + return 0; case 'h': - printf("Usage: udevadm info OPTIONS\n" - " --query= query device information:\n" - " name name of device node\n" - " symlink pointing to node\n" - " path sys device path\n" - " property the device properties\n" - " all all values\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 device containing this file\n" - " --export export key/value pairs\n" - " --export-prefix export the key name with a prefix\n" - " --export-db export the content of the udev database\n" - " --cleanup-db cleanup the udev database\n" - " --help\n\n"); - goto exit; + printf("%s\n", usage); + return 0; default: - rc = 1; - goto exit; + return 1; } - } switch (action) { case ACTION_QUERY: - if (device == NULL) { - fprintf(stderr, "query needs a valid device specified by --path= or --name=\n"); - rc = 4; - goto exit; + if (!device) { + if (!argv[optind]) { + fprintf(stderr, "%s\n", usage); + return 2; + } + device = find_device(udev, argv[optind], NULL); + if (!device) { + fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n"); + return 4; + } } switch(query) { @@ -461,8 +452,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) if (node == NULL) { fprintf(stderr, "no device node found\n"); - rc = 5; - goto exit; + return 5; } if (root) @@ -486,7 +476,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) break; case QUERY_PATH: printf("%s\n", udev_device_get_devpath(device)); - goto exit; + return 0; case QUERY_PROPERTY: list_entry = udev_device_get_properties_list_entry(device); while (list_entry != NULL) { @@ -508,34 +498,30 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) print_record(device); break; default: - fprintf(stderr, "unknown query type\n"); - break; + assert_not_reached("unknown query type"); } break; case ACTION_ATTRIBUTE_WALK: - if (device == NULL) { - fprintf(stderr, "query needs a valid device specified by --path= or --name=\n"); - rc = 4; - goto exit; + if (!device && argv[optind]) { + device = find_device(udev, argv[optind], NULL); + if (!device) { + fprintf(stderr, "Unknown device, absolute path in /dev/ or /sys expected.\n"); + return 4; + } + } + if (!device) { + fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n"); + return 4; } print_device_chain(device); break; case ACTION_DEVICE_ID_FILE: if (stat_device(name, export, export_prefix) != 0) - rc = 1; - break; - case ACTION_ROOT: - printf("/dev\n"); - break; - default: - fprintf(stderr, "missing option\n"); - rc = 1; + return 1; break; } -exit: - udev_device_unref(device); - return rc; + return 0; } const struct udevadm_cmd udevadm_info = {