[PATCH] add tests for NAME="foo-%c{N}"

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 4486707f426a68f748cf23133fb1afd24c35232a..227145982ef54da68d913c3a69d332096cfd1367 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -41,7 +41,7 @@ char **main_envp;
 
 #ifdef LOG
 unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+void log_message(int level, const char *format, ...)
 {
        va_list args;
 
@@ -73,10 +73,11 @@ static char *subsystem_blacklist[] = {
        "scsi_device",
        "usb_host",
        "pci_bus",
+       "pcmcia_socket",
        "",
 };
 
-static int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
 {
        char *action;
        char *devpath;
@@ -106,7 +107,7 @@ static int udev_hotplug(int argc, char **argv)
        }
 
        /* skip blacklisted subsystems */
-       subsystem = get_subsystem(argv[1]);
+       subsystem = get_subsystem(main_argv[1]);
        if (!subsystem) {
                dbg("no subsystem?");
                goto exit;
@@ -123,9 +124,6 @@ static int udev_hotplug(int argc, char **argv)
        /* connect to the system message bus */
        sysbus_connect();
 
-       /* initialize our configuration */
-       udev_init_config();
-
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
@@ -172,7 +170,11 @@ int main(int argc, char **argv, char **envp)
        main_envp = envp;
 
        init_logging("udev");
+
+       /* initialize our configuration */
+       udev_init_config();
+
        dbg("version %s", UDEV_VERSION);
 
-       return udev_hotplug(argc, argv);
+       return udev_hotplug();
 }