[PATCH] avoid building klibc test programs and pass SUBDIRS= to klibc clean

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 507f2be943a88e9142bc802f0f4da0ac95e53aa6..a9da014ea664e0b157aad52acff0ab66538a291f 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -101,14 +101,20 @@ 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 */
@@ -122,14 +128,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       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 (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
                dbg("udevstart");
 
@@ -141,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;
@@ -203,9 +209,10 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-               if (udev_dev_d && udev.devname[0] != '\0') {
+               if (udev.devname[0] != '\0') {
                        setenv("DEVNAME", udev.devname, 1);
-                       udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       if (udev_dev_d)
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                }
        } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
                if (strcmp(action, "add") == 0) {