chiark / gitweb /
[PATCH] set default owner/group in db.
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 1797e08273a3bdaceda83dca1d004f6edd21fc2e..3b701ac26fc913e1ef6b8676bca5baa50ef47179 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -34,6 +34,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -82,13 +83,40 @@ static inline char *get_seqnum(void)
        return seqnum;
 }
 
+/* callback for database dump */
+static int print_record(char *path, struct udevice *dev)
+{
+       printf("P: %s\n", path);
+       printf("N: %s\n", dev->name);
+       printf("S: %s\n", dev->symlink);
+       printf("O: %s\n", dev->owner);
+       printf("G: %s\n", dev->group);
+       printf("\n");
+       return 0;
+}
+
+enum query_type {
+       NONE,
+       NAME,
+       PATH,
+       SYMLINK,
+       OWNER,
+       GROUP
+};
+
 static inline int udev_user(int argc, char **argv)
 {
-       static const char short_options[] = "q:rVh";
+       static const char short_options[] = "dn:p:q:rVh";
        int option;
        int retval = -EINVAL;
        struct udevice dev;
+       int root = 0;
+       enum query_type query = NONE;
+       char result[NAME_SIZE] = "";
+       char path[NAME_SIZE] = "";
+       char name[NAME_SIZE] = "";
 
+       /* get command line options */
        while (1) {
                option = getopt(argc, argv, short_options);
                if (option == -1)
@@ -96,26 +124,61 @@ static inline int udev_user(int argc, char **argv)
 
                dbg("option '%c'", option);
                switch (option) {
+               case 'n':
+                       dbg("udev name: %s\n", optarg);
+                       strfieldcpy(name, optarg);
+                       break;
+
+               case 'p':
+                       dbg("udev path: %s\n", optarg);
+                       strfieldcpy(path, optarg);
+                       break;
+
                case 'q':
                        dbg("udev query: %s\n", optarg);
+
+                       if (strcmp(optarg, "name") == 0) {
+                               query = NAME;
+                               break;
+                       }
+
+                       if (strcmp(optarg, "symlink") == 0) {
+                               query = SYMLINK;
+                               break;
+                       }
+
+                       if (strcmp(optarg, "owner") == 0) {
+                               query = OWNER;
+                               break;
+                       }
+
+                       if (strcmp(optarg, "group") == 0) {
+                               query = GROUP;
+                               break;
+                       }
+
+                       if (strcmp(optarg, "path") == 0) {
+                               query = PATH;
+                               break;
+                       }
+
+                       printf("unknown query type\n");
+                       return -EINVAL;
+
+               case 'r':
+                       root = 1;
+                       break;
+
+               case 'd':
                        retval = udevdb_open_ro();
                        if (retval != 0) {
                                printf("unable to open udev database\n");
-                               return -1;
-                       }
-                       retval = udevdb_get_dev(optarg, &dev);
-                       if (retval == 0) {
-                               printf("%s\n", dev.name);
-                       } else {
-                               printf("device not found in udev database\n");
+                               return -EACCES;
                        }
+                       retval = udevdb_call_foreach(print_record);
                        udevdb_exit();
                        return retval;
 
-               case 'r':
-                       printf("%s\n", udev_root);
-                       return 0;
-
                case 'V':
                        printf("udev, version %s\n", UDEV_VERSION);
                        return 0;
@@ -128,23 +191,109 @@ static inline int udev_user(int argc, char **argv)
                }
        }
 
+       /* process options */
+       if (query != NONE) {
+               retval = udevdb_open_ro();
+               if (retval != 0) {
+                       printf("unable to open udev database\n");
+                       return -EACCES;
+               }
+
+               if (path[0] != '\0') {
+                       retval = udevdb_get_dev(path, &dev);
+                       if (retval != 0) {
+                               printf("device not found in database\n");
+                               goto exit;
+                       }
+                       goto print;
+               }
+
+               if (name[0] != '\0') {
+                       retval = udevdb_get_dev_byname(name, path, &dev);
+                       if (retval != 0) {
+                               printf("device not found in database\n");
+                               goto exit;
+                       }
+                       goto print;
+               }
+
+               printf("query needs device path(-p) or node name(-n) specified\n");
+               goto exit;
+
+print:
+               switch(query) {
+               case NAME:
+                       if (root)
+                               strfieldcpy(result, udev_root);
+                       strncat(result, dev.name, sizeof(result));
+                       break;
+
+               case SYMLINK:
+                       strfieldcpy(result, dev.symlink);
+                       break;
+
+               case GROUP:
+                       strfieldcpy(result, dev.group);
+                       break;
+
+               case OWNER:
+                       strfieldcpy(result, dev.owner);
+                       break;
+
+               case PATH:
+                       strfieldcpy(result, path);
+                       break;
+
+               default:
+                       goto exit;
+               }
+               printf("%s\n", result);
+
+exit:
+               udevdb_exit();
+               return retval;
+       }
+
+       if (root) {
+               printf("%s\n", udev_root);
+               return 0;
+       }
+
 help:
-       printf("Usage: [-qrVh]\n"
-              "  -q arg     query database \n"
-              "  -r         print udev root\n"
-              "  -V         print udev version\n"
-              "  -h         print this help text\n"
+       printf("Usage: [-npqrdVh]\n"
+              "  -q TYPE  query database for the specified value:\n"
+              "             'name'    name of device node\n"
+              "             'symlink' pointing to node\n"
+              "             'owner'   of node\n"
+              "             'group'   of node\n"
+              "             'path'    sysfs device path\n"
+              "  -p PATH  sysfs device path used for query\n"
+              "  -n NAME  node name used for query\n"
+              "\n"
+              "  -r       print udev root\n"
+              "  -d       dump whole database\n"
+              "  -V       print udev version\n"
+              "  -h       print this help text\n"
               "\n");
-
        return retval;
 }
 
+static char *subsystem_blacklist[] = {
+       "net",
+       "scsi_host",
+       "scsi_device",
+       "usb_host",
+       "pci_bus",
+       "",
+};
+
 static inline int udev_hotplug(int argc, char **argv)
 {
        char *action;
        char *devpath;
        char *subsystem;
        int retval = -EINVAL;
+       int i;
 
        subsystem = argv[1];
 
@@ -162,10 +311,14 @@ static inline int udev_hotplug(int argc, char **argv)
                goto exit;
        }
 
-       /* but we don't care about net class devices */
-       if (strcmp(subsystem, "net") == 0) {
-               dbg("don't care about net devices");
-               goto exit;
+       /* skip blacklisted subsystems */
+       i = 0;
+       while (subsystem_blacklist[i][0] != '\0') {
+               if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
+                       dbg("don't care about '%s' devices", subsystem);
+                       goto exit;
+               }
+               i++;
        }
 
        action = get_action();
@@ -209,14 +362,17 @@ exit_sysbus:
        sysbus_disconnect();
 
 exit:
-       return retval;
+       if (retval > 0)
+               retval = 0;
+
+       return -retval;
 }
 
 int main(int argc, char **argv, char **envp)
 {
+       int retval;
        main_argv = argv;
        main_envp = envp;
-       int retval;
 
        dbg("version %s", UDEV_VERSION);