X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=2832ea0ee368677ca7325384bb7655108c7fd980;hp=d6f564079f0510687c67576efc52434e0c4af6cf;hb=c48622cc25bad59aadb9f8e1d66c6ed5fb85cbe0;hpb=95776dc6ec174f47fa4dd4d8abf5d457223e5dd4 diff --git a/udevinfo.c b/udevinfo.c index d6f564079..2832ea0ee 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -1,7 +1,5 @@ /* - * udevinfo.c - fetches stored device information or sysfs attributes - * - * Copyright (C) 2004-2005 Kay Sievers + * Copyright (C) 2004-2006 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 the @@ -14,7 +12,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -27,6 +25,9 @@ #include #include #include +#include +#include +#include #include "udev.h" @@ -57,10 +58,23 @@ static void print_all_attributes(const char *devpath, const char *key) dir = opendir(path); if (dir != NULL) { for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { + struct stat statbuf; + char filename[PATH_SIZE]; char *attr_value; char value[NAME_SIZE]; size_t len; + if (dent->d_name[0] == '.') + continue; + + strlcpy(filename, path, sizeof(filename)); + strlcat(filename, "/", sizeof(filename)); + strlcat(filename, dent->d_name, sizeof(filename)); + if (lstat(filename, &statbuf) != 0) + continue; + if (S_ISLNK(statbuf.st_mode)) + continue; + attr_value = sysfs_attr_get_value(devpath, dent->d_name); if (attr_value == NULL) continue; @@ -90,6 +104,10 @@ static int print_device_chain(const char *devpath) { struct sysfs_device *dev; + dev = sysfs_device_get(devpath); + if (dev == NULL) + return -1; + printf("\n" "Udevinfo starts with the device specified by the devpath and then\n" "walks up the chain of parent devices. It prints for every device\n" @@ -98,10 +116,6 @@ static int print_device_chain(const char *devpath) "and the attributes from one single parent device.\n" "\n"); - dev = sysfs_device_get(devpath); - if (dev == NULL) - return -1; - printf(" looking at device '%s':\n", dev->devpath); printf(" KERNEL==\"%s\"\n", dev->kernel); printf(" SUBSYSTEM==\"%s\"\n", dev->subsystem); @@ -115,7 +129,7 @@ static int print_device_chain(const char *devpath) break; printf(" looking at parent device '%s':\n", dev->devpath); printf(" KERNELS==\"%s\"\n", dev->kernel); - printf(" SUBSYTEMS==\"%s\"\n", dev->subsystem); + printf(" SUBSYSTEMS==\"%s\"\n", dev->subsystem); printf(" DRIVERS==\"%s\"\n", dev->driver); print_all_attributes(dev->devpath, "ATTRS"); @@ -163,34 +177,24 @@ static void export_db(void fnct(struct udevice *udev)) { name_list_cleanup(&name_list); } -static void print_help(void) -{ - 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" - " 'path' sysfs device path\n" - " 'env' the device related imported environment\n" - " 'all' all values\n" - "\n" - " -p PATH sysfs device path used for query or chain\n" - " -n NAME node/symlink name used for query\n" - "\n" - " -r prepend to query result or print udev_root\n" - " -a print all SYSFS_attributes along the device chain\n" - " -e export the content of the udev database\n" - " -V print udev version\n" - " -h print this help text\n" - "\n"); -} - int main(int argc, char *argv[], char *envp[]) { - static const char short_options[] = "aden:p:q:rVh"; int option; struct udevice *udev; int root = 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' }, + { "version", 0, NULL, 'V' }, + { "help", 0, NULL, 'h' }, + {} + }; + enum action_type { ACTION_NONE, ACTION_QUERY, @@ -213,7 +217,6 @@ int main(int argc, char *argv[], char *envp[]) int rc = 0; logging_init("udevinfo"); - udev_config_init(); sysfs_init(); @@ -225,7 +228,7 @@ int main(int argc, char *argv[], char *envp[]) /* get command line options */ while (1) { - option = getopt(argc, argv, short_options); + option = getopt_long(argc, argv, "aden:p:q:rVh", options, NULL); if (option == -1) break; @@ -291,9 +294,25 @@ int main(int argc, char *argv[], char *envp[]) printf("udevinfo, version %s\n", UDEV_VERSION); goto exit; case 'h': - case '?': + 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" + " --verision print udev version\n" + " --help print this text\n" + "\n"); + goto exit; default: - print_help(); goto exit; } } @@ -318,7 +337,7 @@ int main(int argc, char *argv[], char *envp[]) } udev_db_get_device(udev, devpath); } else { - fprintf(stderr, "query needs device path(-p) or node name(-n) specified\n"); + fprintf(stderr, "query needs --path or node --name specified\n"); rc = 4; goto exit; } @@ -352,13 +371,17 @@ int main(int argc, char *argv[], char *envp[]) print_record(udev); break; default: - print_help(); + fprintf(stderr, "unknown query type\n"); break; } break; case ACTION_ATTRIBUTE_WALK: if (path[0] != '\0') { - print_device_chain(path); + if (print_device_chain(path) != 0) { + fprintf(stderr, "device not found\n"); + rc = 4; + goto exit; + } } else if (name[0] != '\0') { char devpath[PATH_SIZE]; @@ -367,9 +390,13 @@ int main(int argc, char *argv[], char *envp[]) rc = 4; goto exit; } - print_device_chain(devpath); + if (print_device_chain(devpath) != 0) { + fprintf(stderr, "device not found\n"); + rc = 4; + goto exit; + } } else { - fprintf(stderr, "attribute walk needs device path(-p) or node name(-n) specified\n"); + fprintf(stderr, "attribute walk needs --path or node --name specified\n"); rc = 5; goto exit; } @@ -378,7 +405,7 @@ int main(int argc, char *argv[], char *envp[]) printf("%s\n", udev_root); break; default: - print_help(); + fprintf(stderr, "missing option\n"); rc = 1; break; }