[PATCH] udev* segfaults with new klibc

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index ce6d6ce9df22a7b2cb9ab3bb84133d25906d2d18..9b4d91f75cea26373c9aebc7688b0d992d0c3089 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -27,23 +27,23 @@
 #include <ctype.h>
 #include <signal.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
 char **main_envp;
 
 #ifdef LOG
-unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
-       va_list args;
+       va_list args;
 
        if (!udev_log)
                return;
@@ -67,40 +67,17 @@ static void sig_handler(int signum)
        }
 }
 
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
 static char *subsystem_blacklist[] = {
        "net",
        "scsi_host",
        "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;
@@ -111,13 +88,13 @@ static int udev_hotplug(int argc, char **argv)
 
        action = get_action();
        if (!action) {
-               dbg ("no action?");
+               dbg("no action?");
                goto exit;
        }
 
        devpath = get_devpath();
        if (!devpath) {
-               dbg ("no devpath?");
+               dbg("no devpath?");
                goto exit;
        }
        dbg("looking at '%s'", devpath);
@@ -130,7 +107,11 @@ static int udev_hotplug(int argc, char **argv)
        }
 
        /* skip blacklisted subsystems */
-       subsystem = argv[1];
+       subsystem = get_subsystem(main_argv[1]);
+       if (!subsystem) {
+               dbg("no subsystem?");
+               goto exit;
+       }
        i = 0;
        while (subsystem_blacklist[i][0] != '\0') {
                if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -143,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) {
@@ -186,15 +164,17 @@ exit:
        return -retval;
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
 {
        main_argv = argv;
        main_envp = envp;
 
        init_logging("udev");
-       dbg("version %s", UDEV_VERSION);
 
-       return udev_hotplug(argc, argv);
-}
+       /* initialize our configuration */
+       udev_init_config();
 
+       dbg("version %s", UDEV_VERSION);
 
+       return udev_hotplug();
+}