chiark / gitweb /
[PATCH] fix UDEV_NO_SLEEP
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index ed42862c00881d195e10012b8ca2dd964501dcfa..90c34d800a9ca22533f276bf475cd7dc6a450e3a 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 <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 "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
 char **main_envp;
 
-char sysfs_path[SYSFS_PATH_MAX];
-char *udev_config_dir = UDEV_CONFIG_DIR;
-char *udev_root = UDEV_ROOT;
-char udev_db_filename[PATH_MAX+NAME_MAX];
-char udev_config_permission_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
+/* local variables */
+static int is_udevstart;
 
-
-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)
+asmlinkage static void sig_handler(int signum)
 {
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
-static void get_dirs(void)
-{
-       char *temp;
-       char *udev_db = UDEV_DB;
-       char *udev_config = NAMEDEV_CONFIG_FILE;
-       char *udev_permission = NAMEDEV_CONFIG_PERMISSION_FILE;
-       int retval;
-
-       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-       if (retval)
-               dbg("sysfs_get_mnt_path failed");
-
-       /* see if we should try to override any of the default values */
-       temp = getenv("UDEV_TEST");
-       if (temp != NULL) {
-               /* hm testing is happening, use the specified values, if they are present */
-               temp = getenv("UDEV_SYSFS_PATH");
-               if (temp)
-                       strncpy(sysfs_path, temp, sizeof(sysfs_path));
-               temp = getenv("UDEV_CONFIG_DIR");
-               if (temp)
-                       udev_config_dir = temp;
-               temp = getenv("UDEV_ROOT");
-               if (temp)
-                       udev_root = temp;
-               temp = getenv("UDEV_DB");
-               if (temp)
-                       udev_db = temp;
-               temp = getenv("UDEV_CONFIG_FILE");
-               if (temp)
-                       udev_config = temp;
-               temp = getenv("UDEV_PERMISSION_FILE");
-               if (temp)
-                       udev_permission = temp;
+       switch (signum) {
+               case SIGINT:
+               case SIGTERM:
+                       udevdb_exit();
+                       exit(20 + signum);
+               default:
+                       dbg("unhandled signal %d", signum);
        }
-       dbg("sysfs_path = %s", sysfs_path);
-
-       strncpy(udev_db_filename, udev_config_dir, sizeof(udev_db_filename));
-       strncat(udev_db_filename, udev_db, sizeof(udev_db_filename));
-
-       strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename));
-       strncat(udev_config_filename, udev_config, sizeof(udev_config_filename));
-       
-       strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename));
-       strncat(udev_config_permission_filename, udev_permission, sizeof(udev_config_permission_filename));
 }
 
-int main(int argc, char **argv, char **envp)
+static char *subsystem_blacklist[] = {
+       "scsi_host",
+       "scsi_device",
+       "usb_host",
+       "pci_bus",
+       "pcmcia_socket",
+       ""
+};
+
+int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
 {
-       char *action;
-       char *devpath;
-       char *subsystem;
        int retval = -EINVAL;
-       
-       main_argv = argv;
-       main_envp = envp;
+       int i;
+       struct sigaction act;
+       const int nofake = 0;
 
-       dbg("version %s", UDEV_VERSION);
+       dbg("looking at '%s'", devpath);
 
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
+       /* 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 = argv[1];
+       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++;
+       }
 
-       devpath = get_devpath();
-       if (!devpath) {
-               dbg ("no devpath?");
+       /* initialize udev database */
+       retval = udevdb_init(UDEVDB_DEFAULT);
+       if (retval != 0) {
+               dbg("unable to initialize database");
                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 block or class");
-               goto exit;
+       /* 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);
+
+       if (strcmp(action, "add") == 0) {
+               /* Already done. */
+               if (!is_udevstart)
+                       namedev_init();
+               retval = udev_add_device(devpath, subsystem, nofake);
+               goto action_done;
        }
 
-       /* but we don't care about net class devices */
-       if (strcmp(subsystem, "net") == 0) {
-               dbg("don't care about net devices");
-               goto exit;
+       if (strcmp(action, "remove") == 0) {
+               retval = udev_remove_device(devpath, subsystem);
+               goto action_done;
        }
 
+       dbg("unknown action '%s'", action);
+       retval = -EINVAL;
+
+action_done:
+       udevdb_exit();
+
+exit:
+       return retval;
+}
+
+static int udev_hotplug(void)
+{
+       char *action;
+       char *devpath;
+       char *subsystem;
+
        action = get_action();
        if (!action) {
-               dbg ("no action?");
-               goto exit;
+               dbg("no action?");
+               return -EINVAL;
        }
 
-       /* initialize udev database */
-       get_dirs();
-       retval = udevdb_init(UDEVDB_DEFAULT);
-       if (retval != 0) {
-               dbg("Unable to initialize database.");
-               goto exit;
+       devpath = get_devpath();
+       if (!devpath) {
+               dbg("no devpath?");
+               return -EINVAL;
        }
 
-       /* initialize the naming deamon */
-       namedev_init();
+       /* skip blacklisted subsystems */
+       subsystem = get_subsystem(main_argv[1]);
+       if (!subsystem) {
+               dbg("no subsystem?");
+               return -EINVAL;
+       }
 
-       if (strcmp(action, "add") == 0)
-               retval = udev_add_device(devpath, subsystem);
+       return __udev_hotplug(action, devpath, subsystem);
+}
 
-       else if (strcmp(action, "remove") == 0)
-               retval = udev_remove_device(devpath, subsystem);
+int main(int argc, char *argv[], char *envp[])
+{
+       main_argv = argv;
+       main_envp = envp;
 
-       else {
-               dbg("Unknown action: %s", action);
-               retval = -EINVAL;
+       if (strstr(argv[0], "udevstart")) {
+               /* Setup env variables. */
+               setenv("UDEV_NO_SLEEP", "1", 1);
+               is_udevstart = 1;
        }
-       udevdb_exit();
 
-exit:  
-       return retval;
-}
+       /* initialize our configuration */
+       udev_init_config();
+
+       dbg("version %s", UDEV_VERSION);
 
+       if (is_udevstart) {
+               namedev_init();
+               return udev_start();
+       } else
+               return udev_hotplug();
+}