[PATCH] make the udev object available to more processing stages

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index b54896669b72baddf579a6af0897592a1431af50..300e85ceb0aa0737c74f589cc39de53e43ed6f41 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -39,10 +39,6 @@
 #include "udevdb.h"
 
 
-/* global variables */
-char **main_argv;
-char **main_envp;
-
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
@@ -83,20 +79,15 @@ int main(int argc, char *argv[], char *envp[])
        } act_type;
 
        dbg("version %s", UDEV_VERSION);
-
-       main_argv = argv;
-       main_envp = envp;
-
        logging_init("udev");
-
        udev_init_config();
 
        if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
                act_type = UDEVSTART;
        } else {
-               const char *action = get_action();
-               const char *devpath = get_devpath();
-               const char *subsystem = get_subsystem(main_argv[1]);
+               const char *action = getenv("ACTION");
+               const char *devpath = getenv("DEVPATH");
+               const char *subsystem = argv[1];
 
                if (!action) {
                        dbg("no action?");
@@ -128,7 +119,7 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
-               udev_set_values(&udev, devpath, subsystem);
+               udev_set_values(&udev, devpath, subsystem, action);
 
                /* skip blacklisted subsystems */
                if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {