udevtrigger: trigger devices sorted by their dependency

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 3146a96119e73826550b528f8061b12aacec4770..2832ea0ee368677ca7325384bb7655108c7fd980 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -25,6 +25,9 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>

+#include <getopt.h>
+#include <sys/stat.h>
+#include <sys/types.h>

 
 #include "udev.h"
 
 
 #include "udev.h"
 


@@ -55,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)) {
        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;
 
                        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;
                        attr_value = sysfs_attr_get_value(devpath, dent->d_name);
                        if (attr_value == NULL)
                                continue;


@@ -88,6 +104,10 @@ static int print_device_chain(const char *devpath)
 {
        struct sysfs_device *dev;
 
 {
        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"
        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"


@@ -96,10 +116,6 @@ static int print_device_chain(const char *devpath)
               "and the attributes from one single parent device.\n"
               "\n");
 
               "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);
        printf("  looking at device '%s':\n", dev->devpath);
        printf("    KERNEL==\"%s\"\n", dev->kernel);
        printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);


@@ -113,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);
                        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");
                printf("    DRIVERS==\"%s\"\n", dev->driver);
 
                print_all_attributes(dev->devpath, "ATTRS");


@@ -167,6 +183,18 @@ int main(int argc, char *argv[], char *envp[])
        struct udevice *udev;
        int root = 0;
 
        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,
        enum action_type {
                ACTION_NONE,
                ACTION_QUERY,


@@ -199,9 +227,8 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        /* get command line options */
        }
 
        /* get command line options */

-       opterr = 0;

        while (1) {
        while (1) {

-               option = getopt(argc, argv, ":aden:p:q:rVh");
+               option = getopt_long(argc, argv, "aden:p:q:rVh", options, NULL);

                if (option == -1)
                        break;
 
                if (option == -1)
                        break;
 


@@ -267,30 +294,25 @@ int main(int argc, char *argv[], char *envp[])
                        printf("udevinfo, version %s\n", UDEV_VERSION);
                        goto exit;
                case 'h':
                        printf("udevinfo, version %s\n", UDEV_VERSION);
                        goto exit;
                case 'h':

-                       printf("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"
+                       printf("Usage: udevinfo OPTIONS\n"
+                              "  --query=<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"
                               "\n"

-                              "  -p PATH  sysfs device path used for query or chain\n"
-                              "  -n NAME  node/symlink name used for query\n"
+                              "  --path=<devpath>  sysfs device path used for query or chain\n"
+                              "  --name=<name>     node or symlink name used for query\n"

                               "\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"
+                              "  --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;
                               "\n");
                        goto exit;

-               case ':':
-                       fprintf(stderr, "missing argument for '%c'\n", optopt);
-                       goto exit;
-               case '?':

                default:
                default:

-                       fprintf(stderr, "unrecognized option '%c'\n", optopt);

                        goto exit;
                }
        }
                        goto exit;
                }
        }


@@ -315,7 +337,7 @@ int main(int argc, char *argv[], char *envp[])
                        }
                        udev_db_get_device(udev, devpath);
                } else {
                        }
                        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;
                }
                        rc = 4;
                        goto exit;
                }


@@ -355,7 +377,11 @@ int main(int argc, char *argv[], char *envp[])
                break;
        case ACTION_ATTRIBUTE_WALK:
                if (path[0] != '\0') {
                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];
 
                } else if (name[0] != '\0') {
                        char devpath[PATH_SIZE];
 


@@ -364,9 +390,13 @@ int main(int argc, char *argv[], char *envp[])
                                rc = 4;
                                goto exit;
                        }
                                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 {
                } 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;
                }
                        rc = 5;
                        goto exit;
                }