[PATCH] move udev_selinux into extras/selinux

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 4ae46845368e6880e72381466133c7cfaae46554..52b98c8d452efb8d99a94a82005d42ce797479ba 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -20,17 +20,18 @@
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
 #include <signal.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -40,7 +41,7 @@ char **main_argv;
 char **main_envp;
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
        va_list args;
@@ -59,7 +60,6 @@ static void sig_handler(int signum)
        switch (signum) {
                case SIGINT:
                case SIGTERM:
-                       sysbus_disconnect();
                        udevdb_exit();
                        exit(20 + signum);
                default:
@@ -73,7 +73,8 @@ static char *subsystem_blacklist[] = {
        "scsi_device",
        "usb_host",
        "pci_bus",
-       "",
+       "pcmcia_socket",
+       ""
 };
 
 static int udev_hotplug(void)
@@ -120,14 +121,11 @@ static int udev_hotplug(void)
                i++;
        }
 
-       /* 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_sysbus;
+               goto exit;
        }
 
        /* set up a default signal handler for now */
@@ -137,24 +135,19 @@ static int udev_hotplug(void)
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       /* initialize the naming deamon */
-       namedev_init();
-
-       if (strcmp(action, "add") == 0)
+       if (strcmp(action, "add") == 0) {
+               namedev_init();
                retval = udev_add_device(devpath, subsystem, 0);
-
-       else if (strcmp(action, "remove") == 0)
-               retval = udev_remove_device(devpath, subsystem);
-
-       else {
-               dbg("unknown action '%s'", action);
-               retval = -EINVAL;
+       } else {
+               if (strcmp(action, "remove") == 0) {
+                       retval = udev_remove_device(devpath, subsystem);
+               } else {
+                       dbg("unknown action '%s'", action);
+                       retval = -EINVAL;
+               }
        }
-       udevdb_exit();
 
-exit_sysbus:
-       /* disconnect from the system message bus */
-       sysbus_disconnect();
+       udevdb_exit();
 
 exit:
        if (retval > 0)
@@ -163,7 +156,7 @@ 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;