chiark / gitweb /
[PATCH] PATCH some cleanups and security fixes
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 1d66410b6c0085ba1c9c780497fb4f8f94b98bc1..e6f2744fcbefe0826255550a0879e9f2f1c440a3 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
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.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"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
 char **main_envp;
 
-static void sig_handler(int signum)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
+{
+       va_list args;
+
+       if (!udev_log)
+               return;
+
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
+}
+#endif
+
+asmlinkage static void sig_handler(int signum)
 {
-       dbg("caught signal %d", signum);
        switch (signum) {
                case SIGINT:
                case SIGTERM:
-               case SIGKILL:
-                       sysbus_disconnect();
                        udevdb_exit();
                        exit(20 + signum);
-                       break;
                default:
-                       dbg("unhandled signal");
+                       dbg("unhandled signal %d", signum);
        }
 }
 
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
+static char *subsystem_blacklist[] = {
+       "scsi_host",
+       "scsi_device",
+       "usb_host",
+       "pci_bus",
+       "pcmcia_socket",
+       ""
+};
 
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
+int main(int argc, char *argv[], char *envp[])
 {
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
-int main(int argc, char **argv, char **envp)
-{
-       char *action;
-       char *devpath;
-       char *subsystem;
-       int retval = -EINVAL;
-
-       signal(SIGINT, sig_handler);
-       signal(SIGTERM, sig_handler);
-       signal(SIGKILL, sig_handler);
-
        main_argv = argv;
        main_envp = envp;
+       struct sigaction act;
+       char *action;
+       char *devpath = "";
+       char *subsystem = "";
+       int i;
+       int retval = -EINVAL;
+       enum {
+               ADD,
+               REMOVE,
+               UDEVSTART,
+       } act_type;
 
        dbg("version %s", UDEV_VERSION);
 
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
-               goto exit;
-       }
-
-       subsystem = argv[1];
-
-       devpath = get_devpath();
-       if (!devpath) {
-               dbg ("no devpath?");
-               goto exit;
-       }
-       dbg("looking at '%s'", devpath);
-
-       /* we only care about class devices and block stuff */
-       if (!strstr(devpath, "class") &&
-           !strstr(devpath, "block")) {
-               dbg("not a block or class device");
-               goto exit;
-       }
-
-       /* but we don't care about net class devices */
-       if (strcmp(subsystem, "net") == 0) {
-               dbg("don't care about net devices");
-               goto exit;
-       }
-
-       action = get_action();
-       if (!action) {
-               dbg ("no action?");
-               goto exit;
-       }
-
        /* initialize our configuration */
        udev_init_config();
 
-       /* connect to the system message bus */
-       sysbus_connect();
+       if (strstr(argv[0], "udevstart")) {
+               act_type = UDEVSTART;
+       } else {
+               action = get_action();
+               if (!action) {
+                       dbg("no action?");
+                       goto exit;
+               }
+               if (strcmp(action, "add") == 0) {
+                       act_type = ADD;
+               } else if (strcmp(action, "remove") == 0) {
+                       act_type = REMOVE;
+               } else {
+                       dbg("unknown action '%s'", action);
+                       goto exit;
+               }
+
+               devpath = get_devpath();
+               if (!devpath) {
+                       dbg("no devpath?");
+                       goto exit;
+               }
+               dbg("looking at '%s'", devpath);
+
+               /* we only care about class devices and block stuff */
+               if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
+                       dbg("not a block or class device");
+                       goto exit;
+               }
+
+               subsystem = get_subsystem(main_argv[1]);
+               if (!subsystem) {
+                       dbg("no subsystem?");
+                       goto exit;
+               }
+
+               /* skip blacklisted subsystems */
+               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++;
+               }
+       }
+
+       /* set signal handlers */
+       act.sa_handler = sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
 
        /* initialize udev database */
-       retval = udevdb_init(UDEVDB_DEFAULT);
-       if (retval != 0) {
+       if (udevdb_init(UDEVDB_DEFAULT) != 0) {
                dbg("unable to initialize database");
-               goto exit_sysbus;
+               goto exit;
        }
 
-       /* initialize the naming deamon */
-       namedev_init();
-
-       if (strcmp(action, "add") == 0)
-               retval = udev_add_device(devpath, subsystem);
-
-       else if (strcmp(action, "remove") == 0)
+       switch(act_type) {
+       case UDEVSTART:
+               dbg("udevstart");
+               namedev_init();
+               udev_sleep = 0;
+               retval = udev_start();
+               break;
+       case ADD:
+               dbg("udev add");
+               namedev_init();
+               retval = udev_add_device(devpath, subsystem, NOFAKE);
+               break;
+       case REMOVE:
+               dbg("udev remove");
                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:
        return retval;