[PATCH] udev* segfaults with new klibc

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index bf18a568eaae06b7ce09b3ea0ca79ddde3be0434..9b4d91f75cea26373c9aebc7688b0d992d0c3089 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -3,8 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -24,67 +23,78 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
 #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;
 
-static inline char *get_action(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
 {
-       char *action;
+       va_list args;
 
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
+       if (!udev_log)
+               return;
 
-       devpath = getenv("DEVPATH");
-       return devpath;
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
 }
+#endif
 
-static inline char *get_seqnum(void)
+static void sig_handler(int signum)
 {
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
+       switch (signum) {
+               case SIGINT:
+               case SIGTERM:
+                       sysbus_disconnect();
+                       udevdb_exit();
+                       exit(20 + signum);
+               default:
+                       dbg("unhandled signal");
+       }
 }
 
-int main(int argc, char **argv, char **envp)
+static char *subsystem_blacklist[] = {
+       "net",
+       "scsi_host",
+       "scsi_device",
+       "usb_host",
+       "pci_bus",
+       "pcmcia_socket",
+       ""
+};
+
+static int udev_hotplug(void)
 {
        char *action;
        char *devpath;
        char *subsystem;
        int retval = -EINVAL;
-       
-       main_argv = argv;
-       main_envp = envp;
+       int i;
+       struct sigaction act;
 
-       dbg("version %s", UDEV_VERSION);
-
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
+       action = get_action();
+       if (!action) {
+               dbg("no action?");
                goto exit;
        }
 
-       subsystem = argv[1];
-
        devpath = get_devpath();
        if (!devpath) {
-               dbg ("no devpath?");
+               dbg("no devpath?");
                goto exit;
        }
        dbg("looking at '%s'", devpath);
@@ -96,33 +106,43 @@ 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");
+       /* skip blacklisted subsystems */
+       subsystem = get_subsystem(main_argv[1]);
+       if (!subsystem) {
+               dbg("no subsystem?");
                goto exit;
        }
-
-       action = get_action();
-       if (!action) {
-               dbg ("no action?");
-               goto exit;
+       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++;
        }
 
-       /* initialize our configuration */
-       udev_init_config();
+       /* connect to the system message bus */
+       sysbus_connect();
 
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
                dbg("unable to initialize database");
-               goto exit;
+               goto exit_sysbus;
        }
 
+       /* set up a default signal handler for now */
+       act.sa_handler = sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+
        /* initialize the naming deamon */
        namedev_init();
 
        if (strcmp(action, "add") == 0)
-               retval = udev_add_device(devpath, subsystem);
+               retval = udev_add_device(devpath, subsystem, 0);
 
        else if (strcmp(action, "remove") == 0)
                retval = udev_remove_device(devpath, subsystem);
@@ -133,6 +153,28 @@ int main(int argc, char **argv, char **envp)
        }
        udevdb_exit();
 
-exit:  
-       return retval;
+exit_sysbus:
+       /* disconnect from the system message bus */
+       sysbus_disconnect();
+
+exit:
+       if (retval > 0)
+               retval = 0;
+
+       return -retval;
+}
+
+int main(int argc, char *argv[], char *envp[])
+{
+       main_argv = argv;
+       main_envp = envp;
+
+       init_logging("udev");
+
+       /* initialize our configuration */
+       udev_init_config();
+
+       dbg("version %s", UDEV_VERSION);
+
+       return udev_hotplug();
 }