Commits

braindamaged committed 82553db

udev: support "udevadm info /dev/sda; udevadm info /sys/class/block/sda"

  • Participants
  • Parent commits 703fbc0

Comments (0)

Files changed (1)

src/udevadm-info.c

         }
 }
 
+static struct udev_device *find_device(struct udev *udev, const char *id, const char *prefix)
+{
+        char name[UTIL_PATH_SIZE];
+
+        if (prefix && strncmp(id, prefix, strlen(prefix))) {
+                util_strscpyl(name, sizeof(name), prefix, id, NULL);
+                id = name;
+        }
+
+        if (strstr(id, udev_get_dev_path(udev)) == id) {
+                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 (strstr(id, udev_get_sys_path(udev)) == id)
+                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;
         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;
                 {}
         };
 
+        static const char usage[] =
+            "Usage: udevadm info OPTIONS\n"
+            "  --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"
+            "  --path=<syspath>           sys device path used for query or attribute walk\n"
+            "  --name=<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=<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";
+
+
         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_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)
                                 rc = 2;
                                 goto exit;
                         }
-                        /* remove /dev if given */
-                        if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0)
-                                util_strscpyl(name, sizeof(name), udev_get_dev_path(udev), "/", optarg, NULL);
-                        else
-                                util_strscpy(name, sizeof(name), optarg);
-                        util_remove_trailing_chars(name, '/');
-                        if (stat(name, &statbuf) < 0) {
+                        device = find_device(udev, optarg, udev_get_dev_path(udev));
+                        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;
-                                }
                         }
                         break;
                 case 'p':
                                 rc = 2;
                                 goto exit;
                         }
-                        /* add sys dir if needed */
-                        if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
-                                util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), 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, udev_get_sys_path(udev));
                         if (device == NULL) {
                                 fprintf(stderr, "device path not found\n");
                                 rc = 2;
                         printf("%s\n", VERSION);
                         goto exit;
                 case 'h':
-                        printf("Usage: udevadm info OPTIONS\n"
-                               "  --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"
-                               "  --path=<syspath>           sys device path used for query or attribute walk\n"
-                               "  --name=<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=<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");
+                        printf("%s\n", usage);
                         goto exit;
                 default:
                         rc = 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(!argv[optind]) {
+                                fprintf(stderr, "%s\n", usage);
+                                rc = 2;
+                                goto exit;
+                        }
+                        device = find_device(udev, argv[optind], NULL);
+                        if(device == NULL) {
+                                fprintf(stderr,
+                                        "query needs a valid device specified"
+                                        "by --path=, --name=, or absolute path"
+                                        "in %s or %s\n", udev_get_dev_path(udev), udev_get_sys_path(udev));
+                                rc = 4;
+                                goto exit;
+                        }
                 }
 
                 switch(query) {
                 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(argv[optind])
+                                device = find_device(udev, argv[optind], NULL);
+                        if(device == NULL) {
+                                fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
+                                rc = 4;
+                                goto exit;
+                        }
                 }
                 print_device_chain(device);
                 break;