[PATCH] add IGNORE rule type

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 1d66410b6c0085ba1c9c780497fb4f8f94b98bc1..116acf538976a070aadaff0ed30187e9dd506747 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <stdarg.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -81,27 +82,78 @@ static inline char *get_seqnum(void)
        return seqnum;
 }
 
-int main(int argc, char **argv, char **envp)
+static inline int udev_user(int argc, char **argv)
 {
-       char *action;
-       char *devpath;
-       char *subsystem;
+       static const char short_options[] = "q:rVh";
+       int option;
        int retval = -EINVAL;
+       struct udevice dev;
 
-       signal(SIGINT, sig_handler);
-       signal(SIGTERM, sig_handler);
-       signal(SIGKILL, sig_handler);
+       while (1) {
+               option = getopt(argc, argv, short_options);
+               if (option == -1)
+                       break;
 
-       main_argv = argv;
-       main_envp = envp;
+               dbg("option '%c'", option);
+               switch (option) {
+               case 'q':
+                       dbg("udev query: %s\n", optarg);
+                       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");
+                       }
+                       udevdb_exit();
+                       return retval;
 
-       dbg("version %s", UDEV_VERSION);
+               case 'r':
+                       printf("%s\n", udev_root);
+                       return 0;
 
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
-               goto exit;
+               case 'V':
+                       printf("udev, version %s\n", UDEV_VERSION);
+                       return 0;
+
+               case 'h':
+                       retval = 0;
+               case '?':
+               default:
+                       goto help;
+               }
        }
 
+help:
+       printf("Usage: [-qrVh]\n"
+              "  -q <path>  query database for the name of the created node\n"
+              "  -r         print udev root\n"
+              "  -V         print udev version\n"
+              "  -h         print this help text\n"
+              "\n");
+
+       return retval;
+}
+
+static char *subsystem_blacklist[] = {
+       "net",
+       "scsi_host",
+       "scsi_device",
+       "",
+};
+
+static inline int udev_hotplug(int argc, char **argv)
+{
+       char *action;
+       char *devpath;
+       char *subsystem;
+       int retval = -EINVAL;
+       int i;
+
        subsystem = argv[1];
 
        devpath = get_devpath();
@@ -118,10 +170,14 @@ int main(int argc, char **argv, char **envp)
                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();
@@ -130,9 +186,6 @@ int main(int argc, char **argv, char **envp)
                goto exit;
        }
 
-       /* initialize our configuration */
-       udev_init_config();
-
        /* connect to the system message bus */
        sysbus_connect();
 
@@ -143,6 +196,11 @@ int main(int argc, char **argv, char **envp)
                goto exit_sysbus;
        }
 
+       /* set up a default signal handler for now */
+       signal(SIGINT, sig_handler);
+       signal(SIGTERM, sig_handler);
+       signal(SIGKILL, sig_handler);
+
        /* initialize the naming deamon */
        namedev_init();
 
@@ -163,5 +221,32 @@ exit_sysbus:
        sysbus_disconnect();
 
 exit:
+       if (retval > 0)
+               retval = 0;
+
+       return -retval;
+}
+
+int main(int argc, char **argv, char **envp)
+{
+       main_argv = argv;
+       main_envp = envp;
+       int retval;
+
+       dbg("version %s", UDEV_VERSION);
+
+       /* initialize our configuration */
+       udev_init_config();
+
+       if (argc == 2 && argv[1][0] != '-') {
+               dbg("called by hotplug");
+               retval = udev_hotplug(argc, argv);
+       } else {
+               dbg("called by user");
+               retval = udev_user(argc, argv);
+       }
+
        return retval;
 }
+
+