udevadm: move init from commands to udevadm

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 1f47b899520f4c3ad915ac354c28e5cd1f7e592c..fdf53d2ab59173890bb6cedee90bd4ddab9501dc 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -279,10 +279,6 @@ int udevadm_info(int argc, char *argv[])
        struct name_entry *name_loop;
        int rc = 0;
 
-       logging_init("udevinfo");
-       udev_config_init();
-       sysfs_init();
-
        while (1) {
                option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL);
                if (option == -1)
@@ -501,7 +497,5 @@ int udevadm_info(int argc, char *argv[])
 
 exit:
        udev_device_cleanup(udev);
-       sysfs_cleanup();
-       logging_close();
        return rc;
 }

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 0cb9ece472ebc2e05a78cf888ef5adf0fa411bbd..3a886469ad837002cff88c33b87638590bd45a37 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -87,10 +87,7 @@ int udevadm_settle(int argc, char *argv[])
        int rc = 1;
        int seconds;
 
-       logging_init("udevsettle");
-       udev_config_init();
        dbg("version %s\n", VERSION);
-       sysfs_init();
 
        while (1) {
                option = getopt_long(argc, argv, "t:h", options, NULL);
@@ -172,7 +169,5 @@ int udevadm_settle(int argc, char *argv[])
        }
 
 exit:
-       sysfs_cleanup();
-       logging_close();
        return rc;
 }

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 291f7e934f43ee627a0a61bb7ecd1dcbdc5c4c61..d06249c6c1d1f3e01d2b7e087932909e80aef672 100644 (file)
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -92,7 +92,6 @@ int udevadm_test(int argc, char *argv[])
        };
 
        info("version %s\n", VERSION);
-       udev_config_init();
        if (udev_log_priority < LOG_INFO) {
                char priority[32];
 
@@ -143,7 +142,6 @@ int udevadm_test(int argc, char *argv[])
               "some values may be different, or not available at a simulation run.\n"
               "\n");
 
-       sysfs_init();
        udev_rules_init(&rules, 0);
 
        /* remove /sys if given */
@@ -202,6 +200,5 @@ int udevadm_test(int argc, char *argv[])
 
 exit:
        udev_rules_cleanup(&rules);
-       sysfs_cleanup();
        return rc;
 }

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 322040582e75506c5e91a91f09b43e9d39ce56af..04d8f79ba16f8e6102b151f9a4624b3aff1466e7 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -584,10 +584,7 @@ int udevadm_trigger(int argc, char *argv[])
                {}
        };
 
-       logging_init("udevtrigger");
-       udev_config_init();
        dbg("version %s\n", VERSION);
-       sysfs_init();
 
        while (1) {
                option = getopt_long(argc, argv, "vnFo:hce::s:S:a:A:", options, NULL);
@@ -710,7 +707,5 @@ exit:
 
        if (sock >= 0)
                close(sock);
-       sysfs_cleanup();
-       logging_close();
        return 0;
 }

diff --git a/udev/udevadm.c b/udev/udevadm.c
index aa0befed3be311721f20a590670b9c7af50c1c2c..047365d9733006f5c21f733bda45556a035820f0 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -125,6 +125,10 @@ int main(int argc, char *argv[])
        const char *pos;
        int rc;
 
+       logging_init("udevadm");
+       udev_config_init();
+       sysfs_init();
+
        /* find command */
        if (command != NULL)
                for (i = 0; cmds[i].cmd != NULL; i++) {
@@ -169,5 +173,7 @@ int main(int argc, char *argv[])
        fprintf(stderr, "unknown command, try help\n\n");
        rc = 2;
 out:
+       sysfs_cleanup();
+       logging_close();
        return rc;
 }