[PATCH] udevd-test.pl: remove wrong date calculation

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 847cc5dade49bdf177082e5f8a4ae88110e70c9d..0ee70529c4edb923b053c104570a9a1a1623532c 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -61,6 +61,10 @@ static int manage_hotplug_event(void) {
        int fd;
        int len;
 
+       /* false, if we are called directly */
+       if (!getenv("MANAGED_EVENT"))
+               goto exit;
+
        fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
        if (fd < 0)
                goto exit;
@@ -97,31 +101,34 @@ int main(int argc, char *argv[], char *envp[])
        struct sysfs_device *devices_dev;
        struct udevice udev;
        char path[SYSFS_PATH_MAX];
-       int retval = -EINVAL;
        const char *error;
-       const char *action = getenv("ACTION");
-       const char *devpath = getenv("DEVPATH");
-       const char *subsystem = argv[1];
+       const char *action;
+       const char *devpath;
+       const char *subsystem;
+       int retval = -EINVAL;
+
+       if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+               printf("%s\n", UDEV_VERSION);
+               exit(0);
+       }
 
-       dbg("version %s", UDEV_VERSION);
        logging_init("udev");
+       dbg("version %s", UDEV_VERSION);
+
        udev_init_config();
 
        /* 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);
        sigaction(SIGTERM, &act, NULL);
 
-       /* trigger timeout to interrupt blocking syscalls */
+       /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       udev_init_device(&udev, devpath, subsystem);
-
-       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+       if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
                dbg("udevstart");
 
                /* disable all logging, as it's much too slow on some facilities */
@@ -132,6 +139,14 @@ int main(int argc, char *argv[], char *envp[])
                goto exit;
        }
 
+       action = getenv("ACTION");
+       devpath = getenv("DEVPATH");
+       subsystem = getenv("SUBSYSTEM");
+       /* older kernels passed the SUBSYSTEM only as argument */
+       if (!subsystem && argc == 2)
+               subsystem = argv[1];
+       udev_init_device(&udev, devpath, subsystem);
+
        if (!action) {
                dbg("no action");
                goto hotplug;