*
*/
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <signal.h>
+#include <unistd.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "udev_lib.h"
+#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
/* global variables */
char **main_argv;
{
switch (signum) {
case SIGALRM:
- gotalarm = 1;
- info("error: timeout reached, event probably not handled correctly");
- break;
+ exit(1);
case SIGINT:
case SIGTERM:
- udevdb_exit();
exit(20 + signum);
- default:
- 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;
-}
-
int main(int argc, char *argv[], char *envp[])
{
struct sigaction act;
dbg("no devpath?");
goto exit;
}
- dbg("looking at '%s'", udev.devpath);
+ dbg("looking at '%s'", devpath);
/* we only care about class devices and block stuff */
if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
goto exit;
}
+ udev_set_values(&udev, devpath, subsystem);
+
/* skip blacklisted subsystems */
- if (subsystem_without_dev(subsystem)) {
+ if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
dbg("don't care about '%s' devices", subsystem);
goto exit;
};
- udev_set_values(&udev, devpath, subsystem);
}
/* set signal handlers */
act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask);
+ act.sa_flags = 0;
/* alarm must not restart syscalls*/
sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL);
/* trigger timout to interrupt blocking syscalls */
alarm(ALARM_TIMEOUT);
- /* 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");
case ADD:
dbg("udev add");
- /* init rules */
- namedev_init();
-
/* open the device */
snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
class_dev = sysfs_open_class_device_path(path);
}
dbg("opened class_dev->name='%s'", class_dev->name);
+ /* init rules */
+ namedev_init();
+
/* name, create node, store in db */
retval = udev_add_device(&udev, class_dev);
+
+ /* run scripts */
+ dev_d_execute(&udev);
+
+ sysfs_close_class_device(class_dev);
break;
case REMOVE:
dbg("udev remove");
+
+ /* get node from db, delete it*/
retval = udev_remove_device(&udev);
- }
- udevdb_exit();
+ /* run scripts */
+ dev_d_execute(&udev);
+ }
exit:
logging_close();