*
*/
+#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
+#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"
+/* timeout flag for udevdb */
+extern sig_atomic_t gotalarm;
+
/* global variables */
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;
}
#endif
-static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
{
switch (signum) {
+ case SIGALRM:
+ gotalarm = 1;
+ info("error: timeout reached, event probably not handled correctly");
+ break;
case SIGINT:
case SIGTERM:
- sysbus_disconnect();
udevdb_exit();
exit(20 + signum);
default:
- dbg("unhandled signal");
+ dbg("unhandled signal %d", signum);
+ }
+}
+
+/* list of subsystems we don't care about. not listing such systems here
+ * is not critical, but it makes it faster as we don't look for the "dev" file
+ */
+static int subsystem_without_dev(const char *subsystem)
+{
+ char *subsystem_blacklist[] = {
+ "scsi_host",
+ "scsi_device",
+ "usb_host",
+ "pci_bus",
+ "pcmcia_socket",
+ "bluetooth",
+ "i2c-adapter",
+ "pci_bus",
+ "ieee1394",
+ "ieee1394_host",
+ "ieee1394_node",
+ NULL
+ };
+ char **subsys;
+
+ for (subsys = subsystem_blacklist; *subsys != NULL; subsys++) {
+ if (strcmp(subsystem, *subsys) == 0)
+ return 1;
}
+
+ return 0;
}
-static char *subsystem_blacklist[] = {
- "net",
- "scsi_host",
- "scsi_device",
- "usb_host",
- "pci_bus",
- "pcmcia_socket",
- "",
-};
-
-static int udev_hotplug(void)
+int main(int argc, char *argv[], char *envp[])
{
+ struct sigaction act;
char *action;
- char *devpath;
- char *subsystem;
+ char *devpath = "";
+ char *subsystem = "";
int retval = -EINVAL;
- int i;
- struct sigaction act;
+ enum {
+ ADD,
+ REMOVE,
+ UDEVSTART,
+ } act_type;
- action = get_action();
- if (!action) {
- dbg("no action?");
- goto exit;
- }
+ dbg("version %s", UDEV_VERSION);
- devpath = get_devpath();
- if (!devpath) {
- dbg("no devpath?");
- goto exit;
- }
- dbg("looking at '%s'", devpath);
+ main_argv = argv;
+ main_envp = envp;
- /* 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;
- }
+ init_logging("udev");
- /* skip blacklisted subsystems */
- 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) {
- dbg("don't care about '%s' devices", subsystem);
+ udev_init_config();
+
+ 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;
}
- i++;
- }
- /* connect to the system message bus */
- sysbus_connect();
+ devpath = get_devpath();
+ if (!devpath) {
+ dbg("no devpath?");
+ goto exit;
+ }
+ dbg("looking at '%s'", devpath);
- /* initialize udev database */
- retval = udevdb_init(UDEVDB_DEFAULT);
- if (retval != 0) {
- dbg("unable to initialize database");
- goto exit_sysbus;
+ /* 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 */
+ if (subsystem_without_dev(subsystem)) {
+ dbg("don't care about '%s' devices", subsystem);
+ exit(0);
+ };
}
- /* set up a default signal handler for now */
- act.sa_handler = sig_handler;
+ /* set signal handlers */
+ act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask);
- act.sa_flags = SA_RESTART;
+ /* alarm must not restart syscalls*/
+ sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
- /* initialize the naming deamon */
- namedev_init();
+ /* trigger timout to interrupt blocking syscalls */
+ alarm(ALARM_TIMEOUT);
- if (strcmp(action, "add") == 0)
- retval = udev_add_device(devpath, subsystem, 0);
-
- else if (strcmp(action, "remove") == 0)
+ /* initialize udev database */
+ if (udevdb_init(UDEVDB_DEFAULT) != 0)
+ info("error: unable to initialize database, continuing without database");
+
+ switch(act_type) {
+ case UDEVSTART:
+ dbg("udevstart");
+ namedev_init();
+ 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:
- 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();
+ return retval;
}
~ianmdlvl / elogind.git / blobdiff